drm/i915: fixup assert_pipe to take the pipe A quirk into account
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 22 Jan 2012 00:36:48 +0000 (01:36 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 24 Jan 2012 18:47:18 +0000 (19:47 +0100)
This was completely spamming dmesg on my i855gm. This issue was just
shortly introduced with:

commit 931872fceabacf2d4f8b6fbd51611c167e83164c
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Mon Jan 16 23:01:13 2012 +0000

    drm/i915: Check that plane/pipe is disabled before removing the fb

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index cfd3a87807f1b055abe4bf1308c9675de3b37122..ebb345244909273185dbe0a8901b0d75f39cab21 100644 (file)
@@ -936,6 +936,10 @@ void assert_pipe(struct drm_i915_private *dev_priv,
        u32 val;
        bool cur_state;
 
+       /* if we need the pipe A quirk it must be always on */
+       if (pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE)
+               state = true;
+
        reg = PIPECONF(pipe);
        val = I915_READ(reg);
        cur_state = !!(val & PIPECONF_ENABLE);