From patchwork Mon Oct 29 15:25:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Lespiau X-Patchwork-Id: 1664101 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id AF486DFB7A for ; Mon, 29 Oct 2012 15:27:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 746909E7E9 for ; Mon, 29 Oct 2012 08:27:31 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B2D49F6B2 for ; Mon, 29 Oct 2012 08:25:40 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hj13so1754092wib.12 for ; Mon, 29 Oct 2012 08:25:39 -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=NvFqxyEdp0P2GrsD/WFxJQtQXDq+I8hxtI6T7lBEiZc=; b=af+1pTgKRhQgd1/IJRq6lzr4E0GjyePJiBDwOxFlLrrw7zv7QQAfwdBQIGadmMZiMv 0qAnN8vPhPvVZUehsbwUGAC5GhIrpX4UNA/Dd+3JxPjc8/la0yy2O4XvbY6PZOpSfP0i rTAtD/KYcJIl14Kv2nV0vIuYtm0shcb1kLz8784trcmAZIOQJWS2twrlDuhCkInhUVoH yMVU4agyOYAuZVXXD3OWX1NDrZEnrSIBv93VJyuMEXCcWROg2YEEMqEvr6kN+tupPPVU 9CFn7olKNcl0jaWD0M9M1uieKvCwhW8B/UoWsMX3z+E4fwUrBcTgBPbwYljcCRiQp4xT jJJg== Received: by 10.180.86.4 with SMTP id l4mr2173595wiz.19.1351524339461; Mon, 29 Oct 2012 08:25:39 -0700 (PDT) Received: from localhost.localdomain ([83.217.123.106]) by mx.google.com with ESMTPS id hb6sm10225145wib.7.2012.10.29.08.25.38 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Oct 2012 08:25:38 -0700 (PDT) From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Mon, 29 Oct 2012 15:25:35 +0000 Message-Id: <1351524335-21642-1-git-send-email-damien.lespiau@gmail.com> X-Mailer: git-send-email 1.7.7.5 Subject: [Intel-gfx] [PATCH] drm/i915/tv: Use intel_flush_display_plane() to flush the primary plane 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 Instead of writing to the DSP_ADDR ourselves. This will do the right thing on gen >= 4 as well. Signed-off-by: Damien Lespiau Reviewed-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_tv.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 62bb048..86d5c20 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -1088,13 +1088,11 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, int dspcntr_reg = DSPCNTR(intel_crtc->plane); int pipeconf = I915_READ(pipeconf_reg); int dspcntr = I915_READ(dspcntr_reg); - int dspbase_reg = DSPADDR(intel_crtc->plane); int xpos = 0x0, ypos = 0x0; unsigned int xsize, ysize; /* Pipe must be off here */ I915_WRITE(dspcntr_reg, dspcntr & ~DISPLAY_PLANE_ENABLE); - /* Flush the plane changes */ - I915_WRITE(dspbase_reg, I915_READ(dspbase_reg)); + intel_flush_display_plane(dev_priv, intel_crtc->plane); /* Wait for vblank for the disable to take effect */ if (IS_GEN2(dev)) @@ -1123,8 +1121,7 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, I915_WRITE(pipeconf_reg, pipeconf); I915_WRITE(dspcntr_reg, dspcntr); - /* Flush the plane changes */ - I915_WRITE(dspbase_reg, I915_READ(dspbase_reg)); + intel_flush_display_plane(dev_priv, intel_crtc->plane); } j = 0;