v2 of [1], preserving patches 1-3, and rewriting everything else from scratch with a different approach. It's not perfect, but I think it's a better direction. BR, Jani. [1] https://lore.kernel.org/r/cover.1736332802.git.jani.nikula@xxxxxxxxx Jani Nikula (8): drm/i915/display: convert display reset to struct intel_display * drm/i915: move pending_fb_pin to struct intel_display drm/i915/reset: add intel_gt_gpu_reset_clobbers_display() helper drm/i915/reset: add intel_display_reset_test() drm/i915/reset: add wrappers for display reset calls drm/i915/reset: move gt related stuff out of display reset drm/i915/reset: pass test only parameter to intel_display_reset_finish() drm/i915/reset: add modeset_stuck callback to intel_display_reset_prepare() .../gpu/drm/i915/display/intel_display_core.h | 2 + .../drm/i915/display/intel_display_reset.c | 64 +++++++------------ .../drm/i915/display/intel_display_reset.h | 12 +++- drivers/gpu/drm/i915/display/intel_dpt.c | 5 +- drivers/gpu/drm/i915/display/intel_fb_pin.c | 10 +-- drivers/gpu/drm/i915/display/intel_overlay.c | 5 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- drivers/gpu/drm/i915/gt/intel_reset.c | 60 +++++++++++++++-- drivers/gpu/drm/i915/gt/intel_reset.h | 2 + drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.h | 2 - 12 files changed, 105 insertions(+), 63 deletions(-) -- 2.39.5
