Attachment 12762 Details for Bug 13252 – patch to try

[patch] patch to try

no-valid-mode-fix.patch (text/plain), 1.62 KB, created by Hong Liu on 2007-11-27 23:18:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hong Liu

Created: 2007-11-27 23:18:25 UTC

Size: 1.62 KB

patch

obsolete

>diff --git a/src/i830_crt.c b/src/i830_crt.c
>index d7762a0..cd71dc5 100644
>--- a/src/i830_crt.c
>+++ b/src/i830_crt.c
>@@ -349,34 +349,38 @@ i830_crt_detect(xf86OutputPtr output)
>     I830Ptr		    pI830 = I830PTR(pScrn);
>     xf86CrtcPtr		    crtc;
>     int			    dpms_mode;
>-    
>+    xf86OutputStatus	    status;
>+    Bool		    connected;
>+
>+    crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode);
>+    if (!crtc)
>+	return XF86OutputStatusUnknown;
>+
>     if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_I965G(pI830) ||
> 	    IS_G33CLASS(pI830)) {
> 	if (i830_crt_detect_hotplug(output))
>-	    return XF86OutputStatusConnected;
>+	    status = XF86OutputStatusConnected;
> 	else
>-	    return XF86OutputStatusDisconnected;
>+	    status = XF86OutputStatusDisconnected;
>+
>+	goto out;
>     }
> 
>-    if (i830_crt_detect_ddc(output))
>-	return XF86OutputStatusConnected;
>+    if (i830_crt_detect_ddc(output)) {
>+	status = XF86OutputStatusConnected;
>+	goto out;
>+    }
> 
>     /* Use the load-detect method if we have no other way of telling. */
>-    crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode);
>-    
>-    if (crtc)
>-    {
>-	Bool			connected;
>-
>-	connected = i830_crt_detect_load (crtc, output);
>-	i830ReleaseLoadDetectPipe (output, dpms_mode);
>-	if (connected)
>-	    return XF86OutputStatusConnected;
>-	else
>-	    return XF86OutputStatusDisconnected;
>-    }
>+    connected = i830_crt_detect_load (crtc, output);
>+    if (connected)
>+	status = XF86OutputStatusConnected;
>+    else
>+	status = XF86OutputStatusDisconnected;
> 
>-    return XF86OutputStatusUnknown;
>+out:
>+    i830ReleaseLoadDetectPipe (output, dpms_mode);
>+    return status;
> }
> 
> static void

Actions: View | Splinter Review

Attachments on bug 13252: 12562 | 12563 | 12762

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.