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

Commit 1b0bfcff authored by Shaoyun Liu's avatar Shaoyun Liu Committed by Oded Gabbay
Browse files

drm/amdgpu: Avoid destroy hqd when GPU is on reset 



Signed-off-by: default avatarShaoyun Liu <Shaoyun.Liu@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent bff418a2

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

+3 −0
Original line number Diff line number Diff line
@@ -575,6 +575,9 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, 
	unsigned long flags, end_jiffies;

	int retry;



	if (adev->in_gpu_reset)

		return -EIO;



	acquire_queue(kgd, pipe_id, queue_id);

	WREG32(mmCP_HQD_PQ_DOORBELL_CONTROL, 0);

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

+3 −0
Original line number Diff line number Diff line
@@ -570,6 +570,9 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, 
	int retry;

	struct vi_mqd *m = get_mqd(mqd);



	if (adev->in_gpu_reset)

		return -EIO;



	acquire_queue(kgd, pipe_id, queue_id);



	if (m->cp_hqd_vmid == 0)

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

+3 −0
Original line number Diff line number Diff line
@@ -680,6 +680,9 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, 
	uint32_t temp;

	struct v9_mqd *m = get_mqd(mqd);



	if (adev->in_gpu_reset)

		return -EIO;



	acquire_queue(kgd, pipe_id, queue_id);



	if (m->cp_hqd_vmid == 0)