diff options
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_panic.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_panic.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_plane.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_pages.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/display/xe_panic.c | 4 |
6 files changed, 7 insertions, 13 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_panic.c b/drivers/gpu/drm/i915/display/intel_panic.c index 5431bd4d3a7d..c8ac8b5a39f3 100644 --- a/drivers/gpu/drm/i915/display/intel_panic.c +++ b/drivers/gpu/drm/i915/display/intel_panic.c @@ -14,7 +14,7 @@ int intel_panic_setup(struct drm_scanout_buffer *sb) return i915_gem_object_panic_setup(sb); } -void intel_panic_finish(struct intel_framebuffer *fb) +void intel_panic_finish(struct intel_panic *panic) { - return i915_gem_object_panic_finish(fb); + return i915_gem_object_panic_finish(panic); } diff --git a/drivers/gpu/drm/i915/display/intel_panic.h b/drivers/gpu/drm/i915/display/intel_panic.h index 45ce6104e6fb..cec193e725a4 100644 --- a/drivers/gpu/drm/i915/display/intel_panic.h +++ b/drivers/gpu/drm/i915/display/intel_panic.h @@ -5,11 +5,10 @@ #define __INTEL_PANIC_H__ struct drm_scanout_buffer; -struct intel_framebuffer; struct intel_panic; struct intel_panic *intel_panic_alloc(void); int intel_panic_setup(struct drm_scanout_buffer *sb); -void intel_panic_finish(struct intel_framebuffer *fb); +void intel_panic_finish(struct intel_panic *panic); #endif /* __INTEL_PANIC_H__ */ diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c index 890d897bda10..6a3f4a7b6dfd 100644 --- a/drivers/gpu/drm/i915/display/intel_plane.c +++ b/drivers/gpu/drm/i915/display/intel_plane.c @@ -1326,7 +1326,7 @@ static void intel_panic_flush(struct drm_plane *plane) struct drm_framebuffer *fb = plane_state->hw.fb; struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb); - intel_panic_finish(intel_fb); + intel_panic_finish(intel_fb->panic); if (crtc_state->enable_psr2_sel_fetch) { /* Force a full update for psr2 */ diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h index 9b3f25cb48db..08da7ec670fe 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@ -18,7 +18,6 @@ enum intel_region_id; struct drm_scanout_buffer; -struct intel_framebuffer; struct intel_panic; #define obj_to_i915(obj__) to_i915((obj__)->base.dev) @@ -696,7 +695,7 @@ int i915_gem_object_truncate(struct drm_i915_gem_object *obj); struct intel_panic *i915_gem_object_alloc_panic(void); int i915_gem_object_panic_setup(struct drm_scanout_buffer *sb); -void i915_gem_object_panic_finish(struct intel_framebuffer *fb); +void i915_gem_object_panic_finish(struct intel_panic *panic); /** * i915_gem_object_pin_map - return a contiguous mapping of the entire object diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c index b219474aecc7..3505b1842c40 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c @@ -475,10 +475,8 @@ int i915_gem_object_panic_setup(struct drm_scanout_buffer *sb) return -EOPNOTSUPP; } -void i915_gem_object_panic_finish(struct intel_framebuffer *fb) +void i915_gem_object_panic_finish(struct intel_panic *panic) { - struct intel_panic *panic = fb->panic; - i915_panic_kunmap(panic); panic->page = -1; kfree(panic->pages); diff --git a/drivers/gpu/drm/xe/display/xe_panic.c b/drivers/gpu/drm/xe/display/xe_panic.c index b5a7615708a1..ea9583473ea3 100644 --- a/drivers/gpu/drm/xe/display/xe_panic.c +++ b/drivers/gpu/drm/xe/display/xe_panic.c @@ -76,10 +76,8 @@ int intel_panic_setup(struct drm_scanout_buffer *sb) return 0; } -void intel_panic_finish(struct intel_framebuffer *fb) +void intel_panic_finish(struct intel_panic *panic) { - struct intel_panic *panic = fb->panic; - xe_panic_kunmap(panic); panic->page = -1; } |