2007-09-06 21:06:55 +02:00
|
|
|
--- hw/xfree86/fbdevhw/fbdevhw.c.orig 2007-09-03 20:48:47.000000000 +0000
|
|
|
|
|
+++ hw/xfree86/fbdevhw/fbdevhw.c 2007-09-03 20:53:12.000000000 +0000
|
|
|
|
|
@@ -245,7 +245,8 @@
|
|
|
|
|
set->green.length == req->green.length &&
|
|
|
|
|
set->blue.length == req->blue.length &&
|
|
|
|
|
set->xres == req->xres && set->yres == req->yres &&
|
|
|
|
|
- set->pixclock == req->pixclock &&
|
|
|
|
|
+ /* xenfb sets pixclock to 0 (Novell Bug #285523) */
|
|
|
|
|
+ ((set->pixclock == req->pixclock) || !set->pixclock) &&
|
|
|
|
|
set->right_margin == req->right_margin &&
|
|
|
|
|
set->hsync_len == req->hsync_len &&
|
|
|
|
|
set->left_margin == req->left_margin &&
|
2008-04-20 15:39:03 +02:00
|
|
|
--- hw/xfree86/fbdevhw/fbdevhw.c.orig 2008-04-20 03:06:32.000000000 +0000
|
|
|
|
|
+++ hw/xfree86/fbdevhw/fbdevhw.c 2008-04-20 03:30:00.000000000 +0000
|
|
|
|
|
@@ -923,9 +923,10 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mo
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /* Novell Bug #146462 */
|
|
|
|
|
if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *)fbmode))
|
|
|
|
|
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
|
|
|
|
- "FBIOBLANK: %s\n", strerror(errno));
|
|
|
|
|
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
|
|
|
|
+ "FBIOBLANK: %s (Screen blanking not supported by vesafb of Linux Kernel)\n", strerror(errno));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Bool
|
|
|
|
|
@@ -941,9 +942,10 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int
|
|
|
|
|
|
|
|
|
|
unblank = xf86IsUnblank(mode);
|
|
|
|
|
|
|
|
|
|
+ /* Novell Bug #146462 */
|
|
|
|
|
if (-1 == ioctl(fPtr->fd, FBIOBLANK, (void *)(1-unblank))) {
|
|
|
|
|
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
|
|
|
|
- "FBIOBLANK: %s\n", strerror(errno));
|
|
|
|
|
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
|
|
|
|
+ "FBIOBLANK: %s (Screen blanking not supported by vesafb of Linux Kernel)\n", strerror(errno));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
