Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27c202ad authored by Ben Gamari's avatar Ben Gamari Committed by Eric Anholt
Browse files

drm/i915: Move i915_gem_debugfs.c to i915_debugfs.c 



Signed-off-by: default avatarBen Gamari <bgamari.foss@gmail.com>
[anholt: hand-applied for conflicts]
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 07fb6111

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 


ccflags-y := -Iinclude/drm

i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \

	  i915_debugfs.o \

          i915_suspend.o \

	  i915_gem.o \

	  i915_gem_debug.o \

	  i915_gem_debugfs.o \

	  i915_gem_tiling.o \

	  intel_display.o \

	  intel_crt.o \

drivers/gpu/drm/i915/i915_gem_debugfs.c→drivers/gpu/drm/i915/i915_debugfs.c

+8 −8
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ out: 
	return 0;

}



static struct drm_info_list i915_gem_debugfs_list[] = {

static struct drm_info_list i915_debugfs_list[] = {

	{"i915_gem_active", i915_gem_object_list_info, 0, (void *) ACTIVE_LIST},

	{"i915_gem_flushing", i915_gem_object_list_info, 0, (void *) FLUSHING_LIST},

	{"i915_gem_inactive", i915_gem_object_list_info, 0, (void *) INACTIVE_LIST},
@@ -377,19 +377,19 @@ static struct drm_info_list i915_gem_debugfs_list[] = { 
	{"i915_batchbuffers", i915_batchbuffer_info, 0},

	{"i915_error_state", i915_error_state, 0},

};

#define I915_GEM_DEBUGFS_ENTRIES ARRAY_SIZE(i915_gem_debugfs_list)

#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list)



int i915_gem_debugfs_init(struct drm_minor *minor)

int i915_debugfs_init(struct drm_minor *minor)

{

	return drm_debugfs_create_files(i915_gem_debugfs_list,

					I915_GEM_DEBUGFS_ENTRIES,

	return drm_debugfs_create_files(i915_debugfs_list,

					I915_DEBUGFS_ENTRIES,

					minor->debugfs_root, minor);

}



void i915_gem_debugfs_cleanup(struct drm_minor *minor)

void i915_debugfs_cleanup(struct drm_minor *minor)

{

	drm_debugfs_remove_files(i915_gem_debugfs_list,

				 I915_GEM_DEBUGFS_ENTRIES, minor);

	drm_debugfs_remove_files(i915_debugfs_list,

				 I915_DEBUGFS_ENTRIES, minor);

}



#endif /* CONFIG_DEBUG_FS */

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -188,8 +188,8 @@ static struct drm_driver driver = { 
	.master_create = i915_master_create,

	.master_destroy = i915_master_destroy,

#if defined(CONFIG_DEBUG_FS)

	.debugfs_init = i915_gem_debugfs_init,

	.debugfs_cleanup = i915_gem_debugfs_cleanup,

	.debugfs_init = i915_debugfs_init,

	.debugfs_cleanup = i915_debugfs_cleanup,

#endif

	.gem_init_object = i915_gem_init_object,

	.gem_free_object = i915_gem_free_object,

drivers/gpu/drm/i915/i915_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -730,8 +730,8 @@ void i915_gem_dump_object(struct drm_gem_object *obj, int len, 
void i915_dump_lru(struct drm_device *dev, const char *where);



/* i915_debugfs.c */

int i915_gem_debugfs_init(struct drm_minor *minor);

void i915_gem_debugfs_cleanup(struct drm_minor *minor);

int i915_debugfs_init(struct drm_minor *minor);

void i915_debugfs_cleanup(struct drm_minor *minor);



/* i915_suspend.c */

extern int i915_save_state(struct drm_device *dev);