Commit fa48f633 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/884ffc80c8b5fef1b92956e644a4e559560cc2ba.1756835342.git.jani.nikula@intel.com
parent 4e839f2c

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

+2 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ struct intel_ddi_buf_trans; 
struct intel_fbc;

struct intel_global_objs_state;

struct intel_hdcp_shim;

struct intel_panic;

struct intel_tc_port;



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



	unsigned int (*panic_tiling)(unsigned int x, unsigned int y, unsigned int width);

	void *panic;

	struct intel_panic *panic;

};



enum intel_hotplug_state {

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

+6 −6
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static void *i915_gem_object_map_pfn(struct drm_i915_gem_object *obj, 
	return vaddr ?: ERR_PTR(-ENOMEM);

}



struct i915_panic_data {

struct intel_panic {

	struct page **pages;

	int page;

	void *vaddr;
@@ -365,10 +365,10 @@ struct i915_panic_data { 


struct i915_framebuffer {

	struct intel_framebuffer base;

	struct i915_panic_data panic;

	struct intel_panic panic;

};



static void i915_panic_kunmap(struct i915_panic_data *panic)

static void i915_panic_kunmap(struct intel_panic *panic)

{

	if (panic->vaddr) {

		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, 
	unsigned int new_page;

	unsigned int offset;

	struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;

	struct i915_panic_data *panic = fb->panic;

	struct intel_panic *panic = fb->panic;



	if (fb->panic_tiling)

		offset = fb->panic_tiling(sb->width, x, y);
@@ -458,7 +458,7 @@ int i915_gem_object_panic_setup(struct drm_scanout_buffer *sb) 
{

	enum i915_map_type has_type;

	struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;

	struct i915_panic_data *panic = fb->panic;

	struct intel_panic *panic = fb->panic;

	struct drm_i915_gem_object *obj = to_intel_bo(intel_fb_bo(&fb->base));

	void *ptr;
@@ -486,7 +486,7 @@ int i915_gem_object_panic_setup(struct drm_scanout_buffer *sb) 


void i915_gem_object_panic_finish(struct intel_framebuffer *fb)

{

	struct i915_panic_data *panic = fb->panic;

	struct intel_panic *panic = fb->panic;



	i915_panic_kunmap(panic);

	panic->page = -1;

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

+6 −6
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "intel_panic.h"

#include "xe_bo.h"



struct xe_panic_data {

struct intel_panic {

	struct page **pages;

	int page;

	void *vaddr;
@@ -17,10 +17,10 @@ struct xe_panic_data { 


struct xe_framebuffer {

	struct intel_framebuffer base;

	struct xe_panic_data panic;

	struct intel_panic panic;

};



static void xe_panic_kunmap(struct xe_panic_data *panic)

static void xe_panic_kunmap(struct intel_panic *panic)

{

	if (panic->vaddr) {

		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 
				    unsigned int y, u32 color)

{

	struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;

	struct xe_panic_data *panic = fb->panic;

	struct intel_panic *panic = fb->panic;

	struct xe_bo *bo = gem_to_xe_bo(intel_fb_bo(&fb->base));

	unsigned int new_page;

	unsigned int offset;
@@ -78,7 +78,7 @@ struct intel_framebuffer *intel_bo_alloc_framebuffer(void) 
int intel_panic_setup(struct drm_scanout_buffer *sb)

{

	struct intel_framebuffer *fb = (struct intel_framebuffer *)sb->private;

	struct xe_panic_data *panic = fb->panic;

	struct intel_panic *panic = fb->panic;



	panic->page = -1;

	sb->set_pixel = xe_panic_page_set_pixel;
@@ -87,7 +87,7 @@ int intel_panic_setup(struct drm_scanout_buffer *sb) 


void intel_panic_finish(struct intel_framebuffer *fb)

{

	struct xe_panic_data *panic = fb->panic;

	struct intel_panic *panic = fb->panic;



	xe_panic_kunmap(panic);

	panic->page = -1;