From patchwork Mon Oct 29 15:24:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Lespiau X-Patchwork-Id: 1664081 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 84D633FDDA for ; Mon, 29 Oct 2012 15:25:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DDCA9F692 for ; Mon, 29 Oct 2012 08:25:10 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id ECCD49E7E9 for ; Mon, 29 Oct 2012 08:24:55 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id u50so2429758wey.36 for ; Mon, 29 Oct 2012 08:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=DFLDN3XgaIVackqsCiHMly6TxhvplxUO11uOJxaHBKk=; b=UhYTw53RqBSas9qG5BvAsNQTMYTXchJuwgL93UG9gAwwhqPVfm93/QsqHwZcQl9rvL 205c/+VwdhuCmBK079B/nrv5VGeefTlZjbPWFMb27kDfbu9a/nYiWaioIzr3uJMDLHVS +uwUQ9m4019wgg1DEFNBT7MQmxaTUC+A8k5ARmRHBr0cB3U9vlORvJnMFjFzu7jyK/r6 MIZKupa6UPTyrsKMQS0vB4lwG6AjgMoXNoXG5SkqwhFTCcwYyCsSKz+thc5TmuNTbKwr LXTNlgQvRboXFeVqfAgcJ6g3PnoWRd9OEHqqIgLOpxxsSSX2hpNenGIxHDBLbLDmQ+mh lFGw== Received: by 10.180.7.197 with SMTP id l5mr15781931wia.13.1351524294852; Mon, 29 Oct 2012 08:24:54 -0700 (PDT) Received: from localhost.localdomain ([83.217.123.106]) by mx.google.com with ESMTPS id m14sm10219815wie.8.2012.10.29.08.24.53 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Oct 2012 08:24:54 -0700 (PDT) From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Mon, 29 Oct 2012 15:24:49 +0000 Message-Id: <1351524289-21465-1-git-send-email-damien.lespiau@gmail.com> X-Mailer: git-send-email 1.7.7.5 Subject: [Intel-gfx] [PATCH] drm/i915: Flush using only the correct base address register X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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 From: Damien Lespiau We were writing DSP_ADDR and DSP_SURF unconditionally. This did not trigger an unclaimed write before HSW as the address of DSP_ADDR has been repurposed as DSP_LINOFF. On HSW, though, DSP_LINOFF has been removed and then writting to it triggers an unclaimed write. This patch writes to DSP_ADDR or DSP_SURF to flush the display plane configuration depending on the gen we're running on. Signed-off-by: Damien Lespiau Reviewed-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a038e4f..f32244b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1836,8 +1836,10 @@ static void intel_disable_pipe(struct drm_i915_private *dev_priv, void intel_flush_display_plane(struct drm_i915_private *dev_priv, enum plane plane) { - I915_WRITE(DSPADDR(plane), I915_READ(DSPADDR(plane))); - I915_WRITE(DSPSURF(plane), I915_READ(DSPSURF(plane))); + if (dev_priv->info->gen >= 4) + I915_WRITE(DSPSURF(plane), I915_READ(DSPSURF(plane))); + else + I915_WRITE(DSPADDR(plane), I915_READ(DSPADDR(plane))); } /**