Skip to content

Commit c4bf62b

Browse files
committed
bump to 6.17.7-ba18
1 parent b3456f4 commit c4bf62b

File tree

5 files changed

+86
-606
lines changed

5 files changed

+86
-606
lines changed

build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ for nvrelease in "${nvreleases[@]}"; do
112112

113113
mv build/nvidia/extract/kernel build/nvidia/extract/kernel-open build/nvidia/kmod
114114

115+
patch -p2 -d build/nvidia/kmod/kernel-open < nvidia-open.patch
116+
115117
XZ_OPT='-T0' tar --remove-files -cJf $tarfn -C build/nvidia/kmod .
116118
echo "Created $tarfn"
117119
rm -rf build/nvidia

kernel.spec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ Summary: The Linux kernel
176176
%define specrpmversion 6.17.7
177177
%define specversion 6.17.7
178178
%define patchversion 6.17
179-
%define pkgrelease ba16
179+
%define pkgrelease ba18
180180
%define kversion 6
181181
%define tarfile_release 6.17.7
182182
# This is needed to do merge window version magic
183183
%define patchlevel 17
184184
# This allows pkg_release to have configurable %%{?dist} tag
185-
%define specrelease ba16%{?buildid}%{?dist}
185+
%define specrelease ba18%{?buildid}%{?dist}
186186
# This defines the kabi tarball version
187187
%define kabiversion 6.17.7
188188

@@ -4537,7 +4537,7 @@ fi\
45374537
#
45384538
#
45394539
%changelog
4540-
* Wed Nov 19 2025 Antheas Kapenekakis <[email protected]> [6.17.7-ba16]
4540+
* Wed Nov 19 2025 Antheas Kapenekakis <[email protected]> [6.17.7-ba18]
45414541
- disable split lock detection by default (Antheas Kapenekakis)
45424542
- use upstream xonedo (Antheas Kapenekakis)
45434543
- fix: revert nvidia driver for now (Antheas Kapenekakis)

nvidia-open.patch

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
From 331496883e2823184b92de1983f254f93577acc0 Mon Sep 17 00:00:00 2001
2+
From: Rahul Rameshbabu <[email protected]>
3+
Date: Tue, 18 Nov 2025 15:20:15 -0800
4+
Subject: [PATCH] Revert a change related to the display stack in 580.105.08
5+
6+
This is a clean revert to a change between 580.95.05 and 580.105.08.
7+
8+
Signed-off-by: Rahul Rameshbabu <[email protected]>
9+
---
10+
src/nvidia-modeset/src/nvkms-dpy.c | 23 -----------------------
11+
src/nvidia-modeset/src/nvkms-hdmi.c | 9 +++++++++
12+
2 files changed, 9 insertions(+), 23 deletions(-)
13+
14+
diff --git a/src/nvidia-modeset/src/nvkms-dpy.c b/src/nvidia-modeset/src/nvkms-dpy.c
15+
index bbdf4df50..dcbc4085a 100644
16+
--- a/src/nvidia-modeset/src/nvkms-dpy.c
17+
+++ b/src/nvidia-modeset/src/nvkms-dpy.c
18+
@@ -909,29 +909,6 @@ void nvDpyProbeMaxPixelClock(NVDpyEvoPtr pDpyEvo)
19+
pDpyEvo->maxPixelClockKHz =
20+
((4 * 12 * 1000 * 1000 * 16) / 18);
21+
}
22+
- } else {
23+
- const NVParsedEdidEvoRec *pParsedEdid = &pDpyEvo->parsedEdid;
24+
-
25+
- if (pParsedEdid->valid) {
26+
- const NVT_EDID_INFO *pEdidInfo = &pParsedEdid->info;
27+
- /* Default Maximum HDMI TMDS character rate is 165MHz. */
28+
- NvU32 maxTmdsCharRate = 33;
29+
-
30+
- if (pEdidInfo->ext861.valid.H20_HF_VSDB &&
31+
- (pEdidInfo->hdmiForumInfo.max_TMDS_char_rate > 0)) {
32+
- maxTmdsCharRate =
33+
- NV_MIN(pEdidInfo->hdmiForumInfo.max_TMDS_char_rate, 120);
34+
- } else if (pEdidInfo->ext861.valid.H14B_VSDB &&
35+
- (pEdidInfo->hdmiLlcInfo.max_tmds_clock > 0)) {
36+
- maxTmdsCharRate =
37+
- NV_MIN(pEdidInfo->hdmiLlcInfo.max_tmds_clock, 68);
38+
- }
39+
-
40+
- /* Max Pixel Rate = Max TMDS character Rate * 5MHz */
41+
- pDpyEvo->maxPixelClockKHz =
42+
- pDpyEvo->maxSingleLinkPixelClockKHz =
43+
- maxTmdsCharRate * 5000;
44+
- }
45+
}
46+
} else {
47+
/*
48+
diff --git a/src/nvidia-modeset/src/nvkms-hdmi.c b/src/nvidia-modeset/src/nvkms-hdmi.c
49+
index e7f2ca230..d03f0adeb 100644
50+
--- a/src/nvidia-modeset/src/nvkms-hdmi.c
51+
+++ b/src/nvidia-modeset/src/nvkms-hdmi.c
52+
@@ -2108,6 +2108,9 @@ NvBool nvHdmiIsTmdsPossible(const NVDpyEvoRec *pDpyEvo,
53+
pDpyEvo->pDispEvo->pDevEvo->caps.hdmiTmds10BpcMaxPClkMHz * 1000UL;
54+
NvU32 adjustedMaxPixelClock =
55+
(pDpyEvo->maxSingleLinkPixelClockKHz * 4ULL) / 5ULL;
56+
+ NvU32 adjustedMaxEDIDPixelClock =
57+
+ pDpyEvo->parsedEdid.valid ?
58+
+ (pDpyEvo->parsedEdid.limits.max_pclk_10khz * 10 * 4ULL) / 5ULL : 0;
59+
60+
/* Pixel clock must satisfy hdmiTmds10BpcMaxPClkKHz, if applicable. */
61+
if ((hdmiTmds10BpcMaxPClkKHz > 0) &&
62+
@@ -2120,6 +2123,12 @@ NvBool nvHdmiIsTmdsPossible(const NVDpyEvoRec *pDpyEvo,
63+
return FALSE;
64+
}
65+
66+
+ /* Pixel clock must also satisfy adjustedMaxEDIDPixelClock. */
67+
+ if (adjustedMaxEDIDPixelClock != 0 &&
68+
+ pixelClock > adjustedMaxEDIDPixelClock) {
69+
+ return FALSE;
70+
+ }
71+
+
72+
return TRUE;
73+
}
74+

patch-2-handheld.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52835,12 +52835,12 @@ index 495d57ed3c0c..9473dd0a8ce7 100644
5283552835
path = drivers/custom/kvfm
5283652836
url = https://github.com/gnif/LookingGlass
5283752837
diff --git a/drivers/custom/xonedo b/drivers/custom/xonedo
52838-
index 2c06de29e95b..90d965254e53 160000
52838+
index 2c06de29e95b..6d5a78a88e86 160000
5283952839
--- a/drivers/custom/xonedo
5284052840
+++ b/drivers/custom/xonedo
5284152841
@@ -1 +1 @@
5284252842
-Subproject commit 2c06de29e95bbe9beebb81924f4b7324f0eb6591
52843-
+Subproject commit 90d965254e534151202e79f768bf7a68ea9f9d4f
52843+
+Subproject commit 6d5a78a88e8678e0a088d87ef59c7bebf9bc0ef5
5284452844
--
5284552845
2.52.0
5284652846

0 commit comments

Comments
 (0)