Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+14
-13
+2
-1
drivers/gpu/drm/i915/display/intel_display_types.h
+2
-1
drivers/gpu/drm/i915/display/intel_display_types.h
···
60
60
struct intel_fbc;
61
61
struct intel_global_objs_state;
62
62
struct intel_hdcp_shim;
63
+
struct intel_panic;
63
64
struct intel_tc_port;
64
65
65
66
/*
···
150
149
unsigned int vtd_guard;
151
150
152
151
unsigned int (*panic_tiling)(unsigned int x, unsigned int y, unsigned int width);
153
-
void *panic;
152
+
struct intel_panic *panic;
154
153
};
155
154
156
155
enum intel_hotplug_state {
+6
-6
drivers/gpu/drm/i915/gem/i915_gem_pages.c
+6
-6
drivers/gpu/drm/i915/gem/i915_gem_pages.c
···
357
357
return vaddr ?: ERR_PTR(-ENOMEM);
358
358
}
359
359
360
-
struct i915_panic_data {
360
+
struct intel_panic {
361
361
struct page **pages;
362
362
int page;
363
363
void *vaddr;
···
365
365
366
366
struct i915_framebuffer {
367
367
struct intel_framebuffer base;
368
-
struct i915_panic_data panic;
368
+
struct intel_panic panic;
369
369
};
370
370
371
-
static void i915_panic_kunmap(struct i915_panic_data *panic)
371
+
static void i915_panic_kunmap(struct intel_panic *panic)
372
372
{
373
373
if (panic->vaddr) {
374
374
drm_clflush_virt_range(panic->vaddr, PAGE_SIZE);
···
415
415
unsigned int new_page;
416
416
unsigned int offset;
417
417
struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;
418
-
struct i915_panic_data *panic = fb->panic;
418
+
struct intel_panic *panic = fb->panic;
419
419
420
420
if (fb->panic_tiling)
421
421
offset = fb->panic_tiling(sb->width, x, y);
···
458
458
{
459
459
enum i915_map_type has_type;
460
460
struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;
461
-
struct i915_panic_data *panic = fb->panic;
461
+
struct intel_panic *panic = fb->panic;
462
462
struct drm_i915_gem_object *obj = to_intel_bo(intel_fb_bo(&fb->base));
463
463
void *ptr;
464
464
···
486
486
487
487
void i915_gem_object_panic_finish(struct intel_framebuffer *fb)
488
488
{
489
-
struct i915_panic_data *panic = fb->panic;
489
+
struct intel_panic *panic = fb->panic;
490
490
491
491
i915_panic_kunmap(panic);
492
492
panic->page = -1;
+6
-6
drivers/gpu/drm/xe/display/xe_panic.c
+6
-6
drivers/gpu/drm/xe/display/xe_panic.c
···
9
9
#include "intel_panic.h"
10
10
#include "xe_bo.h"
11
11
12
-
struct xe_panic_data {
12
+
struct intel_panic {
13
13
struct page **pages;
14
14
int page;
15
15
void *vaddr;
···
17
17
18
18
struct xe_framebuffer {
19
19
struct intel_framebuffer base;
20
-
struct xe_panic_data panic;
20
+
struct intel_panic panic;
21
21
};
22
22
23
-
static void xe_panic_kunmap(struct xe_panic_data *panic)
23
+
static void xe_panic_kunmap(struct intel_panic *panic)
24
24
{
25
25
if (panic->vaddr) {
26
26
drm_clflush_virt_range(panic->vaddr, PAGE_SIZE);
···
38
38
unsigned int y, u32 color)
39
39
{
40
40
struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;
41
-
struct xe_panic_data *panic = fb->panic;
41
+
struct intel_panic *panic = fb->panic;
42
42
struct xe_bo *bo = gem_to_xe_bo(intel_fb_bo(&fb->base));
43
43
unsigned int new_page;
44
44
unsigned int offset;
···
78
78
int intel_panic_setup(struct drm_scanout_buffer *sb)
79
79
{
80
80
struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;
81
-
struct xe_panic_data *panic = fb->panic;
81
+
struct intel_panic *panic = fb->panic;
82
82
83
83
panic->page = -1;
84
84
sb->set_pixel = xe_panic_page_set_pixel;
···
87
87
88
88
void intel_panic_finish(struct intel_framebuffer *fb)
89
89
{
90
-
struct xe_panic_data *panic = fb->panic;
90
+
struct intel_panic *panic = fb->panic;
91
91
92
92
xe_panic_kunmap(panic);
93
93
panic->page = -1;