forked from pool/xorg-x11-server
Egbert Eich
7286d85738
* N_0001-Check-harder-for-primary-PCI-device.patch Whith libpciaccess code path irrelevant for Linux. * N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch Solved differently upstream * N_bug-197858_dpms.diff This one is upstream already - apparently nobody check this when it no longer applied... * N_bug534768-prefer_local_symbols.patch Upstream has a better suggestion how to solve this. However this patch is no longer needed * N_dpms_screensaver.diff This topic was solved slightly differently upstream - still patch got ported without checking it's context. * N_randr1_1-sig11.diff No longer needed. Problem was fixed differently upstream. * u_vgaHW-no-legacy.patch Problem solved in the nv driver. - Renamed: Those patches will go upstream, thus they are prefixed by a u_: * n__confine_to_shape.diff -> u_confine_to_shape.diff * N_fbdevhw.diff -> u_fbdevhw.diff * n_x86emu-include-order.patch -> u_x86emu-include-order.patch * N_xorg-server-xdmcp.patchA -> u_xorg-server-xdmcp.patch Those patches no longer apply but are kept for reference thus prefixed by b_: * N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch -> b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch * N_cache-xkbcomp-output-for-fast-start-up.patch -> b_cache-xkbcomp-output-for-fast-start-up.patch * N_sync-fix.patch -> b_sync-fix.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=478
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
Index: hw/xfree86/fbdevhw/fbdevhw.c
|
|
===================================================================
|
|
--- hw/xfree86/fbdevhw/fbdevhw.c.orig
|
|
+++ hw/xfree86/fbdevhw/fbdevhw.c
|
|
@@ -858,9 +858,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
|
|
@@ -875,9 +876,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;
|
|
}
|
|
|