Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-13
+2
-2
drivers/gpu/drm/i915/display/intel_panic.c
+2
-2
drivers/gpu/drm/i915/display/intel_panic.c
+1
-2
drivers/gpu/drm/i915/display/intel_panic.h
+1
-2
drivers/gpu/drm/i915/display/intel_panic.h
···
5
5
#define __INTEL_PANIC_H__
6
6
7
7
struct drm_scanout_buffer;
8
-
struct intel_framebuffer;
9
8
struct intel_panic;
10
9
11
10
struct intel_panic *intel_panic_alloc(void);
12
11
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);
14
13
15
14
#endif /* __INTEL_PANIC_H__ */
+1
-1
drivers/gpu/drm/i915/display/intel_plane.c
+1
-1
drivers/gpu/drm/i915/display/intel_plane.c
···
1326
1326
struct drm_framebuffer *fb = plane_state->hw.fb;
1327
1327
struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
1328
1328
1329
-
intel_panic_finish(intel_fb);
1329
+
intel_panic_finish(intel_fb->panic);
1330
1330
1331
1331
if (crtc_state->enable_psr2_sel_fetch) {
1332
1332
/* Force a full update for psr2 */
+1
-2
drivers/gpu/drm/i915/gem/i915_gem_object.h
+1
-2
drivers/gpu/drm/i915/gem/i915_gem_object.h
···
18
18
19
19
enum intel_region_id;
20
20
struct drm_scanout_buffer;
21
-
struct intel_framebuffer;
22
21
struct intel_panic;
23
22
24
23
#define obj_to_i915(obj__) to_i915((obj__)->base.dev)
···
695
696
696
697
struct intel_panic *i915_gem_object_alloc_panic(void);
697
698
int i915_gem_object_panic_setup(struct drm_scanout_buffer *sb);
698
-
void i915_gem_object_panic_finish(struct intel_framebuffer *fb);
699
+
void i915_gem_object_panic_finish(struct intel_panic *panic);
699
700
700
701
/**
701
702
* i915_gem_object_pin_map - return a contiguous mapping of the entire object
+1
-3
drivers/gpu/drm/i915/gem/i915_gem_pages.c
+1
-3
drivers/gpu/drm/i915/gem/i915_gem_pages.c
···
475
475
return -EOPNOTSUPP;
476
476
}
477
477
478
-
void i915_gem_object_panic_finish(struct intel_framebuffer *fb)
478
+
void i915_gem_object_panic_finish(struct intel_panic *panic)
479
479
{
480
-
struct intel_panic *panic = fb->panic;
481
-
482
480
i915_panic_kunmap(panic);
483
481
panic->page = -1;
484
482
kfree(panic->pages);
+1
-3
drivers/gpu/drm/xe/display/xe_panic.c
+1
-3
drivers/gpu/drm/xe/display/xe_panic.c