Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b23e536f authored by changzhu's avatar changzhu Committed by Greg Kroah-Hartman
Browse files

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: default avatarchangzhu <Changfeng.Zhu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 561595df

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

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

+2 −0
Original line number Diff line number Diff line
@@ -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 =

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

+2 −0
Original line number Diff line number Diff line
@@ -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 =

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

+2 −0
Original line number Diff line number Diff line
@@ -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 =

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

+2 −0
Original line number Diff line number Diff line
@@ -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 =