Commit 82d1a1b1 authored by Chengming Gui's avatar Chengming Gui Committed by Alex Deucher
Browse files

Revert "drm/amdgpu: use GMC v9 KIQ workaround only for the GFXHUB" (v2) 



With GFXOFF enabled, this patch will cause PCO amdgpu_test failed,
but GFXOFF is necessary for PCO, so revert the patch.

This reverts commit b83761bb.

v2: add a comment for future reference (Alex)

Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarJack Gui <Jack.Gui@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 527aa2a0

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

+6 −3
Original line number Diff line number Diff line
@@ -338,9 +338,12 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, 
		struct amdgpu_vmhub *hub = &adev->vmhub[i];

		u32 tmp = gmc_v9_0_get_invalidate_req(vmid, flush_type);



		if (i == AMDGPU_GFXHUB && !adev->in_gpu_reset &&

		    adev->gfx.kiq.ring.sched.ready &&

		    (amdgpu_sriov_runtime(adev) || !amdgpu_sriov_vf(adev))) {

		/* This is necessary for a HW workaround under SRIOV as well

		 * as GFXOFF under bare metal

		 */

		if (adev->gfx.kiq.ring.sched.ready &&

		    (amdgpu_sriov_runtime(adev) || !amdgpu_sriov_vf(adev)) &&

		    !adev->in_gpu_reset) {

			uint32_t req = hub->vm_inv_eng0_req + eng;

			uint32_t ack = hub->vm_inv_eng0_ack + eng;

CRA Git | Maintained and supported by SUSTech CRA and CCSE