Attachment 15613 Details for Bug 15187 – Don't allocate a pipe for hotplug detection

[patch] Don't allocate a pipe for hotplug detection

i830-hotplug-no-pipe.patch (text/plain), 1.26 KB, created by Jesse Barnes on 2008-04-01 12:15:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2008-04-01 12:15:01 UTC

Size: 1.26 KB

patch

obsolete

>diff --git a/src/i830_crt.c b/src/i830_crt.c
>index 2a99f9c..8274c0c 100644
>--- a/src/i830_crt.c
>+++ b/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;
> }
>

Actions: View | Splinter Review

Attachments on bug 15187: 15417 | 15418 | 15419 | 15436 | 15511 | 15512 | 15534 | 15613 | 16669 | 16673

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.