Skip to content

Commit fa48f63

Browse files
committed
drm/{i915,xe}/panic: rename struct {i915,xe}_panic_data to struct intel_panic
Prepare for better shared interfaces between panic implementations. The struct intel_panic remains an opaque data type, with unique implementations in i915 and xe. This allows us to change the panic data pointer from void * to struct intel_panic *, helping type safety. 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/884ffc80c8b5fef1b92956e644a4e559560cc2ba.1756835342.git.jani.nikula@intel.com
1 parent 4e839f2 commit fa48f63

3 files changed

Lines changed: 14 additions & 13 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ struct intel_ddi_buf_trans;
6060
struct intel_fbc;
6161
struct intel_global_objs_state;
6262
struct intel_hdcp_shim;
63+
struct intel_panic;
6364
struct intel_tc_port;
6465

6566
/*
@@ -149,7 +150,7 @@ struct intel_framebuffer {
149150
unsigned int vtd_guard;
150151

151152
unsigned int (*panic_tiling)(unsigned int x, unsigned int y, unsigned int width);
152-
void *panic;
153+
struct intel_panic *panic;
153154
};
154155

155156
enum intel_hotplug_state {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,18 +357,18 @@ static void *i915_gem_object_map_pfn(struct drm_i915_gem_object *obj,
357357
return vaddr ?: ERR_PTR(-ENOMEM);
358358
}
359359

360-
struct i915_panic_data {
360+
struct intel_panic {
361361
struct page **pages;
362362
int page;
363363
void *vaddr;
364364
};
365365

366366
struct i915_framebuffer {
367367
struct intel_framebuffer base;
368-
struct i915_panic_data panic;
368+
struct intel_panic panic;
369369
};
370370

371-
static void i915_panic_kunmap(struct i915_panic_data *panic)
371+
static void i915_panic_kunmap(struct intel_panic *panic)
372372
{
373373
if (panic->vaddr) {
374374
drm_clflush_virt_range(panic->vaddr, PAGE_SIZE);
@@ -415,7 +415,7 @@ static void i915_gem_object_panic_page_set_pixel(struct drm_scanout_buffer *sb,
415415
unsigned int new_page;
416416
unsigned int offset;
417417
struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;
418-
struct i915_panic_data *panic = fb->panic;
418+
struct intel_panic *panic = fb->panic;
419419

420420
if (fb->panic_tiling)
421421
offset = fb->panic_tiling(sb->width, x, y);
@@ -458,7 +458,7 @@ int i915_gem_object_panic_setup(struct drm_scanout_buffer *sb)
458458
{
459459
enum i915_map_type has_type;
460460
struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;
461-
struct i915_panic_data *panic = fb->panic;
461+
struct intel_panic *panic = fb->panic;
462462
struct drm_i915_gem_object *obj = to_intel_bo(intel_fb_bo(&fb->base));
463463
void *ptr;
464464

@@ -486,7 +486,7 @@ int i915_gem_object_panic_setup(struct drm_scanout_buffer *sb)
486486

487487
void i915_gem_object_panic_finish(struct intel_framebuffer *fb)
488488
{
489-
struct i915_panic_data *panic = fb->panic;
489+
struct intel_panic *panic = fb->panic;
490490

491491
i915_panic_kunmap(panic);
492492
panic->page = -1;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
#include "intel_panic.h"
1010
#include "xe_bo.h"
1111

12-
struct xe_panic_data {
12+
struct intel_panic {
1313
struct page **pages;
1414
int page;
1515
void *vaddr;
1616
};
1717

1818
struct xe_framebuffer {
1919
struct intel_framebuffer base;
20-
struct xe_panic_data panic;
20+
struct intel_panic panic;
2121
};
2222

23-
static void xe_panic_kunmap(struct xe_panic_data *panic)
23+
static void xe_panic_kunmap(struct intel_panic *panic)
2424
{
2525
if (panic->vaddr) {
2626
drm_clflush_virt_range(panic->vaddr, PAGE_SIZE);
@@ -38,7 +38,7 @@ static void xe_panic_page_set_pixel(struct drm_scanout_buffer *sb, unsigned int
3838
unsigned int y, u32 color)
3939
{
4040
struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;
41-
struct xe_panic_data *panic = fb->panic;
41+
struct intel_panic *panic = fb->panic;
4242
struct xe_bo *bo = gem_to_xe_bo(intel_fb_bo(&fb->base));
4343
unsigned int new_page;
4444
unsigned int offset;
@@ -78,7 +78,7 @@ struct intel_framebuffer *intel_bo_alloc_framebuffer(void)
7878
int intel_panic_setup(struct drm_scanout_buffer *sb)
7979
{
8080
struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;
81-
struct xe_panic_data *panic = fb->panic;
81+
struct intel_panic *panic = fb->panic;
8282

8383
panic->page = -1;
8484
sb->set_pixel = xe_panic_page_set_pixel;
@@ -87,7 +87,7 @@ int intel_panic_setup(struct drm_scanout_buffer *sb)
8787

8888
void intel_panic_finish(struct intel_framebuffer *fb)
8989
{
90-
struct xe_panic_data *panic = fb->panic;
90+
struct intel_panic *panic = fb->panic;
9191

9292
xe_panic_kunmap(panic);
9393
panic->page = -1;

0 commit comments

Comments
 (0)