Skip to content

drm/i915/reset: Solve display vs. GPU reset deadlock, again

Ville Syrjala dri-devel intel-gfx intel-xe 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 16 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6dma-buf: Remove old lies about dma_fence_wait_any_timeout() not accepting some fencesdrivers/dma-buf/dma-fence.c+2 -32 replies
2/6drm/i915/reset: Reorganize display reset codedrivers/gpu/drm/i915/display/intel_display_reset.c drivers/gpu/drm/i915/display/intel_display_reset.h drivers/gpu/drm/i915/gt/intel_reset.c+20 -191 reply
3/6drm/i915/reset: Move pending_fb_pin handling to i915drivers/gpu/drm/i915/display/intel_display_core.h drivers/gpu/drm/i915/display/intel_display_reset.c drivers/gpu/drm/i915/display/intel_display_reset.h +6 more+28 -381 reply
4/6drm/xe/display: Add init_clock_gating.h stubsdrivers/gpu/drm/i915/display/intel_display_power.c drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h+9 -31 reply
5/6drm/i915/reset: Handle the display vs. GPU reset deadlock using a custom dma-fencedrivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_display_core.h drivers/gpu/drm/i915/display/intel_display_driver.c +3 more+117 -1010 replies
6/6drm/i915/display: Make fence timeout infinitedrivers/gpu/drm/i915/display/intel_display.c+1 -11 reply

Reviews trailers per patch

5 of 6 patches have a Reviewed-by or Acked-by.

PatchJani NikulaChristian König
1/6R-b R-b
2/6R-b
3/6R-b
4/6R-b
5/6R-b
6/6

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/6] drm/i915/reset: Solve display vs. GPU reset deadlock, again

From: Ville Syrjälä <[email protected]>

Apparently we lost proper display vs. GPU reset deadlock handling. Try to bring it back, using a modern dma-fence based approach.

Cc Simona Vetter <[email protected]>
Cc Christian König <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Jouni Högander <[email protected]>
Cc Maarten Lankhorst <[email protected]>

Ville Syrjälä (6):
dma-buf: Remove old lies about dma_fence_wait_any_timeout() not
accepting some fences
drm/i915/reset: Reorganize display reset code drm/i915/reset: Move pending_fb_pin handling to i915 drm/xe/display: Add init_clock_gating.h stubs drm/i915/reset: Handle the display vs. GPU reset deadlock using a
custom dma-fence
drm/i915/display: Make fence timeout infinite

 drivers/dma-buf/dma-fence.c                   |   5 +-
 drivers/gpu/drm/i915/display/intel_display.c  |  34 ++++--
 .../gpu/drm/i915/display/intel_display_core.h |   7 +-
 .../drm/i915/display/intel_display_driver.c   |   5 +
 .../drm/i915/display/intel_display_power.c    |   2 -
 .../drm/i915/display/intel_display_reset.c    | 103 +++++++++++++++---
 .../drm/i915/display/intel_display_reset.h    |   8 +-
 drivers/gpu/drm/i915/display/intel_overlay.c  |  10 +-
 drivers/gpu/drm/i915/gt/intel_reset.c         |  26 +++--
 drivers/gpu/drm/i915/i915_dpt.c               |   5 +-
 drivers/gpu/drm/i915/i915_drv.h               |   2 +
 drivers/gpu/drm/i915/i915_fb_pin.c            |   9 +-
 drivers/gpu/drm/i915/i915_overlay.c           |   6 +
 drivers/gpu/drm/xe/Makefile                   |   1 +
 .../compat-i915-headers/intel_clock_gating.h  |  10 +-
 15 files changed, 168 insertions(+), 65 deletions(-)
Signature · 1 line
2.52.0