From patchwork Thu Sep 26 21:16:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonino Maniscalco X-Patchwork-Id: 13813665 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C35DBCDE03A for ; Thu, 26 Sep 2024 21:17:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 49E3410EBE7; Thu, 26 Sep 2024 21:17:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GCuhvuqb"; dkim-atps=neutral Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id C0D7410EBE6; Thu, 26 Sep 2024 21:17:11 +0000 (UTC) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-a7a843bef98so180739266b.2; Thu, 26 Sep 2024 14:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727385430; x=1727990230; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=3lXuDq8mG8Oox8ReUlOYfBHI57TTAdm6VM/42FD3opk=; b=GCuhvuqbkpjRpP1xmyImvy/2/hbkcsu7YKedQj/wh2UNeAWstGdKY24BsE2H+wKJPn RIwG4udxR+2X0kFgQVVZnArldHnxu+RVqQjkH52rseNZ67iDwujslLQa3XB6vCLxwNYl g+d+o5Pou2mhGrISPfOnLniNh6UHo1M4zrWQVqvanOUZimdkZp6lfMU0VWEqm8ESjm6/ qVn8bLXJcX0uNypBF3XGYh4f9hbt1xFLD/aEnvpuyXAGpyQxD08pjLsO28l3LGIf3e7p h0s3AFdIUQdhz8XQleOiuG8cMBRwDDI0GOa2X+u4t3SsW4K0M90n29CvnA/Ba2pfRIR/ kOlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727385430; x=1727990230; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3lXuDq8mG8Oox8ReUlOYfBHI57TTAdm6VM/42FD3opk=; b=FVvcdNi3GVcYIZVu6uSn0SNzbq7OxueiJI4oOM1HDm9mnH7jwyt5kFONdpmhZmv9xK bYw6a68hx2VHm0OcUwbRQ1/DHAqQbPn/XZoI4/gY54QmcwJp1Ht2wVorbimjpjCIil8j 90tB5SL5zw7CX2wBrNK/pSNfql73nhwbuZvc6cqWusdnpn9sh8KPxp5P2/tZVICkrrVE 9+Kog1vFXtd3NKpG9wE0Ryl5e2E5YPR6MlnquaYb5ERiFrate/fd4j9x31zstunuQIWG KgNlpeDqkFwUjM5lsARKVjVI4EJxNAI/1yhcqYORSo6Cpf0VO/Jx3WINUoO4wNfxFglM MhwQ== X-Forwarded-Encrypted: i=1; AJvYcCUtY2HGDDA3RNG+aXWggRwZAp3j+Y3TwNMDy6EAJfrdxfR7VNHvi6kUCgIdSpozq8ihcMmgqI4rCHI=@lists.freedesktop.org, AJvYcCXo6UFu5GZFmzQQc+KKInvMNXXmawlGhJmPYw35ddRHKCdWogkxRLiXSXnKgogfbdveA0CkjPaPSRLc@lists.freedesktop.org X-Gm-Message-State: AOJu0YwPOOEhs1kHc9x/JlKHhAUqBLqQ6QLByMo16Ds3CB/PRIZRth+d xO67Lt7ocYxjNkitIYOkftOEcZHaZQ4BhbVZEU8JQOiV0H5xIvOx X-Google-Smtp-Source: AGHT+IGjJbOWMYKP7mYVRJtTrU1XFi1WXRzBVHSBRJDsooDihCCCttVD7tq8UPSbhKKkLAriL8jQSQ== X-Received: by 2002:a17:907:eac:b0:a86:7199:af37 with SMTP id a640c23a62f3a-a93c4aca8d9mr71916066b.58.1727385429899; Thu, 26 Sep 2024 14:17:09 -0700 (PDT) Received: from [192.168.1.17] (a-lu6-5.tin.it. [212.216.221.196]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a93c297b7d6sm38862166b.162.2024.09.26.14.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2024 14:17:09 -0700 (PDT) From: Antonino Maniscalco Date: Thu, 26 Sep 2024 23:16:51 +0200 Subject: [PATCH v6 09/11] drm/msm/a6xx: Add a flag to allow preemption to submitqueue_create MIME-Version: 1.0 Message-Id: <20240926-preemption-a750-t-v6-9-7b6e1ef3648f@gmail.com> References: <20240926-preemption-a750-t-v6-0-7b6e1ef3648f@gmail.com> In-Reply-To: <20240926-preemption-a750-t-v6-0-7b6e1ef3648f@gmail.com> To: Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Antonino Maniscalco , Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1727385413; l=3416; i=antomani103@gmail.com; s=20240815; h=from:subject:message-id; bh=hkIxVGWeKmryC2eLYVINRVq4p3WNWoRnKE3ce5L9CRg=; b=joO2Uyu/IC5UuSDPVyPxyL9NnP9PG0j8OvPshB+ahC5/NmzXVUmJlUTzutOxsnT9SvfpJJXSb Mit/nW0drInAfmpiug9tfsdDa00rRaISPIReHOL0R1/ZR0DIaK37crA X-Developer-Key: i=antomani103@gmail.com; a=ed25519; pk=0zicFb38tVla+iHRo4kWpOMsmtUrpGBEa7LkFF81lyY= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Some userspace changes are necessary so add a flag for userspace to advertise support for preemption when creating the submitqueue. When this flag is not set preemption will not be allowed in the middle of the submitted IBs therefore mantaining compatibility with older userspace. The flag is rejected if preemption is not supported on the target, this allows userspace to know whether preemption is supported. Tested-by: Neil Armstrong # on SM8650-QRD Tested-by: Neil Armstrong # on SM8550-QRD Tested-by: Neil Armstrong # on SM8450-HDK Signed-off-by: Antonino Maniscalco --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 12 ++++++++---- drivers/gpu/drm/msm/msm_submitqueue.c | 3 +++ include/uapi/drm/msm_drm.h | 5 ++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 736f475d696f1133c9e55d16aa80e73fd46cb835..edbcb6d229ba614be910ee70e75731538116e4a4 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -430,8 +430,10 @@ static void a7xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) OUT_PKT7(ring, CP_SET_MARKER, 1); OUT_RING(ring, 0x101); /* IFPC disable */ - OUT_PKT7(ring, CP_SET_MARKER, 1); - OUT_RING(ring, 0x00d); /* IB1LIST start */ + if (submit->queue->flags & MSM_SUBMITQUEUE_ALLOW_PREEMPT) { + OUT_PKT7(ring, CP_SET_MARKER, 1); + OUT_RING(ring, 0x00d); /* IB1LIST start */ + } /* Submit the commands */ for (i = 0; i < submit->nr_cmds; i++) { @@ -462,8 +464,10 @@ static void a7xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) update_shadow_rptr(gpu, ring); } - OUT_PKT7(ring, CP_SET_MARKER, 1); - OUT_RING(ring, 0x00e); /* IB1LIST end */ + if (submit->queue->flags & MSM_SUBMITQUEUE_ALLOW_PREEMPT) { + OUT_PKT7(ring, CP_SET_MARKER, 1); + OUT_RING(ring, 0x00e); /* IB1LIST end */ + } get_stats_counter(ring, REG_A7XX_RBBM_PERFCTR_CP(0), rbmemptr_stats(ring, index, cpcycles_end)); diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/msm_submitqueue.c index 0e803125a325aa67639406ef413aaeb6a9f08cee..9b3ffca3f3b471f509918edd4a2fdb0f80dfeb06 100644 --- a/drivers/gpu/drm/msm/msm_submitqueue.c +++ b/drivers/gpu/drm/msm/msm_submitqueue.c @@ -170,6 +170,9 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx, if (!priv->gpu) return -ENODEV; + if (flags & MSM_SUBMITQUEUE_ALLOW_PREEMPT && priv->gpu->nr_rings == 1) + return -EINVAL; + ret = msm_gpu_convert_priority(priv->gpu, prio, &ring_nr, &sched_prio); if (ret) return ret; diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 3fca72f738614a3e229e1017fe4f2ab61cd98bdf..f37858db34e602ce8b92dceccb60d4b6bdcda877 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -345,7 +345,10 @@ struct drm_msm_gem_madvise { * backwards compatibility as a "default" submitqueue */ -#define MSM_SUBMITQUEUE_FLAGS (0) +#define MSM_SUBMITQUEUE_ALLOW_PREEMPT 0x00000001 +#define MSM_SUBMITQUEUE_FLAGS ( \ + MSM_SUBMITQUEUE_ALLOW_PREEMPT | \ + 0) /* * The submitqueue priority should be between 0 and MSM_PARAM_PRIORITIES-1,