Commit 2dbaf839 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gfx10: always restore kcq/kgq MQDs 



Always restore the MQD not just when we do a reset.
This allows us to move the MQD to VRAM if we want.

v2: always reset ring pointer as well (Christian)

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 45b54a7d

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

+4 −9
Original line number Diff line number Diff line
@@ -6447,16 +6447,14 @@ static int gfx_v10_0_gfx_init_queue(struct amdgpu_ring *ring) 
		mutex_unlock(&adev->srbm_mutex);

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

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

	} else if (amdgpu_in_reset(adev)) {

		/* reset mqd with the backup copy */

	} 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));

		/* reset the ring */

		ring->wptr = 0;

		*ring->wptr_cpu_addr = 0;

		amdgpu_ring_clear_ring(ring);

	} else {

		amdgpu_ring_clear_ring(ring);

	}



	return 0;
@@ -6780,17 +6778,14 @@ static int gfx_v10_0_kcq_init_queue(struct amdgpu_ring *ring) 


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

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

	} else if (amdgpu_in_reset(adev)) { /* for GPU_RESET case */

		/* reset MQD to a clean status */

	} 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));



		/* reset ring buffer */

		ring->wptr = 0;

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

		amdgpu_ring_clear_ring(ring);

	} else {

		amdgpu_ring_clear_ring(ring);

	}



	return 0;