Having i915 and xe panic code depend on struct intel_framebuffer is a bit annoying. Break that dependency by storing the tiling function pointer in struct intel_panic, and storing intel_panic pointer in struct drm_scanout_buffer .private member. Do a bunch of cleanups first to make it easier.
Cc: Jocelyn Falempe <[email protected]> Jani Nikula (6): drm/i915/panic: split out i915_gem_panic.[ch] drm/i915/panic: squash i915_panic.c into i915_gem_panic.c drm/i915/panic: remove the extra layer from panic hooks drm/{i915,xe}/panic: pass obj to panic setup drm/xe/panic: store fb bo in struct intel_panic drm/{i915,xe}/panic: drop dependency on struct intel_framebuffer drivers/gpu/drm/i915/Makefile | 4 +- .../drm/i915/display/intel_display_types.h | 1 - drivers/gpu/drm/i915/display/intel_parent.c | 6 +- drivers/gpu/drm/i915/display/intel_parent.h | 4 +- drivers/gpu/drm/i915/display/intel_plane.c | 8 +- drivers/gpu/drm/i915/gem/i915_gem_object.h | 7 - drivers/gpu/drm/i915/gem/i915_gem_pages.c | 128 --------------- drivers/gpu/drm/i915/gem/i915_gem_panic.c | 147 ++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_panic.h | 11 ++ drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_panic.c | 35 ----- drivers/gpu/drm/i915/i915_panic.h | 9 -- drivers/gpu/drm/xe/display/xe_panic.c | 26 ++-- include/drm/intel/display_parent_interface.h | 4 +- 14 files changed, 191 insertions(+), 201 deletions(-) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_panic.c create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_panic.h delete mode 100644 drivers/gpu/drm/i915/i915_panic.c delete mode 100644 drivers/gpu/drm/i915/i915_panic.h -- 2.47.3
