From patchwork Wed Jul 12 19:20:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 9837299 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A792060393 for ; Wed, 12 Jul 2017 19:20:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9404C285EB for ; Wed, 12 Jul 2017 19:20:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8707328654; Wed, 12 Jul 2017 19:20:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0AC05285EB for ; Wed, 12 Jul 2017 19:20:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D9FD6E2E2; Wed, 12 Jul 2017 19:20:43 +0000 (UTC) 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 ESMTPS id 9199B6E2E2 for ; Wed, 12 Jul 2017 19:20:42 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jul 2017 12:20:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.40,351,1496127600"; d="scan'208"; a="1150899882" Received: from rdvivi-vienna.jf.intel.com ([10.7.196.72]) by orsmga001.jf.intel.com with ESMTP; 12 Jul 2017 12:20:41 -0700 From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Wed, 12 Jul 2017 12:20:31 -0700 Message-Id: <20170712192042.19782-2-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170712192042.19782-1-rodrigo.vivi@intel.com> References: <20170712192042.19782-1-rodrigo.vivi@intel.com> Cc: Dhinakaran Pandiyan , Rodrigo Vivi Subject: [Intel-gfx] [PATCH 01/12] drm/i915/psr: Remove vlv_is_active function. 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-Virus-Scanned: ClamAV using ClamSMTP Let's start the clean-up and re-org of VLV PSR functions by removing an useless one. Cc: Dhinakaran Pandiyan Cc: Jim Bride Cc: Vathsala NAgaraju Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/i915/intel_psr.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index 559f1ab42bfc..1af4438a6095 100644 --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c @@ -61,17 +61,6 @@ static bool is_edp_psr(struct intel_dp *intel_dp) return intel_dp->psr_dpcd[0] & DP_PSR_IS_SUPPORTED; } -static bool vlv_is_psr_active_on_pipe(struct drm_device *dev, int pipe) -{ - struct drm_i915_private *dev_priv = to_i915(dev); - uint32_t val; - - val = I915_READ(VLV_PSRSTAT(pipe)) & - VLV_EDP_PSR_CURR_STATE_MASK; - return (val == VLV_EDP_PSR_ACTIVE_NORFB_UP) || - (val == VLV_EDP_PSR_ACTIVE_SF_UPDATE); -} - static void intel_psr_write_vsc(struct intel_dp *intel_dp, const struct edp_vsc_psr *vsc_psr) { @@ -610,7 +599,10 @@ static void vlv_psr_disable(struct intel_dp *intel_dp) dev_priv->psr.active = false; } else { - WARN_ON(vlv_is_psr_active_on_pipe(dev, intel_crtc->pipe)); + val = I915_READ(VLV_PSRSTAT(intel_crtc->pipe)) & + VLV_EDP_PSR_CURR_STATE_MASK; + WARN_ON(val == VLV_EDP_PSR_ACTIVE_NORFB_UP || + val == VLV_EDP_PSR_ACTIVE_SF_UPDATE); } }