diff options
author | Anton Altaparmakov <anton@tuxera.com> | 2012-02-24 13:39:16 +0400 |
---|---|---|
committer | Anton Altaparmakov <anton@tuxera.com> | 2012-02-24 13:39:16 +0400 |
commit | 0afa1b62e33250d4777c5803a98ae69fbe872061 (patch) | |
tree | 1c747bc01b62bca85d277e2c8321ae6cf0006ed8 /drivers/gpu/drm/radeon/radeon_ring.c | |
parent | 97387e3baaf3c35ad560f8878e943c720a77da1b (diff) | |
parent | bb4c7e9a9908548b458f34afb2fee74dc0d49f90 (diff) | |
download | linux-0afa1b62e33250d4777c5803a98ae69fbe872061.tar.xz |
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ring.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ring.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index 30a4c5014c8b..92c9ea4751fb 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c @@ -500,8 +500,11 @@ static char radeon_debugfs_ib_names[RADEON_IB_POOL_SIZE][32]; int radeon_debugfs_ring_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - return radeon_debugfs_add_files(rdev, radeon_debugfs_ring_info_list, - ARRAY_SIZE(radeon_debugfs_ring_info_list)); + if (rdev->family >= CHIP_CAYMAN) + return radeon_debugfs_add_files(rdev, radeon_debugfs_ring_info_list, + ARRAY_SIZE(radeon_debugfs_ring_info_list)); + else + return radeon_debugfs_add_files(rdev, radeon_debugfs_ring_info_list, 1); #else return 0; #endif |