From patchwork Wed Aug 4 19:22:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 117117 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o74JRWXv014016 for ; Wed, 4 Aug 2010 19:28:07 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C3569ED5B for ; Wed, 4 Aug 2010 12:27:32 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.ffwll.ch (cable-static-49-187.intergga.ch [157.161.49.187]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FA3E9E779 for ; Wed, 4 Aug 2010 12:26:58 -0700 (PDT) Received: by mail.ffwll.ch (Postfix, from userid 1000) id A8BB620C32A; Wed, 4 Aug 2010 21:22:15 +0200 (CEST) X-Spam-ASN: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on orange.ffwll.ch X-Spam-Level: X-Spam-Hammy: 0.000-+--H*UA:git-send-email, 0.000-+--H*x:git-send-email, 0.000-+--i915_read X-Spam-Status: No, score=-4.4 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Spammy: 0.961-+--H*m:ffwll, 0.960-+--H*r:mail.ffwll.ch, 0.947-+--H*Ad:U*daniel.vetter Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 3931220C209; Wed, 4 Aug 2010 21:22:07 +0200 (CEST) Received: from daniel by biene with local (Exim 4.72) (envelope-from ) id 1OgjXh-0001Nr-HP; Wed, 04 Aug 2010 21:22:21 +0200 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Wed, 4 Aug 2010 21:22:09 +0200 Message-Id: <1280949730-5288-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1280949730-5288-1-git-send-email-daniel.vetter@ffwll.ch> References: <1280949730-5288-1-git-send-email-daniel.vetter@ffwll.ch> Cc: stable@kernel.org, Daniel Vetter Subject: [Intel-gfx] [PATCH 1/2] drm/i915: fixup pageflip ringbuffer commands for i8xx X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 04 Aug 2010 19:28:09 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8359c50..8135ee0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4933,12 +4933,18 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, OUT_RING(obj_priv->gtt_offset | obj_priv->tiling_mode); pipesrc = I915_READ(pipesrc_reg); OUT_RING(pipesrc & 0x0fff0fff); - } else { + } else if (IS_GEN3(dev)) { OUT_RING(MI_DISPLAY_FLIP_I915 | MI_DISPLAY_FLIP_PLANE(intel_crtc->plane)); OUT_RING(fb->pitch); OUT_RING(obj_priv->gtt_offset); OUT_RING(MI_NOOP); + } else { + OUT_RING(MI_DISPLAY_FLIP | + MI_DISPLAY_FLIP_PLANE(intel_crtc->plane)); + OUT_RING(fb->pitch); + OUT_RING(obj_priv->gtt_offset); + OUT_RING(MI_NOOP); } ADVANCE_LP_RING();