57aa05e8e5
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.37 Manually rebased patch: generic/hack-6.12/902-debloat_proc.patch[1] New Kconfig symbol: x86: enable MITIGATION_TSA[2] All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.37&id=ead91de35d9cd5c4f80ec51e6020f342079170af [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.37&id=7a0395f6607a5d01e2b2a86355596b3f1224acbd Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/19317 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 8e2e8a0139e752623ee3ed4f40958b027740e324 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ma=C3=ADra=20Canal?= <mcanal@igalia.com>
|
|
Date: Mon, 13 Jan 2025 12:47:41 -0300
|
|
Subject: [PATCH] drm/v3d: Remove `v3d->cpu_job`
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit dc4afc0de9654f88676d77094a38f9451d519011 upstream.
|
|
|
|
CPU jobs, like Cache Clean jobs, execute synchronously once the DRM
|
|
scheduler starts running them. Consequently, a global `v3d->cpu_job`
|
|
variable is unnecessary, as everything is managed within the
|
|
`v3d_cpu_job_run()` function.
|
|
|
|
This commit removes the `v3d->cpu_job` pointer, as it is not needed.
|
|
|
|
Signed-off-by: Maíra Canal <mcanal@igalia.com>
|
|
Reviewed-by: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20250113154741.67520-2-mcanal@igalia.com
|
|
---
|
|
drivers/gpu/drm/v3d/v3d_drv.h | 1 -
|
|
drivers/gpu/drm/v3d/v3d_sched.c | 2 --
|
|
2 files changed, 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_drv.h
|
|
+++ b/drivers/gpu/drm/v3d/v3d_drv.h
|
|
@@ -161,7 +161,6 @@ struct v3d_dev {
|
|
struct v3d_render_job *render_job;
|
|
struct v3d_tfu_job *tfu_job;
|
|
struct v3d_csd_job *csd_job;
|
|
- struct v3d_cpu_job *cpu_job;
|
|
|
|
struct v3d_queue_state queue[V3D_MAX_QUEUES];
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_sched.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_sched.c
|
|
@@ -677,8 +677,6 @@ v3d_cpu_job_run(struct drm_sched_job *sc
|
|
struct v3d_cpu_job *job = to_cpu_job(sched_job);
|
|
struct v3d_dev *v3d = job->base.v3d;
|
|
|
|
- v3d->cpu_job = job;
|
|
-
|
|
if (job->job_type >= ARRAY_SIZE(cpu_job_function)) {
|
|
DRM_DEBUG_DRIVER("Unknown CPU job: %d\n", job->job_type);
|
|
return NULL;
|