[PATCH] drm/amdgpu/gmc10: apply the 'invalidation from sdma' workaround for navi12

[Yuan, Xiaojie]

Thanks Evan. Since we currently has only once place to check 'is navi series', I'd prefer not to put into a macro until we have another place to check that. Does the change below looks good to you?

-           adev->asic_type > CHIP_NAVI14 ||
+           !(adev->asic_type >= CHIP_NAVI10 && adev->asic_type <= CHIP_NAVI12) ||

BR,
Xiaojie

________________________________________
From: Quan, Evan <Evan.Quan at amd.com>
Sent: Tuesday, September 24, 2019 11:18 AM
To: Yuan, Xiaojie; amd-gfx at lists.freedesktop.org
Cc: Zhang, Hawking; Xiao, Jack; Yin, Tianci (Rico)
Subject: RE: [PATCH] drm/amdgpu/gmc10: apply the 'invalidation from sdma' workaround for navi12

A small nitpick: if this workaround is needed for all NAVi ASICs, can we make a macro for this?
e.g.  #define ASIC_IS_NAVI_SERIES(adev)               (adev->asic_type >= CHIP_NAVI10 && adev->asic_type <= NAVI12)

Then we can use
        if (!adev->mman.buffer_funcs_enabled ||
            !adev->ib_pool_ready ||
-           adev->asic_type > CHIP_NAVI14 ||
+           !ASIC_IS_NAVI_SERIES(adev) ||
            adev->in_gpu_reset) {

-----Original Message-----
From: Yuan, Xiaojie <Xiaojie.Yuan at amd.com>
Sent: Tuesday, September 24, 2019 11:01 AM
To: amd-gfx at lists.freedesktop.org
Cc: Zhang, Hawking <Hawking.Zhang at amd.com>; Xiao, Jack <Jack.Xiao at amd.com>; Yin, Tianci (Rico) <Tianci.Yin at amd.com>; Quan, Evan <Evan.Quan at amd.com>; Yuan, Xiaojie <Xiaojie.Yuan at amd.com>
Subject: [PATCH] drm/amdgpu/gmc10: apply the 'invalidation from sdma' workaround for navi12

when gfxoff is enabled, sdma hangs while entering desktop without this workaround

Signed-off-by: Xiaojie Yuan <xiaojie.yuan at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index ed1c3b883f6a..0304ca8fe723 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -291,7 +291,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_NAVI14 ||
+           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