]> git.itanic.dy.fi Git - linux-stable/commit
drm/i915/display: Fix warnings about PSR lock not held
authorJosé Roberto de Souza <jose.souza@intel.com>
Wed, 6 Apr 2022 21:05:40 +0000 (14:05 -0700)
committerJosé Roberto de Souza <jose.souza@intel.com>
Fri, 8 Apr 2022 17:20:31 +0000 (10:20 -0700)
commitce21211b4d6b992bd727fb8338bf2a8319288503
tree2917399111c5590d54a2be5e099d2047a7f75d01
parent4b276ed3c7ace7ca41e8963b199358fd55f493af
drm/i915/display: Fix warnings about PSR lock not held

Commit 3b6f409547fb ("drm/i915/display/psr: Lock and unlock PSR around
pipe updates") did not took into account async flips with PSR1 and
PSR2 HW tracking, causing PSR lock not be held and causing warnings
when intel_psr2_program_trans_man_trk_ctl() is executed.

So here taking the PSR lock before the earlier return in
intel_pipe_update_start/end().

Cc: Jouni Högander <jouni.hogander@intel.com>
Reported-by: Imre Deak <imre.deak@intel.com>
Fixes: 3b6f409547fb ("drm/i915/display/psr: Lock and unlock PSR around pipe updates")
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220406210540.493610-1-jose.souza@intel.com
drivers/gpu/drm/i915/display/intel_crtc.c