diff options
-rw-r--r-- | x11/xf86-video-intel/Makefile | 5 | ||||
-rw-r--r-- | x11/xf86-video-intel/distinfo | 10 | ||||
-rw-r--r-- | x11/xf86-video-intel/patches/patch-aa | 37 | ||||
-rw-r--r-- | x11/xf86-video-intel/patches/patch-ac | 54 |
4 files changed, 99 insertions, 7 deletions
diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile index e321896580c..79775097bc9 100644 --- a/x11/xf86-video-intel/Makefile +++ b/x11/xf86-video-intel/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2008/09/18 20:57:51 bjs Exp $ +# $NetBSD: Makefile,v 1.14 2008/09/19 14:56:00 tnn Exp $ -DISTNAME= xf86-video-intel-2.4.1 -PKGREVISION= 1 +DISTNAME= xf86-video-intel-2.4.2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xf86-video-intel/distinfo b/x11/xf86-video-intel/distinfo index 5c80e296da8..a6c0236638d 100644 --- a/x11/xf86-video-intel/distinfo +++ b/x11/xf86-video-intel/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.11 2008/08/15 06:37:22 tnn Exp $ +$NetBSD: distinfo,v 1.12 2008/09/19 14:56:00 tnn Exp $ -SHA1 (xf86-video-intel-2.4.1.tar.bz2) = 7ba9bb31d581becca57b07899db17798721c984c -RMD160 (xf86-video-intel-2.4.1.tar.bz2) = 35d34bae769ad59fbcd47086aaaa28fb8bed71b6 -Size (xf86-video-intel-2.4.1.tar.bz2) = 684688 bytes +SHA1 (xf86-video-intel-2.4.2.tar.bz2) = fe071bf0c98b1cce96f6647d87a74217632fc2ad +RMD160 (xf86-video-intel-2.4.2.tar.bz2) = 939bd7d3bc6f1709f312dcbcaadb2e1d0c95bc06 +Size (xf86-video-intel-2.4.2.tar.bz2) = 684445 bytes +SHA1 (patch-aa) = d821ffb3e46769c0a5eda913b85a5b834d4478d6 SHA1 (patch-ab) = 8d1b93e73a1b64958c09a229151b498ea61dc158 +SHA1 (patch-ac) = 89f62e11faded0847f42cfab78a3e5d17c938864 SHA1 (patch-ad) = db9a5a55cd0c31e1e0d62b9cd94393143ab23c08 SHA1 (patch-ba) = 9152649277b417278fb290e24dac8ad6fb911238 diff --git a/x11/xf86-video-intel/patches/patch-aa b/x11/xf86-video-intel/patches/patch-aa new file mode 100644 index 00000000000..55ec6e843bd --- /dev/null +++ b/x11/xf86-video-intel/patches/patch-aa @@ -0,0 +1,37 @@ +$NetBSD: patch-aa,v 1.3 2008/09/19 14:56:00 tnn Exp $ + +https://bugs.freedesktop.org/show_bug.cgi?id=16631 + +diff --git src/i830_driver.c src/i830_driver.c +index 9bf0a64..5de8e7d 100644 +--- src/i830_driver.c ++++ src/i830_driver.c +@@ -915,19 +915,18 @@ I830SetupOutputs(ScrnInfoPtr pScrn) + i830_lvds_init(pScrn); + + if (IS_I9XX(pI830)) { +- if (INREG(SDVOB) & SDVO_DETECTED) { +- Bool found = i830_sdvo_init(pScrn, SDVOB); ++ Bool found; ++ found = i830_sdvo_init(pScrn, SDVOB); + +- if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)) +- i830_hdmi_init(pScrn, SDVOB); +- } ++ if (!found && SUPPORTS_INTEGRATED_HDMI(pI830) ++ && (INREG(SDVOB) & SDVO_DETECTED)) ++ i830_hdmi_init(pScrn, SDVOB); + +- if (INREG(SDVOC) & SDVO_DETECTED) { +- Bool found = i830_sdvo_init(pScrn, SDVOC); ++ found = i830_sdvo_init(pScrn, SDVOC); + +- if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)) +- i830_hdmi_init(pScrn, SDVOC); +- } ++ if (!found && SUPPORTS_INTEGRATED_HDMI(pI830) ++ && (INREG(SDVOC) & SDVO_DETECTED)) ++ i830_hdmi_init(pScrn, SDVOC); + } else { + i830_dvo_init(pScrn); + } diff --git a/x11/xf86-video-intel/patches/patch-ac b/x11/xf86-video-intel/patches/patch-ac new file mode 100644 index 00000000000..26068df3482 --- /dev/null +++ b/x11/xf86-video-intel/patches/patch-ac @@ -0,0 +1,54 @@ +$NetBSD: patch-ac,v 1.3 2008/09/19 14:56:00 tnn Exp $ + +https://bugs.freedesktop.org/show_bug.cgi?id=17405 + +--- src/i830_crt.c ++++ src/i830_crt.c +@@ -352,10 +352,9 @@ i830_crt_detect(xf86OutputPtr output) + xf86OutputStatus status; + Bool connected; + +- crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode); +- if (!crtc) +- return XF86OutputStatusUnknown; +- ++ /* ++ * Try hotplug detection where supported ++ */ + if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_I965G(pI830) || + IS_G33CLASS(pI830)) { + if (i830_crt_detect_hotplug(output)) +@@ -363,12 +362,19 @@ i830_crt_detect(xf86OutputPtr output) + else + status = XF86OutputStatusDisconnected; + +- goto out; ++ goto done; + } + ++ /* ++ * DDC is next best, no flicker ++ */ ++ crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode); ++ if (!crtc) ++ return XF86OutputStatusUnknown; ++ + if (i830_crt_detect_ddc(output)) { + status = XF86OutputStatusConnected; +- goto out; ++ goto out_release_pipe; + } + + /* Use the load-detect method if we have no other way of telling. */ +@@ -378,9 +384,10 @@ i830_crt_detect(xf86OutputPtr output) + else + status = XF86OutputStatusDisconnected; + +-out: ++out_release_pipe: + i830ReleaseLoadDetectPipe (output, dpms_mode); + ++done: + return status; + } + |