Attachment 157450 Details for Bug 244731 – Upstream patch in the question

[patch] Upstream patch in the question

git-fbbb41bc5e03478cb46ee8f64ef68b23ff3fc14b.patch (text/plain), 1.23 KB, created by Matěj Cepl on 2007-06-20 11:48:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2007-06-20 11:48:31 UTC

Size: 1.23 KB

patch

obsolete

>From: Keith Packard <keithp@neko.keithp.com>
>Date: Sun, 17 Jun 2007 13:59:24 +0000 (+0100)
>Subject: Let DPMS functions enable plane/pipe/output on 8xx hardware.
>X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=fbbb41bc5e03478cb46ee8f64ef68b23ff3fc14b
>
>Let DPMS functions enable plane/pipe/output on 8xx hardware.
>
>On 855, letting crtc_mode_set enable the plane and pipe will occasionally
>hang the chip. Instead, wait for crtc_enable to light things up. For 9xx,
>leave things alone.
>---
>
>--- a/src/i830_display.c
>+++ b/src/i830_display.c
>@@ -958,11 +958,17 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
> 	else
> 	    pipeconf &= ~PIPEACONF_DOUBLE_WIDE;
>     }
>-#if 1
>-    dspcntr |= DISPLAY_PLANE_ENABLE;
>-    pipeconf |= PIPEACONF_ENABLE;
>-    dpll |= DPLL_VCO_ENABLE;
>-#endif
>+    /*
>+     * This "shouldn't" be needed as the dpms on code
>+     * will be run after the mode is set. On 9xx, it helps.
>+     * On 855, it can lock up the chip (and the entire machine)
>+     */
>+    if (IS_I9XX (pI830))
>+    {
>+	dspcntr |= DISPLAY_PLANE_ENABLE;
>+	pipeconf |= PIPEACONF_ENABLE;
>+	dpll |= DPLL_VCO_ENABLE;
>+    }
>     
>     /* Disable the panel fitter if it was on our pipe */
>     if (i830_panel_fitter_pipe (pI830) == pipe)

Actions: View | Diff

Attachments on bug 244731: 157450