diff options
author | Ben Gamari <bgamari.foss@gmail.com> | 2009-07-01 22:26:52 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-09-04 16:05:08 -0400 |
commit | 27c202ad7f141d4efa9c64e30bf4a4d3bcd799ae (patch) | |
tree | 0c01ad9a8851c0c9cbee6382558045e87265e357 /drivers/gpu/drm/i915 | |
parent | 07fb6111e7af5fac6b6076e2658d0e32b67f713b (diff) |
drm/i915: Move i915_gem_debugfs.c to i915_debugfs.c
Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
[anholt: hand-applied for conflicts]
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c (renamed from drivers/gpu/drm/i915/i915_gem_debugfs.c) | 16 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 30d6b99fb30..5269dfa5f62 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile | |||
@@ -4,10 +4,10 @@ | |||
4 | 4 | ||
5 | ccflags-y := -Iinclude/drm | 5 | ccflags-y := -Iinclude/drm |
6 | i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \ | 6 | i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \ |
7 | i915_debugfs.o \ | ||
7 | i915_suspend.o \ | 8 | i915_suspend.o \ |
8 | i915_gem.o \ | 9 | i915_gem.o \ |
9 | i915_gem_debug.o \ | 10 | i915_gem_debug.o \ |
10 | i915_gem_debugfs.o \ | ||
11 | i915_gem_tiling.o \ | 11 | i915_gem_tiling.o \ |
12 | intel_display.o \ | 12 | intel_display.o \ |
13 | intel_crt.o \ | 13 | intel_crt.o \ |
diff --git a/drivers/gpu/drm/i915/i915_gem_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index cb3b97405fb..b4f2d6bce15 100644 --- a/drivers/gpu/drm/i915/i915_gem_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -363,7 +363,7 @@ out: | |||
363 | return 0; | 363 | return 0; |
364 | } | 364 | } |
365 | 365 | ||
366 | static struct drm_info_list i915_gem_debugfs_list[] = { | 366 | static struct drm_info_list i915_debugfs_list[] = { |
367 | {"i915_gem_active", i915_gem_object_list_info, 0, (void *) ACTIVE_LIST}, | 367 | {"i915_gem_active", i915_gem_object_list_info, 0, (void *) ACTIVE_LIST}, |
368 | {"i915_gem_flushing", i915_gem_object_list_info, 0, (void *) FLUSHING_LIST}, | 368 | {"i915_gem_flushing", i915_gem_object_list_info, 0, (void *) FLUSHING_LIST}, |
369 | {"i915_gem_inactive", i915_gem_object_list_info, 0, (void *) INACTIVE_LIST}, | 369 | {"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[] = { | |||
377 | {"i915_batchbuffers", i915_batchbuffer_info, 0}, | 377 | {"i915_batchbuffers", i915_batchbuffer_info, 0}, |
378 | {"i915_error_state", i915_error_state, 0}, | 378 | {"i915_error_state", i915_error_state, 0}, |
379 | }; | 379 | }; |
380 | #define I915_GEM_DEBUGFS_ENTRIES ARRAY_SIZE(i915_gem_debugfs_list) | 380 | #define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list) |
381 | 381 | ||
382 | int i915_gem_debugfs_init(struct drm_minor *minor) | 382 | int i915_debugfs_init(struct drm_minor *minor) |
383 | { | 383 | { |
384 | return drm_debugfs_create_files(i915_gem_debugfs_list, | 384 | return drm_debugfs_create_files(i915_debugfs_list, |
385 | I915_GEM_DEBUGFS_ENTRIES, | 385 | I915_DEBUGFS_ENTRIES, |
386 | minor->debugfs_root, minor); | 386 | minor->debugfs_root, minor); |
387 | } | 387 | } |
388 | 388 | ||
389 | void i915_gem_debugfs_cleanup(struct drm_minor *minor) | 389 | void i915_debugfs_cleanup(struct drm_minor *minor) |
390 | { | 390 | { |
391 | drm_debugfs_remove_files(i915_gem_debugfs_list, | 391 | drm_debugfs_remove_files(i915_debugfs_list, |
392 | I915_GEM_DEBUGFS_ENTRIES, minor); | 392 | I915_DEBUGFS_ENTRIES, minor); |
393 | } | 393 | } |
394 | 394 | ||
395 | #endif /* CONFIG_DEBUG_FS */ | 395 | #endif /* CONFIG_DEBUG_FS */ |
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index fc4b68aa2d0..263636e77e6 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -188,8 +188,8 @@ static struct drm_driver driver = { | |||
188 | .master_create = i915_master_create, | 188 | .master_create = i915_master_create, |
189 | .master_destroy = i915_master_destroy, | 189 | .master_destroy = i915_master_destroy, |
190 | #if defined(CONFIG_DEBUG_FS) | 190 | #if defined(CONFIG_DEBUG_FS) |
191 | .debugfs_init = i915_gem_debugfs_init, | 191 | .debugfs_init = i915_debugfs_init, |
192 | .debugfs_cleanup = i915_gem_debugfs_cleanup, | 192 | .debugfs_cleanup = i915_debugfs_cleanup, |
193 | #endif | 193 | #endif |
194 | .gem_init_object = i915_gem_init_object, | 194 | .gem_init_object = i915_gem_init_object, |
195 | .gem_free_object = i915_gem_free_object, | 195 | .gem_free_object = i915_gem_free_object, |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 5b4f87e5562..e286f4e13bd 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -730,8 +730,8 @@ void i915_gem_dump_object(struct drm_gem_object *obj, int len, | |||
730 | void i915_dump_lru(struct drm_device *dev, const char *where); | 730 | void i915_dump_lru(struct drm_device *dev, const char *where); |
731 | 731 | ||
732 | /* i915_debugfs.c */ | 732 | /* i915_debugfs.c */ |
733 | int i915_gem_debugfs_init(struct drm_minor *minor); | 733 | int i915_debugfs_init(struct drm_minor *minor); |
734 | void i915_gem_debugfs_cleanup(struct drm_minor *minor); | 734 | void i915_debugfs_cleanup(struct drm_minor *minor); |
735 | 735 | ||
736 | /* i915_suspend.c */ | 736 | /* i915_suspend.c */ |
737 | extern int i915_save_state(struct drm_device *dev); | 737 | extern int i915_save_state(struct drm_device *dev); |