Am Donnerstag, den 29.03.2018, 22:36 +0530 schrieb Nayan Deshmukh:
> this patch also effect the amdgpu and etnaviv drivers which
> use the function drm_sched_entity_init
>
> Signed-off-by: Nayan Deshmukh <nayan26deshmukh@xxxxxxxxx>
> Suggested-by: Christian König <christian.koenig@xxxxxxx>
Acked-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +-
> drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +-
> drivers/gpu/drm/scheduler/gpu_scheduler.c | 3 +--
> include/drm/gpu_scheduler.h | 2 +-
> 11 files changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
> index 09d35051fdd6..533f903356de 100644
> --- 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 205da3ff9cd0..e445e5f9abba 100644
> --- 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 627542b22ae4..c135f3d236e0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> @@ -237,7 +237,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 a33804bd3314..59da1d29b612 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> @@ -181,7 +181,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 58e495330b38..e5d234cf804f 100644
> --- 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 da55a78d7380..29e9879c9b81 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -2380,7 +2380,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 f26f515db2fb..9a9ceb230057 100644
> --- 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 eddc57f3b72a..f62a198a8ca2 100644
> --- 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 ab50090d066c..23e73c2a19f4 100644
> --- 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 1d368bc66ac2..565b7348db80 100644
> --- 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 dfd54fb94e10..a1313b8befeb 100644
> --- a/include/drm/gpu_scheduler.h
> +++ b/include/drm/gpu_scheduler.h
> @@ -147,7 +147,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_fini(struct drm_gpu_scheduler *sched,
> struct drm_sched_entity *entity);
> void drm_sched_entity_push_job(struct drm_sched_job *sched_job,
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
