Changeset 40613


Ignore:
Timestamp:
07/10/17 16:49:45 (5 years ago)
Author:
gost
Message:

[titan] next fix FB

Location:
titan/titan
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • titan/titan/fb.h

    r40612 r40613  
    4040
    4141#ifndef NOFB
    42 
    43 #ifndef CONFIG_ION     
    4442        if(ioctl(fb->fd, FBIOGET_FSCREENINFO, &fix_screeninfo) == -1)
    4543        {
     
    4745                return 0;
    4846        }
    49 #else
    50         fix_screeninfo.smem_len = ACCEL_MEM_SIZE;
    51 #endif
    52 
    5347#else
    5448        fix_screeninfo.smem_len = 16*1024*1024;
     
    313307                {
    314308                        debug(444,"%dkB available for acceleration surfaces (via ION).", ACCEL_MEM_SIZE);
    315                         //gAccel::getInstance()->setAccelMemorySpace(lfb, phys_data.addr, ACCEL_MEM_SIZE);
    316                         //node = addfb(FB, devnr, var_screeninfo.xres, var_screeninfo.yres, var_screeninfo.bits_per_pixel / 8, share_data.fd, lfb, ACCEL_MEM_SIZE, phys_data.addr);     
    317                         node = addfb(FB, devnr, var_screeninfo.xres, var_screeninfo.yres, var_screeninfo.bits_per_pixel / 8, fd, lfb, ACCEL_MEM_SIZE, phys_data.addr); 
     309
     310                        node = addfb(FB, devnr, var_screeninfo.xres, var_screeninfo.yres, var_screeninfo.bits_per_pixel / 8, fd, mmapfb, fix_screeninfo.smem_len, data_phys);
     311                        skinfb = addfb(SKINFB, 0, getconfigint("skinfbwidth", NULL), getconfigint("skinfbheight", NULL), 4, share_data.fd, lfb, ACCEL_MEM_SIZE, phys_data.addr);
     312                        accelfb = addfb(ACCELFB, 0, (ACCEL_MEM_SIZE-(skinfb->width*skinfb->heidht*4)) / 4, 1, 4, share_data.fd, skinfb->fb + skinfb->varfbsize, ACCEL_MEM_SIZE, skinfb->data_phys + skinfb->varfbsize);
    318313                }
    319314                else
  • titan/titan/mipselport.h

    r40602 r40613  
    8787{
    8888        if(newnode != NULL)
     89#ifndef CONFIG_ION             
    8990                newnode->varfbsize = 1920 * 1080 * newnode->colbytes;
    9091//              newnode->varfbsize = 1920 * 1080 * (newnode->colbytes * 8);
     92#else
     93        newnode->varfbsize = width * height * newnode->colbytes;
     94#endif
    9195
    9296}
  • titan/titan/titan.c

    r40591 r40613  
    803803        status.usedirectfb = 1;
    804804#endif
    805 
     805#ifndef CONFIG_ION
    806806        if(status.usedirectfb != 1)
    807807        {
     
    839839                        }
    840840                }
    841 #ifdef CONFIG_ION
    842                 SetMode();
     841#else
     842                status.usedirectfb = 0;
     843                //SetMode();
    843844#endif         
    844845#endif
Note: See TracChangeset for help on using the changeset viewer.