From 67f1421b7360fd1a684e1f3ec86536a2ba7f39a2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 28 May 2026 15:35:47 +0200 Subject: [PATCH] drop queue-6.12/drm-v3d-release-indirect-csd-gem-reference-on-cpu-job-free.patch --- ...ct-csd-gem-reference-on-cpu-job-free.patch | 43 ------------------- queue-6.12/series | 1 - 2 files changed, 44 deletions(-) delete mode 100644 queue-6.12/drm-v3d-release-indirect-csd-gem-reference-on-cpu-job-free.patch diff --git a/queue-6.12/drm-v3d-release-indirect-csd-gem-reference-on-cpu-job-free.patch b/queue-6.12/drm-v3d-release-indirect-csd-gem-reference-on-cpu-job-free.patch deleted file mode 100644 index 8328520b8c..0000000000 --- a/queue-6.12/drm-v3d-release-indirect-csd-gem-reference-on-cpu-job-free.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6eb6e5acafa46854d4363e6c34981289995f3ace Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ma=C3=ADra=20Canal?= -Date: Fri, 15 May 2026 12:07:15 -0300 -Subject: drm/v3d: Release indirect CSD GEM reference on CPU job free -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Maíra Canal - -commit 6eb6e5acafa46854d4363e6c34981289995f3ace upstream. - -v3d_get_cpu_indirect_csd_params() takes a reference to the indirect BO via -drm_gem_object_lookup() and stashes it in cpu_job->indirect_csd.indirect, -but nothing on the CPU job teardown path ever drops that reference. - -Drop the extra reference in v3d_cpu_job_free(). The NULL check covers ioctl -errors before the lookup ran and CPU job types other than -V3D_CPU_JOB_TYPE_INDIRECT_CSD, which leave the field zero-initialised. - -Cc: stable@vger.kernel.org -Fixes: 18b8413b25b7 ("drm/v3d: Create a CPU job extension for a indirect CSD job") -Assisted-by: Claude:claude-opus-4.7 -Reviewed-by: Iago Toral Quiroga -Link: https://patch.msgid.link/20260515-v3d-cpu-job-leaks-v1-2-7f147cbbf935@igalia.com -Signed-off-by: Maíra Canal -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/v3d/v3d_submit.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/gpu/drm/v3d/v3d_submit.c -+++ b/drivers/gpu/drm/v3d/v3d_submit.c -@@ -115,6 +115,9 @@ v3d_render_job_free(struct kref *ref) - drm_gem_object_put(&bo->base.base); - } - -+ if (job->indirect_csd.indirect) -+ drm_gem_object_put(job->indirect_csd.indirect); -+ - v3d_job_free(ref); - } - diff --git a/queue-6.12/series b/queue-6.12/series index 6ff6403c31..ef1aebde73 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -114,7 +114,6 @@ loongarch-kprobes-use-larch_insn_text_copy-to-patch-instructions.patch loongarch-remove-unused-code-to-avoid-build-warning.patch device-property-set-fwnode-secondary-to-null-in-fwnode_init.patch drm-i915-psr-apply-intel-dpcd-workaround-when-sdp-on-prior-line-used.patch -drm-v3d-release-indirect-csd-gem-reference-on-cpu-job-free.patch drm-virtio-use-uninterruptible-resv-lock-for-plane-updates.patch drm-amdgpu-vpe-force-collaborate-sync-after-trap.patch drm-bridge-it66121-acquire-reset-gpio-in-probe.patch -- 2.47.3