From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15F6EC352A3 for ; Mon, 10 Feb 2020 11:01:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7FD22082F for ; Mon, 10 Feb 2020 11:01:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7FD22082F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6BCC66EBF9; Mon, 10 Feb 2020 11:01:26 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B5286EBEE for ; Mon, 10 Feb 2020 11:01:25 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 03:01:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,424,1574150400"; d="scan'208";a="265815607" Received: from gaia.fi.intel.com ([10.237.72.192]) by fmsmga002.fm.intel.com with ESMTP; 10 Feb 2020 03:01:23 -0800 Received: by gaia.fi.intel.com (Postfix, from userid 1000) id 715485C0D8D; Mon, 10 Feb 2020 13:00:25 +0200 (EET) From: Mika Kuoppala To: Jani Nikula , intel-gfx@lists.freedesktop.org In-Reply-To: <20200204135217.21974-1-jani.nikula@intel.com> References: <20200204135217.21974-1-jani.nikula@intel.com> Date: Mon, 10 Feb 2020 13:00:25 +0200 Message-ID: <87r1z2aera.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/psr: pass i915 to psr_global_enabled() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Jani Nikula writes: > Make future work slightly easier. > > Signed-off-by: Jani Nikula Reviewed-by: Mika Kuoppala > --- > drivers/gpu/drm/i915/display/intel_psr.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c > index db3d1561e9bf..e86e9dc1fe06 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -61,9 +61,9 @@ > * must be correctly synchronized/cancelled when shutting down the pipe." > */ > > -static bool psr_global_enabled(u32 debug) > +static bool psr_global_enabled(struct drm_i915_private *i915) > { > - switch (debug & I915_PSR_DEBUG_MODE_MASK) { > + switch (i915->psr.debug & I915_PSR_DEBUG_MODE_MASK) { > case I915_PSR_DEBUG_DEFAULT: > return i915_modparams.enable_psr; > case I915_PSR_DEBUG_DISABLE: > @@ -930,7 +930,7 @@ void intel_psr_enable(struct intel_dp *intel_dp, > > mutex_lock(&dev_priv->psr.lock); > > - if (!psr_global_enabled(dev_priv->psr.debug)) { > + if (!psr_global_enabled(dev_priv)) { > drm_dbg_kms(&dev_priv->drm, "PSR disabled by flag\n"); > goto unlock; > } > @@ -1085,7 +1085,7 @@ void intel_psr_update(struct intel_dp *intel_dp, > > mutex_lock(&dev_priv->psr.lock); > > - enable = crtc_state->has_psr && psr_global_enabled(psr->debug); > + enable = crtc_state->has_psr && psr_global_enabled(dev_priv); > psr2_enable = intel_psr2_enabled(dev_priv, crtc_state); > > if (enable == psr->enabled && psr2_enable == psr->psr2_enabled) { > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx