diff options
author | Christian König <deathsimple@vodafone.de> | 2011-10-24 08:54:54 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 14:28:05 -0500 |
commit | 4d8bf9aee1d8af93748096eb8992e4bb03d3fee0 (patch) | |
tree | df3499a679f3d045a7badfe3a89c9d653ee070cb /drivers/gpu/drm/radeon/radeon.h | |
parent | e2e022ec51a7e85ce4352a53fde1cd11d58e151a (diff) |
drm/radeon: fix debugfs handling v3
Having registered debugfs files globally causes
the files to not show up on the second, third
etc.. card in the system.
v2: fix crash on module unloading
v3: fix space indentation
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index c8f4dbd2d17c..599361466a24 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -873,6 +873,11 @@ void radeon_test_moves(struct radeon_device *rdev); | |||
873 | /* | 873 | /* |
874 | * Debugfs | 874 | * Debugfs |
875 | */ | 875 | */ |
876 | struct radeon_debugfs { | ||
877 | struct drm_info_list *files; | ||
878 | unsigned num_files; | ||
879 | }; | ||
880 | |||
876 | int radeon_debugfs_add_files(struct radeon_device *rdev, | 881 | int radeon_debugfs_add_files(struct radeon_device *rdev, |
877 | struct drm_info_list *files, | 882 | struct drm_info_list *files, |
878 | unsigned nfiles); | 883 | unsigned nfiles); |
@@ -1278,6 +1283,9 @@ struct radeon_device { | |||
1278 | struct drm_file *cmask_filp; | 1283 | struct drm_file *cmask_filp; |
1279 | /* i2c buses */ | 1284 | /* i2c buses */ |
1280 | struct radeon_i2c_chan *i2c_bus[RADEON_MAX_I2C_BUS]; | 1285 | struct radeon_i2c_chan *i2c_bus[RADEON_MAX_I2C_BUS]; |
1286 | /* debugfs */ | ||
1287 | struct radeon_debugfs debugfs[RADEON_DEBUGFS_MAX_COMPONENTS]; | ||
1288 | unsigned debugfs_count; | ||
1281 | }; | 1289 | }; |
1282 | 1290 | ||
1283 | int radeon_device_init(struct radeon_device *rdev, | 1291 | int radeon_device_init(struct radeon_device *rdev, |