github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 09:04:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/{i915,xe}/panic: convert intel_panic_finish() to struct intel_panic

Browse Source 
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
This commit is contained in:
Jani Nikula 2025-09-02 20:51:53 +03:00
parent 729c5f7ffa
commit 427a3f939a
6 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/display/intel_panic.c
View File

@ -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);
}

3
drivers/gpu/drm/i915/display/intel_panic.h
View File

@ -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__ */

2
drivers/gpu/drm/i915/display/intel_plane.c
View File

@ -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 */

3
drivers/gpu/drm/i915/gem/i915_gem_object.h
View File

@ -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

4
drivers/gpu/drm/i915/gem/i915_gem_pages.c
View File

@ -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);

4
drivers/gpu/drm/xe/display/xe_panic.c
View File

@ -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;
}