aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-09-01 09:13:53 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-10-21 11:35:12 -0400
commit0c418f10104d4aa1d6b83698790898dc9ef1c12d (patch)
tree0fe6d3a53c2a9c8d66636124c29b0085b1c00be1 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
parentb7e4dad3e1fc5d3909737fb72e57aedeb0072c7f (diff)
drm/amdgpu: remove the exclusive lock
Finally getting rid of it. Signed-off-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 28c9ee334dd7..19e185ec3707 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1418,7 +1418,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
1418 mutex_init(&adev->gfx.gpu_clock_mutex); 1418 mutex_init(&adev->gfx.gpu_clock_mutex);
1419 mutex_init(&adev->srbm_mutex); 1419 mutex_init(&adev->srbm_mutex);
1420 mutex_init(&adev->grbm_idx_mutex); 1420 mutex_init(&adev->grbm_idx_mutex);
1421 init_rwsem(&adev->exclusive_lock);
1422 mutex_init(&adev->mn_lock); 1421 mutex_init(&adev->mn_lock);
1423 hash_init(adev->mn_hash); 1422 hash_init(adev->mn_hash);
1424 1423
@@ -1814,8 +1813,6 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev)
1814 int i, r; 1813 int i, r;
1815 int resched; 1814 int resched;
1816 1815
1817 down_write(&adev->exclusive_lock);
1818
1819 atomic_inc(&adev->gpu_reset_counter); 1816 atomic_inc(&adev->gpu_reset_counter);
1820 1817
1821 /* block TTM */ 1818 /* block TTM */
@@ -1879,7 +1876,6 @@ retry:
1879 dev_info(adev->dev, "GPU reset failed\n"); 1876 dev_info(adev->dev, "GPU reset failed\n");
1880 } 1877 }
1881 1878
1882 up_write(&adev->exclusive_lock);
1883 return r; 1879 return r;
1884} 1880}
1885 1881