Commit 812330eb authored by Yong Zhao's avatar Yong Zhao Committed by Alex Deucher
Browse files

drm/amdkfd: Add an error print if SDMA RLC is not idle 



The message will be useful when troubleshooting the issues.

Signed-off-by: default avatarYong Zhao <Yong.Zhao@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0b36603c

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

+6 −2
Original line number Diff line number Diff line
@@ -152,8 +152,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, 
		data = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (data & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

		if (time_after(jiffies, end_jiffies)) {

			pr_err("SDMA RLC not idle in %s\n", __func__);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}

	data = RREG32(sdmax_gfx_context_cntl);
@@ -271,8 +273,10 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, 
		temp = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (temp & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

		if (time_after(jiffies, end_jiffies)) {

			pr_err("SDMA RLC not idle in %s\n", __func__);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}

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

+6 −2
Original line number Diff line number Diff line
@@ -510,8 +510,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, 
		data = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (data & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

		if (time_after(jiffies, end_jiffies)) {

			pr_err("SDMA RLC not idle in %s\n", __func__);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}

	data = RREG32(sdmax_gfx_context_cntl);
@@ -762,8 +764,10 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, 
		temp = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (temp & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

		if (time_after(jiffies, end_jiffies)) {

			pr_err("SDMA RLC not idle in %s\n", __func__);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}

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

+6 −2
Original line number Diff line number Diff line
@@ -427,8 +427,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, 
		data = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (data & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

		if (time_after(jiffies, end_jiffies)) {

			pr_err("SDMA RLC not idle in %s\n", __func__);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}

	if (m->sdma_engine_id) {
@@ -660,8 +662,10 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, 
		temp = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (temp & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

		if (time_after(jiffies, end_jiffies)) {

			pr_err("SDMA RLC not idle in %s\n", __func__);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}

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

+6 −2
Original line number Diff line number Diff line
@@ -411,8 +411,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, 
		data = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (data & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

		if (time_after(jiffies, end_jiffies)) {

			pr_err("SDMA RLC not idle in %s\n", __func__);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}

	if (m->sdma_engine_id) {
@@ -656,8 +658,10 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, 
		temp = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (temp & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

		if (time_after(jiffies, end_jiffies)) {

			pr_err("SDMA RLC not idle in %s\n", __func__);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}

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

+6 −2
Original line number Diff line number Diff line
@@ -409,8 +409,10 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, 
		data = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (data & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

		if (time_after(jiffies, end_jiffies)) {

			pr_err("SDMA RLC not idle in %s\n", __func__);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}

	data = RREG32(sdmax_gfx_context_cntl);
@@ -600,8 +602,10 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, 
		temp = RREG32(sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS);

		if (temp & SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK)

			break;

		if (time_after(jiffies, end_jiffies))

		if (time_after(jiffies, end_jiffies)) {

			pr_err("SDMA RLC not idle in %s\n", __func__);

			return -ETIME;

		}

		usleep_range(500, 1000);

	}