From: Rob Clark <robdclark@gmail.com> To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter <daniel@ffwll.ch>, Rob Clark <robdclark@chromium.org>, Jordan Crouse <jcrouse@codeaurora.org>, Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie>, linux-arm-msm@vger.kernel.org (open list:DRM DRIVER FOR MSM ADRENO GPU), freedreno@lists.freedesktop.org (open list:DRM DRIVER FOR MSM ADRENO GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 17/22] drm/msm: Drop struct_mutex from the retire path Date: Sun, 11 Oct 2020 19:09:44 -0700 [thread overview] Message-ID: <20201012020958.229288-18-robdclark@gmail.com> (raw) In-Reply-To: <20201012020958.229288-1-robdclark@gmail.com> From: Rob Clark <robdclark@chromium.org> Now that we are not relying on dev->struct_mutex to protect the ring->submits lists, drop the struct_mutex lock. Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org> --- drivers/gpu/drm/msm/msm_gpu.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 8278a4df331a..a754e84b8b5d 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -707,7 +707,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, msm_gem_active_put(&msm_obj->base); msm_gem_unpin_iova(&msm_obj->base, submit->aspace); - drm_gem_object_put_locked(&msm_obj->base); + drm_gem_object_put(&msm_obj->base); } pm_runtime_mark_last_busy(&gpu->pdev->dev); @@ -722,11 +722,8 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, static void retire_submits(struct msm_gpu *gpu) { - struct drm_device *dev = gpu->dev; int i; - WARN_ON(!mutex_is_locked(&dev->struct_mutex)); - /* Retire the commits starting with highest priority */ for (i = 0; i < gpu->nr_rings; i++) { struct msm_ringbuffer *ring = gpu->rb[i]; @@ -756,15 +753,12 @@ static void retire_submits(struct msm_gpu *gpu) static void retire_worker(struct work_struct *work) { struct msm_gpu *gpu = container_of(work, struct msm_gpu, retire_work); - struct drm_device *dev = gpu->dev; int i; for (i = 0; i < gpu->nr_rings; i++) update_fences(gpu, gpu->rb[i], gpu->rb[i]->memptrs->fence); - mutex_lock(&dev->struct_mutex); retire_submits(gpu); - mutex_unlock(&dev->struct_mutex); } /* call from irq handler to schedule work to retire bo's */ -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Rob Clark <robdclark@gmail.com> To: dri-devel@lists.freedesktop.org Cc: Rob Clark <robdclark@chromium.org>, "open list:DRM DRIVER FOR MSM ADRENO GPU" <freedreno@lists.freedesktop.org>, David Airlie <airlied@linux.ie>, "open list:DRM DRIVER FOR MSM ADRENO GPU" <linux-arm-msm@vger.kernel.org>, open list <linux-kernel@vger.kernel.org>, Sean Paul <sean@poorly.run> Subject: [PATCH v2 17/22] drm/msm: Drop struct_mutex from the retire path Date: Sun, 11 Oct 2020 19:09:44 -0700 [thread overview] Message-ID: <20201012020958.229288-18-robdclark@gmail.com> (raw) In-Reply-To: <20201012020958.229288-1-robdclark@gmail.com> From: Rob Clark <robdclark@chromium.org> Now that we are not relying on dev->struct_mutex to protect the ring->submits lists, drop the struct_mutex lock. Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org> --- drivers/gpu/drm/msm/msm_gpu.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 8278a4df331a..a754e84b8b5d 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -707,7 +707,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, msm_gem_active_put(&msm_obj->base); msm_gem_unpin_iova(&msm_obj->base, submit->aspace); - drm_gem_object_put_locked(&msm_obj->base); + drm_gem_object_put(&msm_obj->base); } pm_runtime_mark_last_busy(&gpu->pdev->dev); @@ -722,11 +722,8 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, static void retire_submits(struct msm_gpu *gpu) { - struct drm_device *dev = gpu->dev; int i; - WARN_ON(!mutex_is_locked(&dev->struct_mutex)); - /* Retire the commits starting with highest priority */ for (i = 0; i < gpu->nr_rings; i++) { struct msm_ringbuffer *ring = gpu->rb[i]; @@ -756,15 +753,12 @@ static void retire_submits(struct msm_gpu *gpu) static void retire_worker(struct work_struct *work) { struct msm_gpu *gpu = container_of(work, struct msm_gpu, retire_work); - struct drm_device *dev = gpu->dev; int i; for (i = 0; i < gpu->nr_rings; i++) update_fences(gpu, gpu->rb[i], gpu->rb[i]->memptrs->fence); - mutex_lock(&dev->struct_mutex); retire_submits(gpu); - mutex_unlock(&dev->struct_mutex); } /* call from irq handler to schedule work to retire bo's */ -- 2.26.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-10-12 2:10 UTC|newest] Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-12 2:09 [PATCH 00/14] drm/msm: de-struct_mutex-ification Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 01/22] drm/msm/gem: Add obj->lock wrappers Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 02/22] drm/msm/gem: Rename internal get_iova_locked helper Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 03/22] drm/msm/gem: Move prototypes to msm_gem.h Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 04/22] drm/msm/gem: Add some _locked() helpers Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 05/22] drm/msm/gem: Move locking in shrinker path Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 06/22] drm/msm/submit: Move copy_from_user ahead of locking bos Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 07/22] drm/msm: Do rpm get sooner in the submit path Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 14:35 ` Daniel Vetter 2020-10-12 14:35 ` Daniel Vetter 2020-10-12 15:43 ` Rob Clark 2020-10-12 15:43 ` Rob Clark 2020-10-20 9:07 ` Viresh Kumar 2020-10-20 9:07 ` Viresh Kumar 2020-10-20 10:56 ` Daniel Vetter 2020-10-20 10:56 ` Daniel Vetter 2020-10-20 11:24 ` Viresh Kumar 2020-10-20 11:24 ` Viresh Kumar 2020-10-20 11:42 ` Daniel Vetter 2020-10-20 11:42 ` Daniel Vetter 2020-10-20 14:13 ` Rob Clark 2020-10-20 14:13 ` Rob Clark 2020-10-22 8:06 ` Viresh Kumar 2020-10-22 8:06 ` Viresh Kumar 2020-10-25 17:39 ` Rob Clark 2020-10-25 17:39 ` Rob Clark 2020-10-27 11:35 ` Viresh Kumar 2020-10-27 11:35 ` Viresh Kumar 2020-11-03 5:47 ` Viresh Kumar 2020-11-03 5:47 ` Viresh Kumar 2020-11-03 16:50 ` Rob Clark 2020-11-03 16:50 ` Rob Clark 2020-11-04 3:03 ` Viresh Kumar 2020-11-04 3:03 ` Viresh Kumar 2020-11-05 19:24 ` Rob Clark 2020-11-05 19:24 ` Rob Clark 2020-11-06 7:16 ` Viresh Kumar 2020-11-06 7:16 ` Viresh Kumar 2020-11-17 10:03 ` Viresh Kumar 2020-11-17 10:03 ` Viresh Kumar 2020-11-17 17:02 ` Rob Clark 2020-11-17 17:02 ` Rob Clark 2020-11-18 5:28 ` Viresh Kumar 2020-11-18 5:28 ` Viresh Kumar 2020-11-18 16:53 ` Rob Clark 2020-11-18 16:53 ` Rob Clark 2020-11-19 6:05 ` Viresh Kumar 2020-11-19 6:05 ` Viresh Kumar 2020-12-07 6:16 ` Viresh Kumar 2020-12-07 6:16 ` Viresh Kumar 2020-12-16 5:22 ` Viresh Kumar 2020-12-16 5:22 ` Viresh Kumar 2020-10-12 2:09 ` [PATCH v2 08/22] drm/msm/gem: Switch over to obj->resv for locking Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 09/22] drm/msm: Use correct drm_gem_object_put() in fail case Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 10/22] drm/msm: Drop chatty trace Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 11/22] drm/msm: Move update_fences() Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 12/22] drm/msm: Add priv->mm_lock to protect active/inactive lists Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 13/22] drm/msm: Document and rename preempt_lock Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 14/22] drm/msm: Protect ring->submits with it's own lock Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 15/22] drm/msm: Refcount submits Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 16/22] drm/msm: Remove obj->gpu Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` Rob Clark [this message] 2020-10-12 2:09 ` [PATCH v2 17/22] drm/msm: Drop struct_mutex from the retire path Rob Clark 2020-10-12 2:09 ` [PATCH v2 18/22] drm/msm: Drop struct_mutex in free_object() path Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 19/22] drm/msm: remove msm_gem_free_work Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 20/22] drm/msm: drop struct_mutex in madvise path Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 21/22] drm/msm: Drop struct_mutex in shrinker path Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 2:09 ` [PATCH v2 22/22] drm/msm: Don't implicit-sync if only a single ring Rob Clark 2020-10-12 2:09 ` Rob Clark 2020-10-12 14:40 ` Daniel Vetter 2020-10-12 14:40 ` Daniel Vetter 2020-10-12 15:07 ` Rob Clark 2020-10-12 15:07 ` Rob Clark 2020-10-13 11:08 ` Daniel Vetter 2020-10-13 11:08 ` Daniel Vetter 2020-10-13 16:15 ` [Freedreno] " Rob Clark 2020-10-13 16:15 ` Rob Clark 2020-10-15 8:22 ` Daniel Vetter 2020-10-15 8:22 ` Daniel Vetter
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=20201012020958.229288-18-robdclark@gmail.com \ --to=robdclark@gmail.com \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=jcrouse@codeaurora.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=robdclark@chromium.org \ --cc=sean@poorly.run \ /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.