Hello community, here is the log from the commit of package xf86-video-vesa for openSUSE:Factory checked in at 2016-07-14 09:41:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-vesa (Old) and /work/SRC/openSUSE:Factory/.xf86-video-vesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-vesa" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-vesa/xf86-video-vesa.changes 2015-10-03 20:29:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-vesa.new/xf86-video-vesa.changes 2016-07-14 09:41:52.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 5 09:53:39 UTC 2016 - [email protected] + +- u_DPMS-Check-for-broken-DPMSGet.patch + Check for broken DPMSGet (bsc#986974). + +------------------------------------------------------------------- New: ---- u_DPMS-Check-for-broken-DPMSGet.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-vesa.spec ++++++ --- /var/tmp/diff_new_pack.ziLHbR/_old 2016-07-14 09:41:54.000000000 +0200 +++ /var/tmp/diff_new_pack.ziLHbR/_new 2016-07-14 09:41:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-vesa # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ Patch0: u_Enable-DefaultRefresh-by-default.patch Patch1: u_Restore-palette-on-LeaveVT.patch Patch2: u_DPMS-Query-DPMS-capabilites-and-query-current-state-before-changing.patch -#PATCH-FIX-UPSTREAM U_mibstore.patch -- removes obsolete include +Patch3: u_DPMS-Check-for-broken-DPMSGet.patch BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(pciaccess) >= 0.10 @@ -59,6 +59,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure ++++++ u_DPMS-Check-for-broken-DPMSGet.patch ++++++ From: Egbert Eich <[email protected]> Date: Mon Jul 4 18:00:18 2016 +0200 Subject: [PATCH]DPMS: Check for broken DPMSGet() Patch-mainline: to be upstreamed Git-commit: 484aa9d156f213d08001b3c926ff1632cf3826c2 References: bsc#986974 Signed-off-by: Egbert Eich <[email protected]> On some BIOSes DPMSGet may return an incorrect mode. Check by attempting to read back the mode just set and compare it to the value set. Signed-off-by: Egbert Eich <[email protected]> --- src/vesa.c | 8 +++++++- src/vesa.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/vesa.c b/src/vesa.c index 983a5f5..818d9a7 100644 --- a/src/vesa.c +++ b/src/vesa.c @@ -1698,10 +1698,16 @@ VESADisplayPowerManagementSet(ScrnInfoPtr pScrn, int mode, (val & (1 << mode)) == 0) return; - if (VBEDPMSGet(pVesa->pVbe, &val) == TRUE && val == mode) + if (!pVesa->brokenDPMSGet && + VBEDPMSGet(pVesa->pVbe, &val) == TRUE && + val == mode) return; #endif VBEDPMSSet(pVesa->pVbe, mode); +#ifdef VBE_HAVE_DPMS_GET_CAPABILITIES + if (!pVesa->brokenDPMSGet && VBEDPMSGet(pVesa->pVbe, &val) && val != mode) + pVesa->brokenDPMSGet = TRUE; +#endif } /*********************************************************************** diff --git a/src/vesa.h b/src/vesa.h index bcc9e37..7c68724 100644 --- a/src/vesa.h +++ b/src/vesa.h @@ -119,6 +119,7 @@ typedef struct _VESARec void *shadow; ShadowUpdateProc update; ShadowWindowProc window; + Bool brokenDPMSGet; } VESARec, *VESAPtr;
