From patchwork Tue Oct 16 21:04:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris J Arges X-Patchwork-Id: 191893 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id CF1462C00A5 for ; Wed, 17 Oct 2012 08:04:51 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TOEJZ-0005fQ-NV; Tue, 16 Oct 2012 21:04:37 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TOEJY-0005fI-E9 for kernel-team@lists.ubuntu.com; Tue, 16 Oct 2012 21:04:36 +0000 Received: from cpe-70-112-44-241.austin.res.rr.com ([70.112.44.241] helo=[192.168.1.117]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1TOEJY-0008Uj-8g; Tue, 16 Oct 2012 21:04:36 +0000 Message-ID: <507DCBE4.70303@canonical.com> Date: Tue, 16 Oct 2012 16:04:36 -0500 From: Chris J Arges User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: Tim Gardner Subject: Re: NAK: [Precise][SRU] drm/i915: Remove too early plane enable on pre-PCH hardware References: <507D7E3A.1030502@canonical.com> <507D9A01.6040003@canonical.com> In-Reply-To: <507D9A01.6040003@canonical.com> X-Enigmail-Version: 1.4.5 Cc: Ubuntu Kernel Team X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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);