From patchwork Thu Apr 10 18:04:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 3964021 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9C1F49F374 for ; Thu, 10 Apr 2014 18:04:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D886020351 for ; Thu, 10 Apr 2014 18:04:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 10F0C20165 for ; Thu, 10 Apr 2014 18:04:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C22B6E288; Thu, 10 Apr 2014 11:04:22 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id C854E6E288 for ; Thu, 10 Apr 2014 11:04:20 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 10 Apr 2014 11:04:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,835,1389772800"; d="scan'208";a="490930396" Received: from bolo_yeung.jf.intel.com ([10.7.197.242]) by orsmga001.jf.intel.com with ESMTP; 10 Apr 2014 11:04:18 -0700 From: Ben Widawsky To: Intel GFX Date: Thu, 10 Apr 2014 11:04:17 -0700 Message-Id: <1397153057-23439-1-git-send-email-benjamin.widawsky@intel.com> X-Mailer: git-send-email 1.9.1 Cc: Ben Widawsky , Art Runyan Subject: [Intel-gfx] [PATCH] drm/i915/bdw: Add 42ms delay for IPS disable X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ben Widawsky This is a requirement added to the spec. This patch will present persistent corruption on the display. Cc: Art Runyan Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/intel_display.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7f02444..ebc84ee 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3583,7 +3583,7 @@ void hsw_disable_ips(struct intel_crtc *crtc) return; assert_plane_enabled(dev_priv, crtc->plane); - if (IS_BROADWELL(crtc->base.dev)) { + if (IS_BROADWELL(dev)) { mutex_lock(&dev_priv->rps.hw_lock); WARN_ON(sandybridge_pcode_write(dev_priv, DISPLAY_IPS_CONTROL, 0)); mutex_unlock(&dev_priv->rps.hw_lock); @@ -3594,6 +3594,10 @@ void hsw_disable_ips(struct intel_crtc *crtc) /* We need to wait for a vblank before we can disable the plane. */ intel_wait_for_vblank(dev, crtc->pipe); + + /* wait for pcode to finish disabling IPS, which may take up to 42ms */ + if (IS_BROADWELL(dev)) + msleep(42); } /** Loads the palette/gamma unit for the CRTC with the prepared values */