drm/scheduler: remove unused parameter

this patch also effect the amdgpu and etnaviv drivers which
use the function drm_sched_entity_init

Signed-off-by: Nayan Deshmukh <nayan26deshmukh@gmail.com>
Suggested-by: Christian König <christian.koenig@amd.com>
Acked-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index 6741a62a7d1577eeebda30af4cac669ca4db2471..a8e531d604fac4391d69cac44d33dc3636395a83 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -91,7 +91,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev,
                        continue;
 
                r = drm_sched_entity_init(&ring->sched, &ctx->rings[i].entity,
-                                         rq, amdgpu_sched_jobs, &ctx->guilty);
+                                         rq, &ctx->guilty);
                if (r)
                        goto failed;
        }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index cc3b067e1ec6ac447ddae08cfe522bea4e59e070..5e9fd256faada5ad98f8ca4c0e8b083a52322df1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -111,7 +111,7 @@ static int amdgpu_ttm_global_init(struct amdgpu_device *adev)
        ring = adev->mman.buffer_funcs_ring;
        rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_KERNEL];
        r = drm_sched_entity_init(&ring->sched, &adev->mman.entity,
-                                 rq, amdgpu_sched_jobs, NULL);
+                                 rq, NULL);
        if (r) {
                DRM_ERROR("Failed setting up TTM BO move run queue.\n");
                goto error_entity;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index d8dd4028c2bb46eced30a150d6c1d2b514479fb2..de4d77af02aef822b53ec4f5647be5d18261e2c6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -242,7 +242,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
        ring = &adev->uvd.ring;
        rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
        r = drm_sched_entity_init(&ring->sched, &adev->uvd.entity,
-                                 rq, amdgpu_sched_jobs, NULL);
+                                 rq, NULL);
        if (r != 0) {
                DRM_ERROR("Failed setting up UVD run queue.\n");
                return r;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index e2186eda3271f1fcbb9c6c37a9643306e2cf1f04..a86322f5164f0efb8e7fca8c6b9f7d7fda548981 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -186,7 +186,7 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
        ring = &adev->vce.ring[0];
        rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
        r = drm_sched_entity_init(&ring->sched, &adev->vce.entity,
-                                 rq, amdgpu_sched_jobs, NULL);
+                                 rq, NULL);
        if (r != 0) {
                DRM_ERROR("Failed setting up VCE run queue.\n");
                return r;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 58e495330b38bfd733c9a9367e85fdd09001da66..e5d234cf804fca13ef5155eb2301bfb453fa048c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -105,7 +105,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
        ring = &adev->vcn.ring_dec;
        rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
        r = drm_sched_entity_init(&ring->sched, &adev->vcn.entity_dec,
-                                 rq, amdgpu_sched_jobs, NULL);
+                                 rq, NULL);
        if (r != 0) {
                DRM_ERROR("Failed setting up VCN dec run queue.\n");
                return r;
@@ -114,7 +114,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
        ring = &adev->vcn.ring_enc[0];
        rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
        r = drm_sched_entity_init(&ring->sched, &adev->vcn.entity_enc,
-                                 rq, amdgpu_sched_jobs, NULL);
+                                 rq, NULL);
        if (r != 0) {
                DRM_ERROR("Failed setting up VCN enc run queue.\n");
                return r;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 8e71d39840169ed521c2bd3ffea4c6f11aace46b..1a8f4e0dd02394a759ec191258a6cbee2d76ba0a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2404,7 +2404,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
        ring = adev->vm_manager.vm_pte_rings[ring_instance];
        rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_KERNEL];
        r = drm_sched_entity_init(&ring->sched, &vm->entity,
-                                 rq, amdgpu_sched_jobs, NULL);
+                                 rq, NULL);
        if (r)
                return r;
 

diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
index 8041b26a7a2125cb29da1698572449d4901f8b84..ca6ab56357b56f9349ab2a28954ddadc701b5d34 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
@@ -429,7 +429,7 @@ static int uvd_v6_0_sw_init(void *handle)
                ring = &adev->uvd.ring_enc[0];
                rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
                r = drm_sched_entity_init(&ring->sched, &adev->uvd.entity_enc,
-                                         rq, amdgpu_sched_jobs, NULL);
+                                         rq, NULL);
                if (r) {
                        DRM_ERROR("Failed setting up UVD ENC run queue.\n");
                        return r;

diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
index b0de1e04093b68d58d304516b6dc84d3bdd64707..0ca63d5886709cc648f54b2ba71d5cd951fafc8a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
@@ -418,7 +418,7 @@ static int uvd_v7_0_sw_init(void *handle)
        ring = &adev->uvd.ring_enc[0];
        rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
        r = drm_sched_entity_init(&ring->sched, &adev->uvd.entity_enc,
-                                 rq, amdgpu_sched_jobs, NULL);
+                                 rq, NULL);
        if (r) {
                DRM_ERROR("Failed setting up UVD ENC run queue.\n");
                return r;

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index ab50090d066c60758595cbe089e9458494248cf4..23e73c2a19f4d1403c72bb37272b83f139d16421 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -116,7 +116,7 @@ static int etnaviv_open(struct drm_device *dev, struct drm_file *file)
                        drm_sched_entity_init(&gpu->sched,
                                &ctx->sched_entity[i],
                                &gpu->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL],
-                               32, NULL);
+                               NULL);
                        }
        }
 

diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c
index 1f1dd70125a7ac7567527e703bf317a6c7b900ee..a364fc0b38c3861b05bcb8160097f8e94bc2839d 100644 (file)
--- a/drivers/gpu/drm/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c
@@ -117,7 +117,6 @@ drm_sched_rq_select_entity(struct drm_sched_rq *rq)
  * @sched      The pointer to the scheduler
  * @entity     The pointer to a valid drm_sched_entity
  * @rq         The run queue this entity belongs
- * @jobs       The max number of jobs in the job queue
  * @guilty      atomic_t set to 1 when a job on this queue
  *              is found to be guilty causing a timeout
  *
@@ -126,7 +125,7 @@ drm_sched_rq_select_entity(struct drm_sched_rq *rq)
 int drm_sched_entity_init(struct drm_gpu_scheduler *sched,
                          struct drm_sched_entity *entity,
                          struct drm_sched_rq *rq,
-                         uint32_t jobs, atomic_t *guilty)
+                         atomic_t *guilty)
 {
        if (!(sched && entity && rq))
                return -EINVAL;

diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
index 350a62c26b296f628ec1463800c01c853b3af2e5..52380067a43f0d7f985299afed175dce9e02c27a 100644 (file)
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@ -188,7 +188,7 @@ void drm_sched_fini(struct drm_gpu_scheduler *sched);
 int drm_sched_entity_init(struct drm_gpu_scheduler *sched,
                          struct drm_sched_entity *entity,
                          struct drm_sched_rq *rq,
-                         uint32_t jobs, atomic_t *guilty);
+                         atomic_t *guilty);
 void drm_sched_entity_do_release(struct drm_gpu_scheduler *sched,
                           struct drm_sched_entity *entity);
 void drm_sched_entity_cleanup(struct drm_gpu_scheduler *sched,