From patchwork Tue Aug 28 22:06:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1382701 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 0FA773FDF5 for ; Tue, 28 Aug 2012 22:09:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D56849EF36 for ; Tue, 28 Aug 2012 15:09:54 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yx0-f177.google.com (mail-yx0-f177.google.com [209.85.213.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F50C9E73D for ; Tue, 28 Aug 2012 15:07:21 -0700 (PDT) Received: by mail-yx0-f177.google.com with SMTP id q9so1203648yen.36 for ; Tue, 28 Aug 2012 15:07:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=nUu0UPnh3KkKQkVqb92fPWVyMyi430ZFCKwtL7VYgtA=; b=UO4CDn2LRaa1XqBlfQQaxE0gsG/RS0dsGQXTbwrlSaR46b/8Vf17UuLEeY6aqo6dq/ pHhbJzgC3NFJzjsDBt1tFxvLpAeZ8zvMwtUs5eHC9CAs2naEOkHXapCHtbzeqh4vtTzN 41uhjByEedSESL5J7BSeiK3QunSj2QdHN2WeMYc3Io8jEhwJKmAhLM7TYwtr4Y1PHJQz WkD045/rRAtaTXBbFW8hYMoa9sZTqT6saKzSYqd9y6jBdd/rgVlR7rIeM66ZkKLWT/4W LEAI6Uw+jKQrWLSiha+JLj713Toz/HjpOZKc3v6jy+CQz0vuYilAdlfQ1WHUNkHT8i8C E7aw== Received: by 10.236.72.103 with SMTP id s67mr15322524yhd.78.1346191641250; Tue, 28 Aug 2012 15:07:21 -0700 (PDT) Received: from vicky.domain.invalid (189.114.178.236.dynamic.adsl.gvt.net.br. [189.114.178.236]) by mx.google.com with ESMTPS id z3sm4434172anj.20.2012.08.28.15.07.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Aug 2012 15:07:20 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Tue, 28 Aug 2012 19:06:34 -0300 Message-Id: <1346191621-12996-4-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1346191621-12996-1-git-send-email-przanoni@gmail.com> References: <1346191621-12996-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [RFC 03/30] drm/i915: wait for idle DDI_BUF_CTL after disabling it 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: Paulo Zanoni Missing from intel_ddi_dpms. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_ddi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index b8b7670..4fd22ae 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -787,6 +787,9 @@ void intel_ddi_dpms(struct drm_encoder *encoder, int mode) */ I915_WRITE(DDI_BUF_CTL(port), temp); + + if (mode != DRM_MODE_DPMS_ON && (temp & DDI_BUF_CTL_ENABLE)) + intel_wait_ddi_buf_idle(dev_priv, port); } static void intel_ddi_disable_pipe(struct drm_i915_private *dev_priv,