summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom St Denis <tom.stdenis@amd.com>2016-10-13 12:15:03 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-10-25 14:38:46 -0400
commit5ecfb3b8fcb45b971a2f81a7a52d409a52b8b7d9 (patch)
tree3d71921cfc319f148471b33e3d7fd6808c3d47df /drivers
parent273d7aa13c212964cbc725e637b07a13d1b765b4 (diff)
drm/amd/amdgpu: Fix debugfs wave reader
On non VI/CZ platforms it would not free the grbm index lock. Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Tom St Denis <tom.stdenis@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 62c360435732..188b8e0d7bca 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2958,13 +2958,14 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf,
data[x++] = wave_read_ind(adev, 0x2378, 0x2379, simd, wave, 0x14);
data[x++] = wave_read_ind(adev, 0x2378, 0x2379, simd, wave, 0x1A);
data[x++] = wave_read_ind(adev, 0x2378, 0x2379, simd, wave, 0x1B);
- } else {
- return -EINVAL;
}
amdgpu_gfx_select_se_sh(adev, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
mutex_unlock(&adev->grbm_idx_mutex);
+ if (!x)
+ return -EINVAL;
+
while (size && (*pos < x * 4)) {
uint32_t value;