From patchwork Tue Oct 16 21:04:36 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: NAK: [Precise][SRU] drm/i915: Remove too early plane enable on
 pre-PCH hardware
From: Chris J Arges <chris.j.arges@canonical.com>
X-Patchwork-Id: 191893
Message-Id: <507DCBE4.70303@canonical.com>
To: Tim Gardner <tim.gardner@canonical.com>
Cc: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
Date: Tue, 16 Oct 2012 16:04:36 -0500

On 10/16/2012 12:31 PM, Tim Gardner wrote:
> This is not a clean cherry-pick on master-next. Please have another look.
> 
Hi Tim,
So one thing I noticed is that this particular commit is a single line
removed:


However when I use 'git cherry-pick
c7bd4c25650704d4d065eb4ce2a122d2a80ce804', it tries to pull in a bunch
of seemingly unrelated code.

I also was able to apply this patch cleanly to master-next.

However, at this point do I need to re-format the patch such that I
indicate I've edited the cherry-pick? or is there another format that
needs to be used?

The big difference between the upstream patch and the backport is the
line numbers since the function moved.

Thanks,
--chris j arges


diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index c5f071d..cf9dfcd 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3932,7 +3932,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,

        I915_WRITE(DSPCNTR(plane), dspcntr);
        POSTING_READ(DSPCNTR(plane));
-       intel_enable_plane(dev_priv, plane, pipe);

        ret = intel_pipe_set_base(crtc, x, y, old_fb);