From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org,
Rob Clark <robdclark@chromium.org>,
Luben Tuikov <luben.tuikov@amd.com>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v3 8/9] drm/sched: Add (optional) fence signaling annotation
Date: Thu, 3 Aug 2023 15:01:56 -0700 [thread overview]
Message-ID: <20230803220202.78036-9-robdclark@gmail.com> (raw)
In-Reply-To: <20230803220202.78036-1-robdclark@gmail.com>
From: Rob Clark <robdclark@chromium.org>
Based on
https://lore.kernel.org/dri-devel/20200604081224.863494-10-daniel.vetter@ffwll.ch/
but made to be optional.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
---
drivers/gpu/drm/scheduler/sched_main.c | 9 +++++++++
include/drm/gpu_scheduler.h | 2 ++
2 files changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index 7b2bfc10c1a5..b0368b815ff5 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -1005,10 +1005,15 @@ static bool drm_sched_blocked(struct drm_gpu_scheduler *sched)
static int drm_sched_main(void *param)
{
struct drm_gpu_scheduler *sched = (struct drm_gpu_scheduler *)param;
+ const bool fence_signalling = sched->fence_signalling;
+ bool fence_cookie;
int r;
sched_set_fifo_low(current);
+ if (fence_signalling)
+ fence_cookie = dma_fence_begin_signalling();
+
while (!kthread_should_stop()) {
struct drm_sched_entity *entity = NULL;
struct drm_sched_fence *s_fence;
@@ -1064,6 +1069,10 @@ static int drm_sched_main(void *param)
wake_up(&sched->job_scheduled);
}
+
+ if (fence_signalling)
+ dma_fence_end_signalling(fence_cookie);
+
return 0;
}
diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
index e95b4837e5a3..58d958ad31a1 100644
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@ -493,6 +493,7 @@ struct drm_sched_backend_ops {
* @ready: marks if the underlying HW is ready to work
* @free_guilty: A hit to time out handler to free the guilty job.
* @dev: system &struct device
+ * @fence_signalling: Opt in to fence signalling annotations
*
* One scheduler is implemented for each hardware ring.
*/
@@ -517,6 +518,7 @@ struct drm_gpu_scheduler {
bool ready;
bool free_guilty;
struct device *dev;
+ bool fence_signalling;
};
int drm_sched_init(struct drm_gpu_scheduler *sched,
--
2.41.0
next prev parent reply other threads:[~2023-08-03 22:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 22:01 [PATCH v3 0/9] drm/msm+PM+icc: Make job_run() reclaim-safe Rob Clark
2023-08-03 22:01 ` [PATCH v3 1/9] PM / devfreq: Drop unneed locking to appease lockdep Rob Clark
2023-08-03 22:01 ` [PATCH v3 2/9] PM / devfreq: Teach lockdep about locking order Rob Clark
2023-08-03 22:01 ` [PATCH v3 3/9] PM / QoS: Fix constraints alloc vs reclaim locking Rob Clark
2023-08-04 17:07 ` Rafael J. Wysocki
2023-08-04 18:38 ` Rob Clark
2023-08-04 19:11 ` Rafael J. Wysocki
2023-08-04 20:37 ` Rob Clark
2023-08-04 20:45 ` Rafael J. Wysocki
2023-08-03 22:01 ` [PATCH v3 4/9] PM / QoS: Decouple request alloc from dev_pm_qos_mtx Rob Clark
2023-08-04 9:29 ` Dan Carpenter
2023-08-03 22:01 ` [PATCH v3 5/9] PM / QoS: Teach lockdep about dev_pm_qos_mtx locking order Rob Clark
2023-08-03 22:01 ` [PATCH v3 6/9] interconnect: Fix locking for runpm vs reclaim Rob Clark
2023-08-03 22:01 ` [PATCH v3 7/9] interconnect: Teach lockdep about icc_bw_lock order Rob Clark
2023-08-03 22:01 ` Rob Clark [this message]
2023-08-03 22:01 ` [PATCH v3 9/9] drm/msm: Enable fence signalling annotations Rob Clark
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=20230803220202.78036-9-robdclark@gmail.com \
--to=robdclark@gmail.com \
--cc=airlied@gmail.com \
--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=luben.tuikov@amd.com \
--cc=robdclark@chromium.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox