]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915/psr: Fix warning in intel_psr_activate()
authorDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Mon, 18 Jun 2018 22:02:07 +0000 (15:02 -0700)
committerDhinakaran Pandiyan <dhinakaran.pandiyan@gmail.com>
Wed, 20 Jun 2018 17:48:15 +0000 (10:48 -0700)
commit98fa2aecb5096bbeb18f6509ffd181aafe4d267d
tree4553475595086e222a380dc7d0e4aa10d91d3b09
parentf648661bc7de497634c474a38608a715a0af4bbd
drm/i915/psr: Fix warning in intel_psr_activate()

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>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180618220207.2778-1-dhinakaran.pandiyan@intel.com
drivers/gpu/drm/i915/intel_psr.c