summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>2019-10-22 19:22:11 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-12 19:28:11 +0100
commit2b4be0c276c16b9a8036dd7b87ba7a7b188b7400 (patch)
treebdde5adf64ee3e6e079af013d0c23d290d859999 /drivers
parentbb3d9654cec1e0a05f9ded57fcf48e17bd32abde (diff)
downloadlinux-stable-2b4be0c276c16b9a8036dd7b87ba7a7b188b7400.tar.gz
linux-stable-2b4be0c276c16b9a8036dd7b87ba7a7b188b7400.tar.bz2
linux-stable-2b4be0c276c16b9a8036dd7b87ba7a7b188b7400.zip
drm/amdgpu/sdma5: do not execute 0-sized IBs (v2)
[ Upstream commit 9bdf63d3579e36942f4b91d3558a90da8116bb40 ] This seems to help with https://bugs.freedesktop.org/show_bug.cgi?id=111481. v2: insert a NOP instead of skipping all 0-sized IBs to avoid breaking older hw Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 5eeb72fcc123..6a51e6a4a035 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -264,6 +264,7 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev,
job->vm_pd_addr = amdgpu_gmc_pd_addr(adev->gart.bo);
job->vm_needs_flush = true;
+ job->ibs->ptr[job->ibs->length_dw++] = ring->funcs->nop;
amdgpu_ring_pad_ib(ring, &job->ibs[0]);
r = amdgpu_job_submit(job, &adev->mman.entity,
AMDGPU_FENCE_OWNER_UNDEFINED, &fence);