Commit ebdd2e9d authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup struct amdgpu_ring 



This patch consist of below related changes:

1 Rename ring->priority to ring->hw_prio.
2 Assign correct hardware ring priority.
3 Remove ring->priority_mutex as ring priority remains unchanged
  after initialization.
4 Remove unused ring->num_jobs.

v3: remove ring->num_jobs.
v2: remove ring->priority_mutex.

Fixes: 33abcb1f ("drm/amdgpu: set compute queue priority at mqd_init")
Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6eed1f3f

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

+2 −6
Original line number Original line Diff line number Diff line
@@ -166,7 +166,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, 
		     unsigned int max_dw, struct amdgpu_irq_src *irq_src,

		     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)

{

{

	int r, i;

	int r;

	int sched_hw_submission = amdgpu_sched_hw_submission;

	int sched_hw_submission = amdgpu_sched_hw_submission;

	u32 *num_sched;

	u32 *num_sched;

	u32 hw_ip;

	u32 hw_ip;
@@ -258,8 +258,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, 
	}

	}





	ring->max_dw = max_dw;

	ring->max_dw = max_dw;

	ring->priority = DRM_SCHED_PRIORITY_NORMAL;

	ring->hw_prio = hw_prio;

	mutex_init(&ring->priority_mutex);





	if (!ring->no_scheduler) {

	if (!ring->no_scheduler) {

		hw_ip = ring->funcs->type;

		hw_ip = ring->funcs->type;
@@ -268,9 +267,6 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, 
			&ring->sched;

			&ring->sched;

	}

	}





	for (i = DRM_SCHED_PRIORITY_MIN; i < DRM_SCHED_PRIORITY_COUNT; ++i)

		atomic_set(&ring->num_jobs[i], 0);



	return 0;

	return 0;

}

}

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -242,11 +242,7 @@ struct amdgpu_ring { 
	struct dma_fence	*vmid_wait;

	struct dma_fence	*vmid_wait;

	bool			has_compute_vm_bug;

	bool			has_compute_vm_bug;

	bool			no_scheduler;

	bool			no_scheduler;



	int			hw_prio;

	atomic_t		num_jobs[DRM_SCHED_PRIORITY_COUNT];

	struct mutex		priority_mutex;

	/* protected by priority_mutex */

	int			priority;





#if defined(CONFIG_DEBUG_FS)

#if defined(CONFIG_DEBUG_FS)

	struct dentry *ent;

	struct dentry *ent;