aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2017-08-07 08:07:43 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-08-17 15:46:01 -0400
commit12d4ac584465845af3c7fba090a82c8ee84180d1 (patch)
tree1dac2cb896511cf7e6857b0afd582b0ab8946bc9 /drivers/gpu
parentbbbb29efa20d5526c2e6a04d08b3d94376cf73cf (diff)
drm/amdgpu: fix incorrect use of the lru_lock
The BO manager has its own lock and doesn't use the lru_lock. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 00817b9712df..e0520974e863 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1649,13 +1649,10 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data)
1649 unsigned ttm_pl = *(int *)node->info_ent->data; 1649 unsigned ttm_pl = *(int *)node->info_ent->data;
1650 struct drm_device *dev = node->minor->dev; 1650 struct drm_device *dev = node->minor->dev;
1651 struct amdgpu_device *adev = dev->dev_private; 1651 struct amdgpu_device *adev = dev->dev_private;
1652 struct drm_mm *mm = (struct drm_mm *)adev->mman.bdev.man[ttm_pl].priv; 1652 struct ttm_mem_type_manager *man = &adev->mman.bdev.man[ttm_pl];
1653 struct ttm_bo_global *glob = adev->mman.bdev.glob;
1654 struct drm_printer p = drm_seq_file_printer(m); 1653 struct drm_printer p = drm_seq_file_printer(m);
1655 1654
1656 spin_lock(&glob->lru_lock); 1655 man->func->debug(man, &p);
1657 drm_mm_print(mm, &p);
1658 spin_unlock(&glob->lru_lock);
1659 switch (ttm_pl) { 1656 switch (ttm_pl) {
1660 case TTM_PL_VRAM: 1657 case TTM_PL_VRAM:
1661 seq_printf(m, "man size:%llu pages, ram usage:%lluMB, vis usage:%lluMB\n", 1658 seq_printf(m, "man size:%llu pages, ram usage:%lluMB, vis usage:%lluMB\n",