Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at Fri Feb 6 16:45:45 CET 2009. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-02-02 22:17:01.000000000 +0100 +++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-02-05 15:24:06.290583221 +0100 @@ -1,0 +2,7 @@ +Thu Feb 5 15:17:02 CET 2009 - sndirsch@suse.de + +- xf86-video-intel-sdvo_detect.diff + * supposed to fix external output detection on Macbooks; only + applied on openSUSE > 11.1 for now (bnc #425252) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xf86-video-intel-sdvo_detect.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.IP3003/_old 2009-02-06 16:39:04.000000000 +0100 +++ /var/tmp/diff_new_pack.IP3003/_new 2009-02-06 16:39:04.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 34 +Release: 36 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -98,6 +98,7 @@ Patch63: xf86-video-intel-SDVO_LVDS.diff Patch64: xf86-video-vesa_DefaultRefresh.diff Patch65: xf86-video-intel-commit-1e974ff.diff +Patch66: xf86-video-intel-sdvo_detect.diff Patch103: xf86-video-ati-6.7.197-r128-xvideo.patch Patch104: xf86-video-ati-disable-dri-bug437651-ia64only.diff @@ -130,6 +131,9 @@ %patch62 -p1 %patch63 -p1 %patch65 -p1 +%if %suse_version > 1110 +%patch66 -p1 +%endif popd pushd xf86-video-nv-* %patch3 -p0 @@ -266,6 +270,10 @@ /var/lib/hardware/ids/20.%{name} %changelog +* Thu Feb 05 2009 sndirsch@suse.de +- xf86-video-intel-sdvo_detect.diff + * supposed to fix external output detection on Macbooks; only + applied on openSUSE > 11.1 for now (bnc #425252) * Mon Feb 02 2009 sndirsch@suse.de - xf86-video-intel-commit-1e974ff.diff * Try to always probe SDVOC on 965G/965GM. Detect bit of SDVOC ++++++ xf86-video-intel-sdvo_detect.diff ++++++ diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c index 256d16d..011e1c9 100644 --- a/src/i830_sdvo.c +++ b/src/i830_sdvo.c @@ -1756,7 +1756,9 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int output_device) xf86OutputPtr output; I830OutputPrivatePtr intel_output; struct i830_sdvo_priv *dev_priv; + I830Ptr pI830 ; int i; + int val; unsigned char ch[0x40]; I2CBusPtr i2cbus = NULL, ddcbus; char name[60]; @@ -1821,16 +1823,15 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int output_device) } intel_output->pI2CBus = i2cbus; - - /* Read the regs to test if we can talk to the device */ - for (i = 0; i < 0x40; i++) { - if (!i830_sdvo_read_byte_quiet(output, i, &ch[i])) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "No SDVO device found on SDVO%c\n", - output_device == SDVOB ? 'B' : 'C'); - xf86OutputDestroy (output); - return FALSE; - } + + pI830 = I830PTR(pScrn); + val = INREG(SDVOB); + if (0 == (val & 0x04)) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "No SDVO device found on SDVO%c\n", + output_device == SDVOB ? 'B' : 'C'); + xf86OutputDestroy (output); + return FALSE; } /* Set up our wrapper I2C bus for DDC. It acts just like the regular I2C ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org