From: Nirmoy Das <nirmoy.aiemd@gmail.com> To: dri-devel@lists.freedesktop.org Cc: alexander.deucher@amd.com, kenny.ho@amd.com, nirmoy.das@amd.com, christian.koenig@amd.com, amd-gfx@lists.freedesktop.org Subject: [PATCH 4/4] drm/scheduler: do not keep a copy of sched list Date: Wed, 11 Dec 2019 16:42:58 +0100 [thread overview] Message-ID: <20191211154258.18289-4-nirmoy.das@amd.com> (raw) In-Reply-To: <20191211154258.18289-1-nirmoy.das@amd.com> entity should not keep copy and maintain sched list for itself. Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/scheduler/sched_entity.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index f9b6ce29c58f..2e3a058fc239 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -56,8 +56,6 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, unsigned int num_sched_list, atomic_t *guilty) { - int i; - if (!(entity && sched_list && (num_sched_list == 0 || sched_list[0]))) return -EINVAL; @@ -67,22 +65,14 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, entity->guilty = guilty; entity->num_sched_list = num_sched_list; entity->priority = priority; - entity->sched_list = kcalloc(num_sched_list, - sizeof(struct drm_gpu_scheduler *), GFP_KERNEL); + entity->sched_list = num_sched_list > 1 ? sched_list : NULL; + entity->last_scheduled = NULL; - if(!entity->sched_list) - return -ENOMEM; + if(num_sched_list) + entity->rq = &sched_list[0]->sched_rq[entity->priority]; init_completion(&entity->entity_idle); - for (i = 0; i < num_sched_list; i++) - entity->sched_list[i] = sched_list[i]; - - if (num_sched_list) - entity->rq = &entity->sched_list[0]->sched_rq[entity->priority]; - - entity->last_scheduled = NULL; - spin_lock_init(&entity->rq_lock); spsc_queue_init(&entity->job_queue); @@ -312,7 +302,6 @@ void drm_sched_entity_fini(struct drm_sched_entity *entity) dma_fence_put(entity->last_scheduled); entity->last_scheduled = NULL; - kfree(entity->sched_list); } EXPORT_SYMBOL(drm_sched_entity_fini); -- 2.24.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Nirmoy Das <nirmoy.aiemd@gmail.com> To: dri-devel@lists.freedesktop.org Cc: alexander.deucher@amd.com, kenny.ho@amd.com, nirmoy.das@amd.com, christian.koenig@amd.com, amd-gfx@lists.freedesktop.org Subject: [PATCH 4/4] drm/scheduler: do not keep a copy of sched list Date: Wed, 11 Dec 2019 16:42:58 +0100 [thread overview] Message-ID: <20191211154258.18289-4-nirmoy.das@amd.com> (raw) In-Reply-To: <20191211154258.18289-1-nirmoy.das@amd.com> entity should not keep copy and maintain sched list for itself. Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/scheduler/sched_entity.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index f9b6ce29c58f..2e3a058fc239 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -56,8 +56,6 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, unsigned int num_sched_list, atomic_t *guilty) { - int i; - if (!(entity && sched_list && (num_sched_list == 0 || sched_list[0]))) return -EINVAL; @@ -67,22 +65,14 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, entity->guilty = guilty; entity->num_sched_list = num_sched_list; entity->priority = priority; - entity->sched_list = kcalloc(num_sched_list, - sizeof(struct drm_gpu_scheduler *), GFP_KERNEL); + entity->sched_list = num_sched_list > 1 ? sched_list : NULL; + entity->last_scheduled = NULL; - if(!entity->sched_list) - return -ENOMEM; + if(num_sched_list) + entity->rq = &sched_list[0]->sched_rq[entity->priority]; init_completion(&entity->entity_idle); - for (i = 0; i < num_sched_list; i++) - entity->sched_list[i] = sched_list[i]; - - if (num_sched_list) - entity->rq = &entity->sched_list[0]->sched_rq[entity->priority]; - - entity->last_scheduled = NULL; - spin_lock_init(&entity->rq_lock); spsc_queue_init(&entity->job_queue); @@ -312,7 +302,6 @@ void drm_sched_entity_fini(struct drm_sched_entity *entity) dma_fence_put(entity->last_scheduled); entity->last_scheduled = NULL; - kfree(entity->sched_list); } EXPORT_SYMBOL(drm_sched_entity_fini); -- 2.24.0 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2019-12-12 8:55 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-11 15:42 [PATCH 1/4] drm/scheduler: rework entity creation Nirmoy Das 2019-12-11 15:42 ` Nirmoy Das 2019-12-11 15:42 ` [PATCH 2/4] drm/amdgpu: replace vm_pte's run-queue list with drm gpu scheds list Nirmoy Das 2019-12-11 15:42 ` Nirmoy Das 2019-12-11 15:42 ` [PATCH 3/4] amd/amdgpu: add sched array to IPs with multiple run-queues Nirmoy Das 2019-12-11 15:42 ` Nirmoy Das 2019-12-11 15:42 ` Nirmoy Das [this message] 2019-12-11 15:42 ` [PATCH 4/4] drm/scheduler: do not keep a copy of sched list Nirmoy Das -- strict thread matches above, loose matches on Subject: below -- 2019-12-11 14:24 [PATCH 1/4 v2] drm/scheduler: rework entity creation Nirmoy Das 2019-12-11 14:24 ` [PATCH 4/4] drm/scheduler: do not keep a copy of sched list Nirmoy Das 2019-12-10 18:17 [PATCH 1/4] drm/scheduler: rework entity creation Nirmoy Das 2019-12-10 18:17 ` [PATCH 4/4] drm/scheduler: do not keep a copy of sched list Nirmoy Das 2019-12-11 12:25 ` Christian König 2019-12-10 12:52 [PATCH 1/4] drm/scheduler: rework entity creation Nirmoy Das 2019-12-10 12:53 ` [PATCH 4/4] drm/scheduler: do not keep a copy of sched list Nirmoy Das 2019-12-10 13:00 ` Christian König 2019-12-10 13:02 ` Christian König 2019-12-10 14:47 ` Nirmoy 2019-12-10 15:08 ` Nirmoy 2019-12-10 17:32 ` Christian König 2019-12-10 18:38 ` Nirmoy 2019-12-09 21:53 [PATCH 1/4] drm/scheduler: rework entity creation Nirmoy Das 2019-12-09 21:53 ` [PATCH 4/4] drm/scheduler: do not keep a copy of sched list Nirmoy Das 2019-12-06 17:33 [PATCH 1/4] drm/scheduler: rework entity creation Nirmoy Das 2019-12-06 17:33 ` [PATCH 4/4] drm/scheduler: do not keep a copy of sched list Nirmoy Das 2019-12-06 19:41 ` Christian König 2019-12-08 19:57 ` Nirmoy 2019-12-09 12:20 ` Christian König 2019-12-09 13:56 ` Nirmoy 2019-12-09 14:09 ` Nirmoy 2019-12-09 15:37 ` Christian König
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191211154258.18289-4-nirmoy.das@amd.com \ --to=nirmoy.aiemd@gmail.com \ --cc=alexander.deucher@amd.com \ --cc=amd-gfx@lists.freedesktop.org \ --cc=christian.koenig@amd.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=kenny.ho@amd.com \ --cc=nirmoy.das@amd.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.