summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-02-07 12:00:51 +1000
committerDave Airlie <airlied@redhat.com>2011-02-14 09:22:51 +1000
commit16f9fdcbcce74102bed9a4b7ccc1fb05b5dd6ca3 (patch)
tree26380e1cb53a8e2bb4ae1197f1ffeec43d61f9c1
parent091994cfb8e7d7a372c2d547778a91012d899e16 (diff)
downloadop-kernel-dev-16f9fdcbcce74102bed9a4b7ccc1fb05b5dd6ca3.zip
op-kernel-dev-16f9fdcbcce74102bed9a4b7ccc1fb05b5dd6ca3.tar.gz
drm/radeon: fix memory debugging since d961db75ce86a84f1f04e91ad1014653ed7d9f46
The old code dereferenced a value, the new code just needs to pass the ptr. fixes an oops looking at files in debugfs. cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_ttm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 1272e4b..e5b2cf1 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -787,9 +787,9 @@ static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
radeon_mem_types_list[i].show = &radeon_mm_dump_table;
radeon_mem_types_list[i].driver_features = 0;
if (i == 0)
- radeon_mem_types_list[i].data = &rdev->mman.bdev.man[TTM_PL_VRAM].priv;
+ radeon_mem_types_list[i].data = rdev->mman.bdev.man[TTM_PL_VRAM].priv;
else
- radeon_mem_types_list[i].data = &rdev->mman.bdev.man[TTM_PL_TT].priv;
+ radeon_mem_types_list[i].data = rdev->mman.bdev.man[TTM_PL_TT].priv;
}
/* Add ttm page pool to debugfs */
OpenPOWER on IntegriCloud