diff options
author | Tom St Denis <tom.stdenis@amd.com> | 2017-09-13 12:35:15 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-13 14:56:12 -0400 |
commit | c30572814df55bc648ca449f69849b988abff54a (patch) | |
tree | ce205e6d4926ea28ff564043509f52bfe9686e21 /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
parent | 0d2bd2ae045d8dcb446a3d9a4cecefa70428573a (diff) |
drm/amd/amdgpu: Change vram debugfs to NO_KIQ for VM environments
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index fe887f361be8..b2b11e176667 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |||
@@ -1696,9 +1696,9 @@ static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf, | |||
1696 | return result; | 1696 | return result; |
1697 | 1697 | ||
1698 | spin_lock_irqsave(&adev->mmio_idx_lock, flags); | 1698 | spin_lock_irqsave(&adev->mmio_idx_lock, flags); |
1699 | WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000); | 1699 | WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000); |
1700 | WREG32(mmMM_INDEX_HI, *pos >> 31); | 1700 | WREG32_NO_KIQ(mmMM_INDEX_HI, *pos >> 31); |
1701 | value = RREG32(mmMM_DATA); | 1701 | value = RREG32_NO_KIQ(mmMM_DATA); |
1702 | spin_unlock_irqrestore(&adev->mmio_idx_lock, flags); | 1702 | spin_unlock_irqrestore(&adev->mmio_idx_lock, flags); |
1703 | 1703 | ||
1704 | r = put_user(value, (uint32_t *)buf); | 1704 | r = put_user(value, (uint32_t *)buf); |
@@ -1739,9 +1739,9 @@ static ssize_t amdgpu_ttm_vram_write(struct file *f, const char __user *buf, | |||
1739 | return r; | 1739 | return r; |
1740 | 1740 | ||
1741 | spin_lock_irqsave(&adev->mmio_idx_lock, flags); | 1741 | spin_lock_irqsave(&adev->mmio_idx_lock, flags); |
1742 | WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000); | 1742 | WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000); |
1743 | WREG32(mmMM_INDEX_HI, *pos >> 31); | 1743 | WREG32_NO_KIQ(mmMM_INDEX_HI, *pos >> 31); |
1744 | WREG32(mmMM_DATA, value); | 1744 | WREG32_NO_KIQ(mmMM_DATA, value); |
1745 | spin_unlock_irqrestore(&adev->mmio_idx_lock, flags); | 1745 | spin_unlock_irqrestore(&adev->mmio_idx_lock, flags); |
1746 | 1746 | ||
1747 | result += 4; | 1747 | result += 4; |