From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>, intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: Re: [Intel-gfx] [PATCH] drm/i915/psr: pass i915 to psr_global_enabled()
Date: Mon, 10 Feb 2020 13:00:25 +0200 [thread overview]
Message-ID: <87r1z2aera.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20200204135217.21974-1-jani.nikula@intel.com>
Jani Nikula <jani.nikula@intel.com> writes:
> Make future work slightly easier.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> 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
next prev parent reply other threads:[~2020-02-10 11:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 13:52 [Intel-gfx] [PATCH] drm/i915/psr: pass i915 to psr_global_enabled() Jani Nikula
2020-02-05 2:28 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-02-07 6:15 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-02-10 11:00 ` Mika Kuoppala [this message]
2020-02-10 12:59 ` [Intel-gfx] [PATCH] " Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r1z2aera.fsf@gaia.fi.intel.com \
--to=mika.kuoppala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox