Skip to content

Commit c955e62

Browse files
nathanchancenathanchance
authored
Merge pull request #899 from nathanchance/update-patches-jan-10-2026
Update patches for recent drm/amd/display patch merge
2 parents f15427c + 4580715 commit c955e62

24 files changed

+46
-202
lines changed

‎.github/workflows/tip-clang-15.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
6868
- name: tuxsuite
6969
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
70-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-15.tux.yml || true
70+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json tuxsuite/tip-clang-15.tux.yml || true
7171
- name: Update Cache Build Status
7272
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
7373
run: python caching/update.py
@@ -139,7 +139,7 @@ jobs:
139139
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
140140
- name: tuxsuite
141141
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
142-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-15.tux.yml || true
142+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json tuxsuite/tip-clang-15.tux.yml || true
143143
- name: Update Cache Build Status
144144
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
145145
run: python caching/update.py

‎.github/workflows/tip-clang-16.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
6868
- name: tuxsuite
6969
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
70-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-16.tux.yml || true
70+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json tuxsuite/tip-clang-16.tux.yml || true
7171
- name: Update Cache Build Status
7272
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
7373
run: python caching/update.py
@@ -139,7 +139,7 @@ jobs:
139139
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
140140
- name: tuxsuite
141141
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
142-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-16.tux.yml || true
142+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json tuxsuite/tip-clang-16.tux.yml || true
143143
- name: Update Cache Build Status
144144
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
145145
run: python caching/update.py

‎.github/workflows/tip-clang-17.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
6868
- name: tuxsuite
6969
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
70-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-17.tux.yml || true
70+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json tuxsuite/tip-clang-17.tux.yml || true
7171
- name: Update Cache Build Status
7272
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
7373
run: python caching/update.py
@@ -168,7 +168,7 @@ jobs:
168168
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
169169
- name: tuxsuite
170170
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
171-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-17.tux.yml || true
171+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json tuxsuite/tip-clang-17.tux.yml || true
172172
- name: Update Cache Build Status
173173
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
174174
run: python caching/update.py

‎.github/workflows/tip-clang-18.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
6868
- name: tuxsuite
6969
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
70-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-18.tux.yml || true
70+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json tuxsuite/tip-clang-18.tux.yml || true
7171
- name: Update Cache Build Status
7272
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
7373
run: python caching/update.py
@@ -168,7 +168,7 @@ jobs:
168168
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
169169
- name: tuxsuite
170170
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
171-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-18.tux.yml || true
171+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json tuxsuite/tip-clang-18.tux.yml || true
172172
- name: Update Cache Build Status
173173
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
174174
run: python caching/update.py

‎.github/workflows/tip-clang-19.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
6868
- name: tuxsuite
6969
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
70-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-19.tux.yml || true
70+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json tuxsuite/tip-clang-19.tux.yml || true
7171
- name: Update Cache Build Status
7272
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
7373
run: python caching/update.py
@@ -168,7 +168,7 @@ jobs:
168168
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
169169
- name: tuxsuite
170170
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
171-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-19.tux.yml || true
171+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json tuxsuite/tip-clang-19.tux.yml || true
172172
- name: Update Cache Build Status
173173
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
174174
run: python caching/update.py

‎.github/workflows/tip-clang-20.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
6868
- name: tuxsuite
6969
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
70-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-20.tux.yml || true
70+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json tuxsuite/tip-clang-20.tux.yml || true
7171
- name: Update Cache Build Status
7272
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
7373
run: python caching/update.py
@@ -168,7 +168,7 @@ jobs:
168168
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
169169
- name: tuxsuite
170170
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
171-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-20.tux.yml || true
171+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json tuxsuite/tip-clang-20.tux.yml || true
172172
- name: Update Cache Build Status
173173
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
174174
run: python caching/update.py

‎.github/workflows/tip-clang-21.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
6868
- name: tuxsuite
6969
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
70-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-21.tux.yml || true
70+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json tuxsuite/tip-clang-21.tux.yml || true
7171
- name: Update Cache Build Status
7272
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
7373
run: python caching/update.py
@@ -168,7 +168,7 @@ jobs:
168168
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
169169
- name: tuxsuite
170170
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
171-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-21.tux.yml || true
171+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json tuxsuite/tip-clang-21.tux.yml || true
172172
- name: Update Cache Build Status
173173
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
174174
run: python caching/update.py

‎.github/workflows/tip-clang-22.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
6868
- name: tuxsuite
6969
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
70-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-22.tux.yml || true
70+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name defconfigs --json-out builds.json tuxsuite/tip-clang-22.tux.yml || true
7171
- name: Update Cache Build Status
7272
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
7373
run: python caching/update.py
@@ -168,7 +168,7 @@ jobs:
168168
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
169169
- name: tuxsuite
170170
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
171-
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json --patch-series patches/tip tuxsuite/tip-clang-22.tux.yml || true
171+
run: tuxsuite plan --git-repo https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git --git-ref master --job-name allconfigs --json-out builds.json tuxsuite/tip-clang-22.tux.yml || true
172172
- name: Update Cache Build Status
173173
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
174174
run: python caching/update.py

patches/6.12/20251213_nathan_drm_amd_display_apply_e4479aecf658_to_dml.patch renamed to patches/6.12/0002-70740454377f1ba3ff32f5df4acd965db99d055b.patch

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
From git@z Thu Jan 1 00:00:00 1970
2-
Subject: [PATCH] drm/amd/display: Apply e4479aecf658 to dml
1+
From 70740454377f1ba3ff32f5df4acd965db99d055b Mon Sep 17 00:00:00 2001
32
From: Nathan Chancellor <nathan@kernel.org>
43
Date: Sat, 13 Dec 2025 15:16:43 +0900
5-
Message-Id: <20251213-dml-bump-frame-warn-clang-sanitizers-v1-1-0e91608db9eb@kernel.org>
6-
MIME-Version: 1.0
7-
Content-Type: text/plain; charset="utf-8"
8-
Content-Transfer-Encoding: 7bit
4+
Subject: drm/amd/display: Apply e4479aecf658 to dml
95

106
After an innocuous optimization change in clang-22, allmodconfig (which
117
enables CONFIG_KASAN and CONFIG_WERROR) breaks with:
@@ -30,16 +26,19 @@ allmodconfig (an easy testing target) continues to work.
3026
Apply that same change to the dml folder to clear up the warning for
3127
allmodconfig, unbreaking the build.
3228

33-
Cc: stable@vger.kernel.org
3429
Closes: https://github.com/ClangBuiltLinux/linux/issues/2135
35-
Link: https://patch.msgid.link/20251213-dml-bump-frame-warn-clang-sanitizers-v1-1-0e91608db9eb@kernel.org
3630
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
31+
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
32+
(cherry picked from commit 25314b453cf812150e9951a32007a32bba85707e)
33+
Cc: stable@vger.kernel.org
34+
---
35+
Link: https://git.kernel.org/linus/70740454377f1ba3ff32f5df4acd965db99d055b
3736
---
3837
drivers/gpu/drm/amd/display/dc/dml/Makefile | 6 +++++-
3938
1 file changed, 5 insertions(+), 1 deletion(-)
4039

4140
diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile
42-
index b357683b4255..268b5fbdb48b 100644
41+
index b357683b4255af..268b5fbdb48bd5 100644
4342
--- a/drivers/gpu/drm/amd/display/dc/dml/Makefile
4443
+++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile
4544
@@ -30,7 +30,11 @@ dml_rcflags := $(CC_FLAGS_NO_FPU)
@@ -55,12 +54,6 @@ index b357683b4255..268b5fbdb48b 100644
5554
else
5655
frame_warn_limit := 2048
5756
endif
58-
59-
---
60-
base-commit: f24e96d69f5b9eb0f3b9c49e53c385c50729edfd
61-
change-id: 20251213-dml-bump-frame-warn-clang-sanitizers-0a34fc916aec
62-
63-
Best regards,
64-
--
65-
Nathan Chancellor <nathan@kernel.org>
57+
--
58+
cgit 1.2.3-korg
6659

‎patches/6.12/series‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
0001-820ccf8cb2b145ab9fc12651f7f80339614fa46c.patch
2-
20251213_nathan_drm_amd_display_apply_e4479aecf658_to_dml.patch
2+
0002-70740454377f1ba3ff32f5df4acd965db99d055b.patch

0 commit comments

Comments
 (0)