d56b65fcbd
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3466 311d38ba-8fff-0310-9ca6-ca027cbcb966
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
---
|
|
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;
|