• Rodrigo Vivi's avatar
    drm/xe/display: Avoid encoder_suspend at runtime suspend · 8da19441
    Rodrigo Vivi authored
    Fix circular locking dependency on runtime suspend.
    
    <4> [74.952215] ======================================================
    <4> [74.952217] WARNING: possible circular locking dependency detected
    <4> [74.952219] 6.10.0-rc7-xe #1 Not tainted
    <4> [74.952221] ------------------------------------------------------
    <4> [74.952223] kworker/7:1/82 is trying to acquire lock:
    <4> [74.952226] ffff888120548488 (&dev->mode_config.mutex){+.+.}-{3:3}, at: drm_modeset_lock_all+0x40/0x1e0 [drm]
    <4> [74.952260]
    but task is already holding lock:
    <4> [74.952262] ffffffffa0ae59c0 (xe_pm_runtime_lockdep_map){+.+.}-{0:0}, at: xe_pm_runtime_suspend+0x2f/0x340 [xe]
    <4> [74.952322]
    which lock already depends on the new lock.
    
    The commit 'b1d90a86 ("drm/xe: Use the encoder suspend helper also used
    by the i915 driver")' didn't do anything wrong. It actually fixed a
    critical bug, because the encoder_suspend was never getting actually
    called because it was returning if (has_display(xe)) instead of
    if (!has_display(xe)). However, this ended up introducing the encoder
    suspend calls in the runtime routines as well, causing the circular
    locking dependency.
    
    Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2304
    Fixes: b1d90a86 ("drm/xe: Use the encoder suspend helper also used by the i915 driver")
    Cc: Imre Deak <imre.deak@intel.com>
    Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20240830183507.298351-2-rodrigo.vivi@intel.comSigned-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
    8da19441
xe_display.c 9.28 KB