RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fbdev: resize: do single ioctl in nonerror path

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@913 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2010-12-30 23:24:56 +00:00
parent 0238dca99c
commit 5cf498af45
1 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

47
platform/linux/fbdev.c
View file

@ -74,43 +74,45 @@ void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
ioctl(fbdev->fd, FBIOBLANK, FB_BLANK_UNBLANK); ioctl(fbdev->fd, FBIOBLANK, FB_BLANK_UNBLANK);
if (fbdev->fbvar_new.bits_per_pixel != bpp || if (fbdev->fbvar_new.bits_per_pixel != bpp ||
w != fbdev->fbvar_new.xres || fbdev->fbvar_new.xres != w ||
h != fbdev->fbvar_new.yres || fbdev->fbvar_new.yres != h ||
w_total != fbdev->fbvar_new.xres_virtual || fbdev->fbvar_new.xres_virtual != w_total||
h_total > fbdev->fbvar_new.yres_virtual || fbdev->fbvar_new.yres_virtual < h_total ||
left_border != fbdev->fbvar_new.xoffset) { fbdev->fbvar_new.xoffset != left_border ||
fbdev->buffer_count != buffer_cnt)
{
if (fbdev->fbvar_new.bits_per_pixel != bpp ||
w != fbdev->fbvar_new.xres || h != fbdev->fbvar_new.yres)
printf(" switching to %dx%d@%d\n", w, h, bpp);
fbdev->fbvar_new.xres = w; fbdev->fbvar_new.xres = w;
fbdev->fbvar_new.yres = h; fbdev->fbvar_new.yres = h;
fbdev->fbvar_new.xres_virtual = w_total; fbdev->fbvar_new.xres_virtual = w_total;
fbdev->fbvar_new.yres_virtual = h_total; fbdev->fbvar_new.yres_virtual = h_total * buffer_cnt;
fbdev->fbvar_new.xoffset = left_border; fbdev->fbvar_new.xoffset = left_border;
fbdev->fbvar_new.yoffset = top_border; fbdev->fbvar_new.yoffset = top_border;
fbdev->fbvar_new.bits_per_pixel = bpp; fbdev->fbvar_new.bits_per_pixel = bpp;
printf(" switching to %dx%d@%d\n", w, h, bpp); fbdev->buffer_count = buffer_cnt;
fbdev->buffer_write = 1;
// seems to help a bit to avoid glitches // seems to help a bit to avoid glitches
vout_fbdev_wait_vsync(fbdev); vout_fbdev_wait_vsync(fbdev);
ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new); ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
if (ret == -1) { if (ret == -1) {
perror("FBIOPUT_VSCREENINFO ioctl"); // retry with no multibuffering
return NULL; fbdev->fbvar_new.yres_virtual = h_total;
} ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
if (ret == -1) {
fbdev->buffer_write = 1; perror("FBIOPUT_VSCREENINFO ioctl");
} return NULL;
}
fbdev->buffer_count = buffer_cnt;
if (fbdev->fbvar_new.yres_virtual < h_total * fbdev->buffer_count) {
fbdev->fbvar_new.yres_virtual = h_total * fbdev->buffer_count;
ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
if (ret == -1) {
fbdev->buffer_count = 1; fbdev->buffer_count = 1;
fbdev->buffer_write = 0; fbdev->buffer_write = 0;
fprintf(stderr, "Warning: failed to increase virtual resolution, " fprintf(stderr, "Warning: failed to increase virtual resolution, "
"doublebuffering disabled\n"); "multibuffering disabled\n");
} }
} }
fbdev->fb_size = w_total * h_total * bpp / 8; fbdev->fb_size = w_total * h_total * bpp / 8;
@ -126,8 +128,9 @@ void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
fbdev->mem = mmap(0, mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev->fd, 0); fbdev->mem = mmap(0, mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev->fd, 0);
if (fbdev->mem == MAP_FAILED && fbdev->buffer_count > 1) { if (fbdev->mem == MAP_FAILED && fbdev->buffer_count > 1) {
fprintf(stderr, "Warning: can't map %zd bytes, doublebuffering disabled\n", fbdev->mem_size); fprintf(stderr, "Warning: can't map %zd bytes, doublebuffering disabled\n", mem_size);
fbdev->buffer_count = 1; fbdev->buffer_count = 1;
fbdev->buffer_write = 0;
mem_size = fbdev->fb_size; mem_size = fbdev->fb_size;
fbdev->mem = mmap(0, mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev->fd, 0); fbdev->mem = mmap(0, mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev->fd, 0);
} }