From patchwork Fri Nov 14 16:52:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 5310431 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 58D66C11AF for ; Fri, 14 Nov 2014 23:52:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F313201E4 for ; Fri, 14 Nov 2014 23:52:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9E2DB201ED for ; Fri, 14 Nov 2014 23:52:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7EDDE6E79B; Fri, 14 Nov 2014 15:52:29 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F1B86E8A8 for ; Fri, 14 Nov 2014 15:52:18 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 14 Nov 2014 15:49:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,388,1413270000"; d="scan'208";a="608154665" Received: from rdvivi-hillsboro.jf.intel.com ([10.7.196.162]) by orsmga001.jf.intel.com with ESMTP; 14 Nov 2014 15:52:17 -0800 From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Fri, 14 Nov 2014 08:52:35 -0800 Message-Id: <1415983961-4485-9-git-send-email-rodrigo.vivi@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415983961-4485-1-git-send-email-rodrigo.vivi@intel.com> References: <1415983961-4485-1-git-send-email-rodrigo.vivi@intel.com> Cc: Rodrigo Vivi Subject: [Intel-gfx] [PATCH 09/15] drm/i915: Fix intel_psr_is_enabled function and document it. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 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=-2.7 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, RCVD_IN_DNSWL_MED, T_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 This function can be used to check if psr feature got enabled. However on HSW and BDW we currently force psr exit by disabling EDP_PSR_ENABLE bit at EDP_PSR_CTL(dev). So this function was actually returning the active/inactive state that is different from the enable/disable meaning and had the risk of false negative. So let's just return the presence of intel_dp at dev_priv->psr.enabled. It would be more easy to just check this presence directly but let's keep it more organized. Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/i915/intel_psr.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index 66d24c2..c296a89 100644 --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c @@ -61,6 +61,16 @@ static bool is_edp_psr(struct intel_dp *intel_dp) return intel_dp->psr_dpcd[0] & DP_PSR_IS_SUPPORTED; } +/** + * intel_psr_is_enabled - Is PSR enabled? + * @dev: DRM Device + * + * This function can be used to verify if PSR feature is enabled. + * Since on Haswell+ we force the exit by disabling + * EDP_PSR_ENABLE bit at EDP_PSR_CTL(dev) + * the most reliable way to export if psr feature is enabled is to + * check the presence of intel_dp at dev_priv->psr.enabled. + */ bool intel_psr_is_enabled(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -68,7 +78,7 @@ bool intel_psr_is_enabled(struct drm_device *dev) if (!HAS_PSR(dev)) return false; - return I915_READ(EDP_PSR_CTL(dev)) & EDP_PSR_ENABLE; + return (bool)dev_priv->psr.enabled; } static void intel_psr_write_vsc(struct intel_dp *intel_dp,