diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-01-11 13:59:40 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-01-11 13:59:40 +0000 |
| commit | d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac (patch) | |
| tree | f12ce9d720848e595a3a26b20f64df4d63d1d4c0 /meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch | |
| parent | a30424c269479d1e722932c24f1c7e260914c390 (diff) | |
| download | openembedded-core-d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac.tar.gz openembedded-core-d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac.tar.bz2 openembedded-core-d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac.tar.xz openembedded-core-d56b65fcbdcf6c71e9d42cb0c6427c1b853083ac.zip | |
xserver-kdrive: Remove bogus fbdev patch, merge kmode patches, add a patch to allow the existing framebuffer mode to be reused if appropriate
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3466 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch')
| -rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch new file mode 100644 index 000000000..dc957cc82 --- /dev/null +++ b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch @@ -0,0 +1,41 @@ +--- + hw/kdrive/fbdev/fbdev.c | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) + +Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c +=================================================================== +--- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-01-11 14:40:16.000000000 +0000 ++++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-01-11 14:40:59.000000000 +0000 +@@ -182,16 +182,24 @@ fbdevScreenInitialize (KdScreenInfo *scr + screen->rate = 103; /* FIXME: should get proper value from fb driver */ + } + if (!screen->fb[0].depth) +- screen->fb[0].depth = 16; ++ { ++ if (k >= 0) ++ screen->fb[0].depth = var.bits_per_pixel; ++ else ++ screen->fb[0].depth = 16; ++ } + +- t = KdFindMode (screen, fbdevModeSupported); +- screen->rate = t->rate; +- screen->width = t->horizontal; +- screen->height = t->vertical; ++ if ((screen->width != var.xres) || (screen->height != var.yres)) ++ { ++ t = KdFindMode (screen, fbdevModeSupported); ++ screen->rate = t->rate; ++ screen->width = t->horizontal; ++ screen->height = t->vertical; + +- /* Now try setting the mode */ +- if (k < 0 || (t->horizontal != var.xres || t->vertical != var.yres)) +- fbdevConvertMonitorTiming (t, &var); ++ /* Now try setting the mode */ ++ if (k < 0 || (t->horizontal != var.xres || t->vertical != var.yres)) ++ fbdevConvertMonitorTiming (t, &var); ++ } + + var.activate = FB_ACTIVATE_NOW; + var.bits_per_pixel = screen->fb[0].depth; |