From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915/psr: Fix warning in intel_psr_activate()
Date: Mon, 18 Jun 2018 15:27:32 -0700 [thread overview]
Message-ID: <20180618222732.GH2236@intel.com> (raw)
In-Reply-To: <20180618220207.2778-1-dhinakaran.pandiyan@intel.com>
On Mon, Jun 18, 2018 at 03:02:07PM -0700, Dhinakaran Pandiyan wrote:
> commit 5422b37c907e ("drm/i915/psr: Kill delays when activating psr
> back.") removed the call to cancel a scheduled psr_work from
> psr_disable() and instead added an early return in the work function. But,
> if the scheduled work item is executed after psr_enable(), we end up
> printing warnings as PSR is already enabled and active. So, put the
> cancel_work call back in psr_disable().
>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Fixes: 5422b37c907e ("drm/i915/psr: Kill delays when activating psr back.")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106948
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
sorry and thanks for fixing it.
> ---
> drivers/gpu/drm/i915/intel_psr.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
> index ef0f4741a95d..d4cd19fea148 100644
> --- a/drivers/gpu/drm/i915/intel_psr.c
> +++ b/drivers/gpu/drm/i915/intel_psr.c
> @@ -754,6 +754,7 @@ void intel_psr_disable(struct intel_dp *intel_dp,
>
> dev_priv->psr.enabled = NULL;
> mutex_unlock(&dev_priv->psr.lock);
> + cancel_work_sync(&dev_priv->psr.work);
> }
>
> static bool psr_wait_for_idle(struct drm_i915_private *dev_priv)
> --
> 2.14.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-06-18 22:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-18 22:02 [PATCH] drm/i915/psr: Fix warning in intel_psr_activate() Dhinakaran Pandiyan
2018-06-18 22:25 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-06-18 22:27 ` Rodrigo Vivi [this message]
2018-06-20 20:53 ` [PATCH] " Dhinakaran Pandiyan
2018-06-19 1:12 ` ✓ Fi.CI.IGT: success for " Patchwork
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=20180618222732.GH2236@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=dhinakaran.pandiyan@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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