Commit b3c942bb authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gfx10,11: use memcpy_to/fromio for MQDs 



Since they were moved to VRAM, we need to use the IO
variants of memcpy.

Fixes: 1cfb4d61 ("drm/amdgpu: put MQDs in VRAM")
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f7aeee73

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

+6 −6
Original line number Diff line number Diff line
@@ -6465,7 +6465,7 @@ static int gfx_v10_0_gfx_init_queue(struct amdgpu_ring *ring) 
		nv_grbm_select(adev, 0, 0, 0, 0);

		mutex_unlock(&adev->srbm_mutex);

		if (adev->gfx.me.mqd_backup[mqd_idx])

			memcpy(adev->gfx.me.mqd_backup[mqd_idx], mqd, sizeof(*mqd));

			memcpy_fromio(adev->gfx.me.mqd_backup[mqd_idx], mqd, sizeof(*mqd));

	} else {

		mutex_lock(&adev->srbm_mutex);

		nv_grbm_select(adev, ring->me, ring->pipe, ring->queue, 0);
@@ -6476,7 +6476,7 @@ static int gfx_v10_0_gfx_init_queue(struct amdgpu_ring *ring) 
		mutex_unlock(&adev->srbm_mutex);

		/* restore mqd with the backup copy */

		if (adev->gfx.me.mqd_backup[mqd_idx])

			memcpy(mqd, adev->gfx.me.mqd_backup[mqd_idx], sizeof(*mqd));

			memcpy_toio(mqd, adev->gfx.me.mqd_backup[mqd_idx], sizeof(*mqd));

		/* reset the ring */

		ring->wptr = 0;

		*ring->wptr_cpu_addr = 0;
@@ -6750,7 +6750,7 @@ static int gfx_v10_0_kiq_init_queue(struct amdgpu_ring *ring) 
	if (amdgpu_in_reset(adev)) { /* for GPU_RESET case */

		/* reset MQD to a clean status */

		if (adev->gfx.kiq[0].mqd_backup)

			memcpy(mqd, adev->gfx.kiq[0].mqd_backup, sizeof(*mqd));

			memcpy_toio(mqd, adev->gfx.kiq[0].mqd_backup, sizeof(*mqd));



		/* reset ring buffer */

		ring->wptr = 0;
@@ -6773,7 +6773,7 @@ static int gfx_v10_0_kiq_init_queue(struct amdgpu_ring *ring) 
		mutex_unlock(&adev->srbm_mutex);



		if (adev->gfx.kiq[0].mqd_backup)

			memcpy(adev->gfx.kiq[0].mqd_backup, mqd, sizeof(*mqd));

			memcpy_fromio(adev->gfx.kiq[0].mqd_backup, mqd, sizeof(*mqd));

	}



	return 0;
@@ -6794,11 +6794,11 @@ static int gfx_v10_0_kcq_init_queue(struct amdgpu_ring *ring) 
		mutex_unlock(&adev->srbm_mutex);



		if (adev->gfx.mec.mqd_backup[mqd_idx])

			memcpy(adev->gfx.mec.mqd_backup[mqd_idx], mqd, sizeof(*mqd));

			memcpy_fromio(adev->gfx.mec.mqd_backup[mqd_idx], mqd, sizeof(*mqd));

	} else {

		/* restore MQD to a clean status */

		if (adev->gfx.mec.mqd_backup[mqd_idx])

			memcpy(mqd, adev->gfx.mec.mqd_backup[mqd_idx], sizeof(*mqd));

			memcpy_toio(mqd, adev->gfx.mec.mqd_backup[mqd_idx], sizeof(*mqd));

		/* reset ring buffer */

		ring->wptr = 0;

		atomic64_set((atomic64_t *)ring->wptr_cpu_addr, 0);

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

+6 −6
Original line number Diff line number Diff line
@@ -3715,11 +3715,11 @@ static int gfx_v11_0_gfx_init_queue(struct amdgpu_ring *ring) 
		soc21_grbm_select(adev, 0, 0, 0, 0);

		mutex_unlock(&adev->srbm_mutex);

		if (adev->gfx.me.mqd_backup[mqd_idx])

			memcpy(adev->gfx.me.mqd_backup[mqd_idx], mqd, sizeof(*mqd));

			memcpy_fromio(adev->gfx.me.mqd_backup[mqd_idx], mqd, sizeof(*mqd));

	} else {

		/* restore mqd with the backup copy */

		if (adev->gfx.me.mqd_backup[mqd_idx])

			memcpy(mqd, adev->gfx.me.mqd_backup[mqd_idx], sizeof(*mqd));

			memcpy_toio(mqd, adev->gfx.me.mqd_backup[mqd_idx], sizeof(*mqd));

		/* reset the ring */

		ring->wptr = 0;

		*ring->wptr_cpu_addr = 0;
@@ -4008,7 +4008,7 @@ static int gfx_v11_0_kiq_init_queue(struct amdgpu_ring *ring) 
	if (amdgpu_in_reset(adev)) { /* for GPU_RESET case */

		/* reset MQD to a clean status */

		if (adev->gfx.kiq[0].mqd_backup)

			memcpy(mqd, adev->gfx.kiq[0].mqd_backup, sizeof(*mqd));

			memcpy_toio(mqd, adev->gfx.kiq[0].mqd_backup, sizeof(*mqd));



		/* reset ring buffer */

		ring->wptr = 0;
@@ -4031,7 +4031,7 @@ static int gfx_v11_0_kiq_init_queue(struct amdgpu_ring *ring) 
		mutex_unlock(&adev->srbm_mutex);



		if (adev->gfx.kiq[0].mqd_backup)

			memcpy(adev->gfx.kiq[0].mqd_backup, mqd, sizeof(*mqd));

			memcpy_fromio(adev->gfx.kiq[0].mqd_backup, mqd, sizeof(*mqd));

	}



	return 0;
@@ -4052,11 +4052,11 @@ static int gfx_v11_0_kcq_init_queue(struct amdgpu_ring *ring) 
		mutex_unlock(&adev->srbm_mutex);



		if (adev->gfx.mec.mqd_backup[mqd_idx])

			memcpy(adev->gfx.mec.mqd_backup[mqd_idx], mqd, sizeof(*mqd));

			memcpy_fromio(adev->gfx.mec.mqd_backup[mqd_idx], mqd, sizeof(*mqd));

	} else {

		/* restore MQD to a clean status */

		if (adev->gfx.mec.mqd_backup[mqd_idx])

			memcpy(mqd, adev->gfx.mec.mqd_backup[mqd_idx], sizeof(*mqd));

			memcpy_toio(mqd, adev->gfx.mec.mqd_backup[mqd_idx], sizeof(*mqd));

		/* reset ring buffer */

		ring->wptr = 0;

		atomic64_set((atomic64_t *)ring->wptr_cpu_addr, 0);