Commit c107171b authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: add the sched_score to amdgpu_ring_init 



Allow separate ring to share the same scheduler score.

No functional change.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-and-Tested-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7df4ceb6

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

+26 −24
Original line number Diff line number Diff line
@@ -439,7 +439,8 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, 
 * Helper function for amdgpu_fence_driver_init().

 */

int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,

				  unsigned num_hw_submission)

				  unsigned num_hw_submission,

				  atomic_t *sched_score)

{

	struct amdgpu_device *adev = ring->adev;

	long timeout;
@@ -467,7 +468,9 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring, 
		return -ENOMEM;



	/* No need to setup the GPU scheduler for rings that don't need it */

	if (!ring->no_scheduler) {

	if (ring->no_scheduler)

		return 0;



	switch (ring->funcs->type) {

	case AMDGPU_RING_TYPE_GFX:

		timeout = adev->gfx_timeout;
@@ -485,13 +488,12 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring, 


	r = drm_sched_init(&ring->sched, &amdgpu_sched_ops,

			   num_hw_submission, amdgpu_job_hang_limit,

				   timeout, NULL, ring->name);

			   timeout, sched_score, ring->name);

	if (r) {

		DRM_ERROR("Failed to create scheduler on ring %s.\n",

			  ring->name);

		return r;

	}

	}



	return 0;

}

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

+2 −3
Original line number Diff line number Diff line
@@ -310,9 +310,8 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev, 
	ring->eop_gpu_addr = kiq->eop_gpu_addr;

	ring->no_scheduler = true;

	sprintf(ring->name, "kiq_%d.%d.%d", ring->me, ring->pipe, ring->queue);

	r = amdgpu_ring_init(adev, ring, 1024,

			     irq, AMDGPU_CP_KIQ_IRQ_DRIVER0,

			     AMDGPU_RING_PRIO_DEFAULT);

	r = amdgpu_ring_init(adev, ring, 1024, irq, AMDGPU_CP_KIQ_IRQ_DRIVER0,

			     AMDGPU_RING_PRIO_DEFAULT, NULL);

	if (r)

		dev_warn(adev->dev, "(%d) failed to init kiq ring\n", r);

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

+4 −2
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring) 
 */

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

		     unsigned int max_dw, struct amdgpu_irq_src *irq_src,

		     unsigned int irq_type, unsigned int hw_prio)

		     unsigned int irq_type, unsigned int hw_prio,

		     atomic_t *sched_score)

{

	int r;

	int sched_hw_submission = amdgpu_sched_hw_submission;
@@ -189,7 +190,8 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, 
		ring->adev = adev;

		ring->idx = adev->num_rings++;

		adev->rings[ring->idx] = ring;

		r = amdgpu_fence_driver_init_ring(ring, sched_hw_submission);

		r = amdgpu_fence_driver_init_ring(ring, sched_hw_submission,

						  sched_score);

		if (r)

			return r;

	}

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

+4 −2
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev); 
void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring);



int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,

				  unsigned num_hw_submission);

				  unsigned num_hw_submission,

				  atomic_t *sched_score);

int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,

				   struct amdgpu_irq_src *irq_src,

				   unsigned irq_type);
@@ -282,7 +283,8 @@ void amdgpu_ring_commit(struct amdgpu_ring *ring); 
void amdgpu_ring_undo(struct amdgpu_ring *ring);

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

		     unsigned int ring_size, struct amdgpu_irq_src *irq_src,

		     unsigned int irq_type, unsigned int prio);

		     unsigned int irq_type, unsigned int prio,

		     atomic_t *sched_score);

void amdgpu_ring_fini(struct amdgpu_ring *ring);

void amdgpu_ring_emit_reg_write_reg_wait_helper(struct amdgpu_ring *ring,

						uint32_t reg0, uint32_t val0,

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

+2 −3
Original line number Diff line number Diff line
@@ -984,10 +984,9 @@ static int cik_sdma_sw_init(void *handle) 
		sprintf(ring->name, "sdma%d", i);

		r = amdgpu_ring_init(adev, ring, 1024,

				     &adev->sdma.trap_irq,

				     (i == 0) ?

				     AMDGPU_SDMA_IRQ_INSTANCE0 :

				     (i == 0) ? AMDGPU_SDMA_IRQ_INSTANCE0 :

				     AMDGPU_SDMA_IRQ_INSTANCE1,

				     AMDGPU_RING_PRIO_DEFAULT);

				     AMDGPU_RING_PRIO_DEFAULT, NULL);

		if (r)

			return r;

	}