linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: freedreno@lists.freedesktop.org,
	Rob Clark <robdclark@chromium.org>,
	Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
	David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
	linux-arm-msm@vger.kernel.org (open list:DRM DRIVER FOR MSM
	ADRENO GPU), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 02/11] drm/msm: Small submitqueue creation cleanup
Date: Sat, 17 Jul 2021 13:29:04 -0700	[thread overview]
Message-ID: <20210717202924.987514-3-robdclark@gmail.com> (raw)
In-Reply-To: <20210717202924.987514-1-robdclark@gmail.com>

From: Rob Clark <robdclark@chromium.org>

If we don't have a gpu, there is no need to create a submitqueue, which
lets us simplify the error handling and submitqueue creation.

Signed-off-by: Rob Clark <robdclark@chromium.org>
---
 drivers/gpu/drm/msm/msm_submitqueue.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/msm_submitqueue.c
index e5eef11ed014..fbea6e7adf40 100644
--- a/drivers/gpu/drm/msm/msm_submitqueue.c
+++ b/drivers/gpu/drm/msm/msm_submitqueue.c
@@ -66,6 +66,12 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx,
 	if (!ctx)
 		return -ENODEV;
 
+	if (!priv->gpu)
+		return -ENODEV;
+
+	if (prio >= priv->gpu->nr_rings)
+		return -EINVAL;
+
 	queue = kzalloc(sizeof(*queue), GFP_KERNEL);
 
 	if (!queue)
@@ -73,15 +79,7 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx,
 
 	kref_init(&queue->ref);
 	queue->flags = flags;
-
-	if (priv->gpu) {
-		if (prio >= priv->gpu->nr_rings) {
-			kfree(queue);
-			return -EINVAL;
-		}
-
-		queue->prio = prio;
-	}
+	queue->prio = prio;
 
 	write_lock(&ctx->queuelock);
 
-- 
2.31.1


  parent reply	other threads:[~2021-07-17 20:25 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-17 20:29 [PATCH 00/11] drm/msm: drm scheduler conversion and cleanups Rob Clark
2021-07-17 20:29 ` [PATCH 01/11] drm/msm: Docs and misc cleanup Rob Clark
2021-07-17 20:29 ` Rob Clark [this message]
2021-07-17 20:29 ` [PATCH 03/11] drm/msm: drop drm_gem_object_put_locked() Rob Clark
2021-07-17 20:29 ` [PATCH 04/11] drm: Drop drm_gem_object_put_locked() Rob Clark
2021-07-20 14:08   ` Daniel Vetter
2021-07-17 20:29 ` [PATCH 05/11] drm/msm/submit: Simplify out-fence-fd handling Rob Clark
2021-07-17 20:29 ` [PATCH 06/11] drm/msm: Consolidate submit bo state Rob Clark
2021-07-17 20:29 ` [PATCH 07/11] drm/msm: Track "seqno" fences by idr Rob Clark
2021-07-17 20:29 ` [PATCH 08/11] drm/msm: Return ERR_PTR() from submit_create() Rob Clark
2021-07-17 20:29 ` [PATCH 09/11] drm/msm: Conversion to drm scheduler Rob Clark
2021-07-17 20:29 ` [PATCH 10/11] drm/msm: Drop struct_mutex in submit path Rob Clark
2021-07-17 20:29 ` [PATCH 11/11] drm/msm: Utilize gpu scheduler priorities Rob Clark
2021-07-19  8:40 ` [Linaro-mm-sig] [PATCH 00/11] drm/msm: drm scheduler conversion and cleanups Christian König
2021-07-19 14:21   ` Rob Clark
2021-07-19 14:45     ` Christian König
2021-07-20 14:07   ` Daniel Vetter
2021-07-20 14:16     ` Christian König
2021-07-20 14:24       ` 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=20210717202924.987514-3-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=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robdclark@chromium.org \
    --cc=sean@poorly.run \
    --subject='Re: [PATCH 02/11] drm/msm: Small submitqueue creation cleanup' \
    /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: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox