[Intel-gfx] [PATCH] drm/i915/psr: Fix warning in intel_psr_activate()

[Dhinakaran Pandiyan]

On Mon, 2018-06-18 at 15:27 -0700, Rodrigo Vivi wrote:
> 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 at intel.com>
> > Cc: José Roberto de Souza <jose.souza at 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 at intel.com>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> 
> sorry and thanks for fixing it.
> 
Not a problem. Thanks for the review, patch pushed to dinq

-DK