drm/amdgpu: initialize vm_inv_eng0_sem for gfxhub and mmhub

commit 6c2c8972374ac5c35078d36d7559f64c368f7b33 upstream.

SW must acquire/release one of the vm_invalidate_eng*_sem around the
invalidation req/ack. Through this way,it can avoid losing invalidate
acknowledge state across power-gating off cycle.
To use vm_invalidate_eng*_sem, it needs to initialize
vm_invalidate_eng*_sem firstly.

Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
index b6e1d98ef01e145b1f91a2e96fea13ec67954914..aef6c396bd58c6699738d40457f689cc42367532 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
@@ -77,6 +77,7 @@ struct amdgpu_gmc_fault {
 struct amdgpu_vmhub {
        uint32_t        ctx0_ptb_addr_lo32;
        uint32_t        ctx0_ptb_addr_hi32;
+       uint32_t        vm_inv_eng0_sem;
        uint32_t        vm_inv_eng0_req;
        uint32_t        vm_inv_eng0_ack;
        uint32_t        vm_context0_cntl;

diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
index 6ce37ce77d14ab519eaca87a02886d59aa5be6b7..d6fbdc6c054844c537c5acb6373c075331ec2267 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
@@ -365,6 +365,8 @@ void gfxhub_v1_0_init(struct amdgpu_device *adev)
        hub->ctx0_ptb_addr_hi32 =
                SOC15_REG_OFFSET(GC, 0,
                                 mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32);
+       hub->vm_inv_eng0_sem =
+               SOC15_REG_OFFSET(GC, 0, mmVM_INVALIDATE_ENG0_SEM);
        hub->vm_inv_eng0_req =
                SOC15_REG_OFFSET(GC, 0, mmVM_INVALIDATE_ENG0_REQ);
        hub->vm_inv_eng0_ack =

diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c
index db10640a3b2f3603fd5b0f84b0d329b28836420e..fbe06c13a09cd803bcdba95d02d67684a45e9111 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c
@@ -350,6 +350,8 @@ void gfxhub_v2_0_init(struct amdgpu_device *adev)
        hub->ctx0_ptb_addr_hi32 =
                SOC15_REG_OFFSET(GC, 0,
                                 mmGCVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32);
+       hub->vm_inv_eng0_sem =
+               SOC15_REG_OFFSET(GC, 0, mmGCVM_INVALIDATE_ENG0_SEM);
        hub->vm_inv_eng0_req =
                SOC15_REG_OFFSET(GC, 0, mmGCVM_INVALIDATE_ENG0_REQ);
        hub->vm_inv_eng0_ack =

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
index 04cd4b6f95d48882bbe1e2289701deeeb88b7578..641f1258f08dc5ad4f1c12bf5c17ec7ef6f5a299 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
@@ -418,6 +418,8 @@ void mmhub_v1_0_init(struct amdgpu_device *adev)
        hub->ctx0_ptb_addr_hi32 =
                SOC15_REG_OFFSET(MMHUB, 0,
                                 mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32);
+       hub->vm_inv_eng0_sem =
+               SOC15_REG_OFFSET(MMHUB, 0, mmVM_INVALIDATE_ENG0_SEM);
        hub->vm_inv_eng0_req =
                SOC15_REG_OFFSET(MMHUB, 0, mmVM_INVALIDATE_ENG0_REQ);
        hub->vm_inv_eng0_ack =

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
index b39bea6f54e97b36060029c17bd36cf6cd00760a..096bb883c29df53c24ca5cbf5193c15e2ab562e5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
@@ -341,6 +341,8 @@ void mmhub_v2_0_init(struct amdgpu_device *adev)
        hub->ctx0_ptb_addr_hi32 =
                SOC15_REG_OFFSET(MMHUB, 0,
                                 mmMMVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32);
+       hub->vm_inv_eng0_sem =
+               SOC15_REG_OFFSET(MMHUB, 0, mmMMVM_INVALIDATE_ENG0_SEM);
        hub->vm_inv_eng0_req =
                SOC15_REG_OFFSET(MMHUB, 0, mmMMVM_INVALIDATE_ENG0_REQ);
        hub->vm_inv_eng0_ack =

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
index 9ed178fa241cc8266847db8ff265fb7b0af9bace..fb161c83e409c4eca4944bbeac47e399ad3d7e06 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
@@ -502,6 +502,10 @@ void mmhub_v9_4_init(struct amdgpu_device *adev)
                        SOC15_REG_OFFSET(MMHUB, 0,
                            mmVML2VC0_VM_CONTEXT0_PAGE_TABLE_BASE_ADDR_HI32) +
                            i * MMHUB_INSTANCE_REGISTER_OFFSET;
+               hub[i]->vm_inv_eng0_sem =
+                       SOC15_REG_OFFSET(MMHUB, 0,
+                                        mmVML2VC0_VM_INVALIDATE_ENG0_SEM) +
+                                        i * MMHUB_INSTANCE_REGISTER_OFFSET;
                hub[i]->vm_inv_eng0_req =
                        SOC15_REG_OFFSET(MMHUB, 0,
                                         mmVML2VC0_VM_INVALIDATE_ENG0_REQ) +