Commit 5f54b219 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/{i915,xe}/panic: split out intel_panic.[ch] 



intel_bo.[ch] is not the appropriate location for the panic
functionality. Split out intel_panic.[ch] and xe_panic.c in i915 and
xe. Keep the function names for now.

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/d98b831a011a028ffd33ce99b0ba62be061ee235.1756835342.git.jani.nikula@intel.com
parent cef2c726

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ i915-y += \ 
	display/intel_modeset_setup.o \

	display/intel_modeset_verify.o \

	display/intel_overlay.o \

	display/intel_panic.o \

	display/intel_pch.o \

	display/intel_pch_display.o \

	display/intel_pch_refclk.o \

drivers/gpu/drm/i915/display/i9xx_plane.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "intel_fb.h"

#include "intel_fbc.h"

#include "intel_frontbuffer.h"

#include "intel_panic.h"

#include "intel_plane.h"

#include "intel_sprite.h"

drivers/gpu/drm/i915/display/intel_bo.c

+0 −15
Original line number Diff line number Diff line
@@ -59,18 +59,3 @@ void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj) 
{

	i915_debugfs_describe_obj(m, to_intel_bo(obj));

}
 


struct intel_framebuffer *intel_bo_alloc_framebuffer(void)

{

	return i915_gem_object_alloc_framebuffer();

}



int intel_bo_panic_setup(struct drm_scanout_buffer *sb)

{

	return i915_gem_object_panic_setup(sb);

}



void intel_bo_panic_finish(struct intel_framebuffer *fb)

{

	return i915_gem_object_panic_finish(fb);

}

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

+0 −3
Original line number Diff line number Diff line
@@ -25,8 +25,5 @@ struct intel_frontbuffer *intel_bo_set_frontbuffer(struct drm_gem_object *obj, 
						   struct intel_frontbuffer *front);



void intel_bo_describe(struct seq_file *m, struct drm_gem_object *obj);

struct intel_framebuffer *intel_bo_alloc_framebuffer(void);

int intel_bo_panic_setup(struct drm_scanout_buffer *sb);

void intel_bo_panic_finish(struct intel_framebuffer *fb);



#endif /* __INTEL_BO__ */

drivers/gpu/drm/i915/display/intel_fb.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "intel_fb.h"

#include "intel_fb_bo.h"

#include "intel_frontbuffer.h"

#include "intel_panic.h"

#include "intel_plane.h"



#define check_array_bounds(display, a, i) drm_WARN_ON((display)->drm, (i) >= ARRAY_SIZE(a))