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

Commit 40019dc4 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: clean up ring_backup code, no need more 



Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1f465087

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

+0 −4
Original line number Diff line number Diff line
@@ -1213,10 +1213,6 @@ void amdgpu_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count); 
void amdgpu_ring_generic_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib);

void amdgpu_ring_commit(struct amdgpu_ring *ring);

void amdgpu_ring_undo(struct amdgpu_ring *ring);

unsigned amdgpu_ring_backup(struct amdgpu_ring *ring,

			    uint32_t **data);

int amdgpu_ring_restore(struct amdgpu_ring *ring,

			unsigned size, uint32_t *data);

int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,

		     unsigned ring_size, u32 nop, u32 align_mask,

		     struct amdgpu_irq_src *irq_src, unsigned irq_type,

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

+2 −27
Original line number Diff line number Diff line
@@ -1926,11 +1926,6 @@ int amdgpu_resume_kms(struct drm_device *dev, bool resume, bool fbcon) 
 */

int amdgpu_gpu_reset(struct amdgpu_device *adev)

{

	unsigned ring_sizes[AMDGPU_MAX_RINGS];

	uint32_t *ring_data[AMDGPU_MAX_RINGS];



	bool saved = false;



	int i, r;

	int resched;
@@ -1955,19 +1950,6 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
	amdgpu_atombios_scratch_regs_save(adev);

	r = amdgpu_suspend(adev);



	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {

		struct amdgpu_ring *ring = adev->rings[i];

		if (!ring)

			continue;



		ring_sizes[i] = amdgpu_ring_backup(ring, &ring_data[i]);

		if (ring_sizes[i]) {

			saved = true;

			dev_info(adev->dev, "Saved %d dwords of commands "

				 "on ring %d.\n", ring_sizes[i], i);

		}

	}



retry:

	/* Disable fb access */

	if (adev->mode_info.num_crtc) {
@@ -1990,12 +1972,9 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
		r = amdgpu_ib_ring_tests(adev);

		if (r) {

			dev_err(adev->dev, "ib ring test failed (%d).\n", r);

			if (saved) {

				saved = false;

			r = amdgpu_suspend(adev);

			goto retry;

		}

		}



		for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {

			struct amdgpu_ring *ring = adev->rings[i];
@@ -2003,16 +1982,12 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
				continue;

			amd_sched_job_recovery(&ring->sched);

			kthread_unpark(ring->sched.thread);

			kfree(ring_data[i]);

			ring_sizes[i] = 0;

			ring_data[i] = NULL;

		}

	} else {

		dev_err(adev->dev, "asic resume failed (%d).\n", r);

		for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {

			if (adev->rings[i]) {

				kthread_unpark(adev->rings[i]->sched.thread);

				kfree(ring_data[i]);

			}

		}

	}

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

+0 −72
Original line number Diff line number Diff line
@@ -141,78 +141,6 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring) 
	ring->wptr = ring->wptr_old;

}



/**

 * amdgpu_ring_backup - Back up the content of a ring

 *

 * @ring: the ring we want to back up

 *

 * Saves all unprocessed commits from a ring, returns the number of dwords saved.

 */

unsigned amdgpu_ring_backup(struct amdgpu_ring *ring,

			    uint32_t **data)

{

	unsigned size, ptr, i;



	*data = NULL;



	if (ring->ring_obj == NULL)

		return 0;



	/* it doesn't make sense to save anything if all fences are signaled */

	if (!amdgpu_fence_count_emitted(ring))

		return 0;



	ptr = le32_to_cpu(*ring->next_rptr_cpu_addr);



	size = ring->wptr + (ring->ring_size / 4);

	size -= ptr;

	size &= ring->ptr_mask;

	if (size == 0)

		return 0;



	/* and then save the content of the ring */

	*data = kmalloc_array(size, sizeof(uint32_t), GFP_KERNEL);

	if (!*data)

		return 0;

	for (i = 0; i < size; ++i) {

		(*data)[i] = ring->ring[ptr++];

		ptr &= ring->ptr_mask;

	}



	return size;

}



/**

 * amdgpu_ring_restore - append saved commands to the ring again

 *

 * @ring: ring to append commands to

 * @size: number of dwords we want to write

 * @data: saved commands

 *

 * Allocates space on the ring and restore the previously saved commands.

 */

int amdgpu_ring_restore(struct amdgpu_ring *ring,

			unsigned size, uint32_t *data)

{

	int i, r;



	if (!size || !data)

		return 0;



	/* restore the saved ring content */

	r = amdgpu_ring_alloc(ring, size);

	if (r)

		return r;



	for (i = 0; i < size; ++i) {

		amdgpu_ring_write(ring, data[i]);

	}



	amdgpu_ring_commit(ring);

	kfree(data);

	return 0;

}



/**

 * amdgpu_ring_init - init driver ring struct.

 *