Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3057281 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Change vram debugfs to NO_KIQ for VM environments 



Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0d2bd2ae

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+6 −6
Original line number Diff line number Diff line
@@ -1696,9 +1696,9 @@ static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf, 
			return result;



		spin_lock_irqsave(&adev->mmio_idx_lock, flags);

		WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);

		WREG32(mmMM_INDEX_HI, *pos >> 31);

		value = RREG32(mmMM_DATA);

		WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);

		WREG32_NO_KIQ(mmMM_INDEX_HI, *pos >> 31);

		value = RREG32_NO_KIQ(mmMM_DATA);

		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);



		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, 
			return r;



		spin_lock_irqsave(&adev->mmio_idx_lock, flags);

		WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);

		WREG32(mmMM_INDEX_HI, *pos >> 31);

		WREG32(mmMM_DATA, value);

		WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);

		WREG32_NO_KIQ(mmMM_INDEX_HI, *pos >> 31);

		WREG32_NO_KIQ(mmMM_DATA, value);

		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);



		result += 4;