This patch was already reviewed-by. I think you can land it on the branch directly.
From: amd-gfx <amd-gfx-boun...@lists.freedesktop.org> On Behalf Of Yuan, Xiaojie Sent: Thursday, September 26, 2019 4:09 PM To: amd-gfx@lists.freedesktop.org Cc: alexdeuc...@gmail.com Subject: Re: [PATCH] drm/amdgpu/gmc10: apply the 'invalidation from sdma' workaround for navi Hi Alex, This patch is to add the asic_type check which is missing after drm-next branch rebase. BR, Xiaojie ________________________________ From: Yuan, Xiaojie <xiaojie.y...@amd.com<mailto:xiaojie.y...@amd.com>> Sent: Thursday, September 26, 2019 4:08 PM To: amd-gfx@lists.freedesktop.org<mailto:amd-gfx@lists.freedesktop.org> <amd-gfx@lists.freedesktop.org<mailto:amd-gfx@lists.freedesktop.org>> Cc: alexdeuc...@gmail.com<mailto:alexdeuc...@gmail.com> <alexdeuc...@gmail.com<mailto:alexdeuc...@gmail.com>>; Yuan, Xiaojie <xiaojie.y...@amd.com<mailto:xiaojie.y...@amd.com>> Subject: [PATCH] drm/amdgpu/gmc10: apply the 'invalidation from sdma' workaround for navi Fixes: 767acabdac81 ("drm/amd/powerplay: add baco smu reset function for smu11") Signed-off-by: Xiaojie Yuan <xiaojie.y...@amd.com<mailto:xiaojie.y...@amd.com>> --- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c index cb3f61873baa..dc2e68e019eb 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c @@ -292,6 +292,7 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, if (!adev->mman.buffer_funcs_enabled || !adev->ib_pool_ready || + !(adev->asic_type >= CHIP_NAVI10 && adev->asic_type <= CHIP_NAVI12) || adev->in_gpu_reset) { gmc_v10_0_flush_vm_hub(adev, vmid, AMDGPU_GFXHUB_0, 0); mutex_unlock(&adev->mman.gtt_window_lock); -- 2.20.1
_______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
