Skip to content

Commit 427a3f9

Browse files
committed
drm/{i915,xe}/panic: convert intel_panic_finish() to struct intel_panic
The intel_panic_finish() function really needs the struct intel_panic pointer, not struct intel_framebuffer. Make it so. Cc: Jocelyn Falempe <jfalempe@redhat.com> Cc: Maarten Lankhorst <dev@lankhorst.se> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com> Link: https://lore.kernel.org/r/3fdbcbe17e0e90c4a590f2a2486a9ec79a90cf62.1756835342.git.jani.nikula@intel.com
1 parent 729c5f7 commit 427a3f9

6 files changed

Lines changed: 7 additions & 13 deletions

File tree

drivers/gpu/drm/i915/display/intel_panic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ int intel_panic_setup(struct drm_scanout_buffer *sb)
1414
return i915_gem_object_panic_setup(sb);
1515
}
1616

17-
void intel_panic_finish(struct intel_framebuffer *fb)
17+
void intel_panic_finish(struct intel_panic *panic)
1818
{
19-
return i915_gem_object_panic_finish(fb);
19+
return i915_gem_object_panic_finish(panic);
2020
}

drivers/gpu/drm/i915/display/intel_panic.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
#define __INTEL_PANIC_H__
66

77
struct drm_scanout_buffer;
8-
struct intel_framebuffer;
98
struct intel_panic;
109

1110
struct intel_panic *intel_panic_alloc(void);
1211
int intel_panic_setup(struct drm_scanout_buffer *sb);
13-
void intel_panic_finish(struct intel_framebuffer *fb);
12+
void intel_panic_finish(struct intel_panic *panic);
1413

1514
#endif /* __INTEL_PANIC_H__ */

drivers/gpu/drm/i915/display/intel_plane.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ static void intel_panic_flush(struct drm_plane *plane)
13261326
struct drm_framebuffer *fb = plane_state->hw.fb;
13271327
struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
13281328

1329-
intel_panic_finish(intel_fb);
1329+
intel_panic_finish(intel_fb->panic);
13301330

13311331
if (crtc_state->enable_psr2_sel_fetch) {
13321332
/* Force a full update for psr2 */

drivers/gpu/drm/i915/gem/i915_gem_object.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
enum intel_region_id;
2020
struct drm_scanout_buffer;
21-
struct intel_framebuffer;
2221
struct intel_panic;
2322

2423
#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);
696695

697696
struct intel_panic *i915_gem_object_alloc_panic(void);
698697
int i915_gem_object_panic_setup(struct drm_scanout_buffer *sb);
699-
void i915_gem_object_panic_finish(struct intel_framebuffer *fb);
698+
void i915_gem_object_panic_finish(struct intel_panic *panic);
700699

701700
/**
702701
* i915_gem_object_pin_map - return a contiguous mapping of the entire object

drivers/gpu/drm/i915/gem/i915_gem_pages.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,8 @@ int i915_gem_object_panic_setup(struct drm_scanout_buffer *sb)
475475
return -EOPNOTSUPP;
476476
}
477477

478-
void i915_gem_object_panic_finish(struct intel_framebuffer *fb)
478+
void i915_gem_object_panic_finish(struct intel_panic *panic)
479479
{
480-
struct intel_panic *panic = fb->panic;
481-
482480
i915_panic_kunmap(panic);
483481
panic->page = -1;
484482
kfree(panic->pages);

drivers/gpu/drm/xe/display/xe_panic.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,8 @@ int intel_panic_setup(struct drm_scanout_buffer *sb)
7676
return 0;
7777
}
7878

79-
void intel_panic_finish(struct intel_framebuffer *fb)
79+
void intel_panic_finish(struct intel_panic *panic)
8080
{
81-
struct intel_panic *panic = fb->panic;
82-
8381
xe_panic_kunmap(panic);
8482
panic->page = -1;
8583
}

0 commit comments

Comments
 (0)