Commit 6ac6aecd
5
plików
+111
dodanych
-10
usuniętych
@@ -1,6 +1,6 @@
1 1 pkgname: nvidia-dkms
2 2 pkgver: '610.57.04'
3 -pkgrel: '11'
3 +pkgrel: '12'
4 4 pkgdesc: NVIDIA userspace drivers (libGLX, libEGL, Vulkan ICD, nvidia-smi) + DKMS kernel module sources, Xorg config and udev rules
5 5 url: https://www.nvidia.com/en-us/drivers/unix/
6 6 arch: x86_64
@@ -129,6 +129,12 @@ build: |
129 129 [ -f "${_src}" ] && [ ! -e "${_dst}" ] && ln -sf "${_src}" "${_dst}"
130 130 done
131 131
132 + # ── firmware GSP z tego samego .run (np. gsp_tu10x.bin) ────────────────
133 + if [ -d "${_nvdir}/firmware" ]; then
134 + install -dm0755 "${PKGDIR}/lib/firmware/nvidia/${pkgver}"
135 + install -m0644 "${_nvdir}"/firmware/* "${PKGDIR}/lib/firmware/nvidia/${pkgver}/"
136 + fi
137 +
132 138 # ═══ CZĘŚĆ 2/3: ŹRÓDŁA DKMS ═══
133 139 # Zawartość ${_nvdir}/kernel/ (Makefile, Kbuild oraz katalogi nvidia/,
134 140 # nvidia-uvm/, nvidia-modeset/, nvidia-drm/) kopiujemy DO ${_srcdir}/, więc
@@ -194,6 +200,17 @@ build: |
194 200 ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", RUN+="/usr/sbin/modprobe nvidia-drm"
195 201 EOF
196 202
203 + # Poprawne węzły /dev/nvidia*: NVIDIA 610 rejestruje nvidiactl,
204 + # nvidia-modeset (a nie nvidia-frontend, którego używa stara reguła).
205 + install -dm0755 ${PKGDIR}/lib/udev/rules.d
206 + cat > ${PKGDIR}/lib/udev/rules.d/60-nvidia.rules << 'EOF'
207 + KERNEL=="nvidia", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidiactl c $$(grep -w nvidiactl /proc/devices | cut -d \ -f 1) 255'"
208 + KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia$${i} c $$(grep -w nvidiactl /proc/devices | cut -d \ -f 1) $${i}; done'"
209 + KERNEL=="nvidia_modeset", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-modeset c $$(grep -w nvidia-modeset /proc/devices | cut -d \ -f 1) 254'"
210 + KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-uvm c $$(grep -w nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
211 + KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-uvm-tools c $$(grep -w nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
212 + EOF
213 +
197 214 cat > ${PKGDIR}/etc/modprobe.d/nouveau.conf << 'EOF'
198 215 blacklist nouveau
199 216 options nouveau modeset=0
@@ -209,7 +226,11 @@ hooks:
209 226 fi
210 227 dkms add -m nvidia -v 610.57.04 || true
211 228 dkms build -m nvidia -v 610.57.04 || true
212 - dkms install -m nvidia -v 610.57.04 || true
229 + if [ -e "/usr/lib/modules/$(uname -r)/kernel/drivers/video/nvidia.ko" ]; then
230 + echo "nvidia-kernel dostarcza moduły – pomijam dkms install"
231 + else
232 + dkms install -m nvidia -v 610.57.04 || true
233 + fi
213 234 depmod -a || true
214 235 if command -v pagan-initramfs >/dev/null 2>&1; then pagan-initramfs || true; fi
215 236 ldconfig
216 237 new file mode 100644
@@ -0,0 +1,16 @@
1 +pkgname: nvidia
2 +pkgver: '610.57.04'
3 +pkgrel: '2'
4 +pkgdesc: 'NVIDIA userspace meta-package (compatibility; installs nvidia-dkms)'
5 +url: 'https://www.nvidia.com/en-us/drivers/unix/'
6 +arch: x86_64
7 +license:
8 +- custom
9 +# Stary pakiet `nvidia` instalował własną, wadliwą kopię 60-nvidia.rules.
10 +# Cała warstwa userspace + firmware + reguły udev jest teraz w nvidia-dkms.
11 +depends:
12 +- nvidia-dkms
13 +build: |
14 + true
15 +package: |
16 + true
@@ -1,6 +1,6 @@
1 1 # Make sure device nodes are present even when the DDX is not started for the Wayland/EGLStream case
2 -KERNEL=="nvidia", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'"
3 -KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) $${i}; done'"
4 -KERNEL=="nvidia_modeset", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'"
2 +KERNEL=="nvidia", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidiactl c $$(grep -w nvidiactl /proc/devices | cut -d \ -f 1) 255'"
3 +KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia$${i} c $$(grep -w nvidiactl /proc/devices | cut -d \ -f 1) $${i}; done'"
4 +KERNEL=="nvidia_modeset", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-modeset c $$(grep -w nvidia-modeset /proc/devices | cut -d \ -f 1) 254'"
5 5 KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
6 6 KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
@@ -1,6 +1,6 @@
1 1 pkgname: pagan-fixes
2 2 pkgver: '1.0'
3 -pkgrel: '2'
3 +pkgrel: '3'
4 4 pkgdesc: 'PaganOS – narzedzia naprawcze (bug-fix helpery). Obecnie nvfix: diagnoza i naprawa Vulkan/NVIDIA (brakujacy nvidia_icd.json, zbedny plik w implicit_layer.d, rozjazd wersji modul/userspace).'
5 5 url: 'https://paganlinux.eu'
6 6 arch: x86_64
@@ -71,12 +71,16 @@ have() { command -v "$1" >/dev/null 2>&1; }
71 71 check_nvidia_smi() {
72 72 hdr "1. nvidia-smi (sterownik jądra + userspace)"
73 73 if ! have nvidia-smi; then
74 - err "Brak nvidia-smi – zainstaluj pakiet nvidia (warstwa użytkownika)"
74 + err "Brak nvidia-smi – zainstaluj pakiet nvidia-dkms (warstwa użytkownika)"
75 75 return 1
76 76 fi
77 77 local out
78 78 if ! out=$(nvidia-smi --query-gpu=driver_version,name --format=csv,noheader 2>/dev/null); then
79 - err "nvidia-smi nie odpowiada – moduły jądra prawdopodobnie niezaładowane"
79 + if lsmod 2>/dev/null | grep -q '^nvidia'; then
80 + err "nvidia-smi nie odpowiada, choć moduły jądra są załadowane – sprawdź /dev/nvidia* i regułę udev"
81 + else
82 + err "nvidia-smi nie odpowiada – moduły jądra prawdopodobnie niezaładowane"
83 + fi
80 84 return 1
81 85 fi
82 86 ok "Wersja sterownika: $out"
@@ -96,10 +100,40 @@ check_kernel_modules() {
96 100 return 0
97 101 }
98 102
103 +check_device_nodes() {
104 + hdr "2b. Węzły /dev/nvidia*"
105 + local missing=()
106 + for n in nvidiactl nvidia0 nvidia-modeset; do
107 + [[ -e "/dev/$n" ]] || missing+=("/dev/$n")
108 + done
109 + if [[ ${#missing[@]} -eq 0 ]]; then
110 + ok "Węzły urządzeń obecne"
111 + return 0
112 + fi
113 + err "Brak: ${missing[*]}"
114 + info "Sprawdź regułę udev (nvidia-frontend → nvidiactl) i uruchom: sudo nvidia-modprobe -c 0 -m"
115 + return 1
116 +}
117 +
118 +check_udev_rule() {
119 + hdr "2c. Reguła udev dla /dev/nvidia*"
120 + local f=/usr/lib/udev/rules.d/60-nvidia.rules
121 + if [[ ! -f "$f" ]]; then
122 + warn "Brak $f – węzły /dev/nvidia* mogą nie powstać po restarcie"
123 + return 1
124 + fi
125 + if grep -q 'nvidia-frontend' "$f"; then
126 + err "$f używa nieistniejącego 'nvidia-frontend' (NVIDIA 610: nvidiactl/nvidia-modeset)"
127 + return 1
128 + fi
129 + ok "$f wygląda poprawnie"
130 + return 0
131 +}
132 +
99 133 check_libglx() {
100 134 hdr "3. Biblioteka GLX (userspace)"
101 135 if [[ ! -e "$LIBGLX" ]]; then
102 - err "Brak $LIBGLX – zainstaluj pakiet nvidia"
136 + err "Brak $LIBGLX – zainstaluj pakiet nvidia-dkms"
103 137 return 1
104 138 fi
105 139 if [[ -L "$LIBGLX" ]]; then
@@ -114,6 +148,9 @@ check_versions_match() {
114 148 hdr "4. Zgodność wersji modułów jądra i userspace"
115 149 local drv_ver lib_ver
116 150 drv_ver=$(nvidia-smi --query-gpu=driver_version --format=csv,noheader 2>/dev/null | tr -d ' ')
151 + if [[ -z "$drv_ver" ]]; then
152 + drv_ver=$(sed -n 's/.*Kernel Module *\([0-9.]*\).*/\1/p' /proc/driver/nvidia/version 2>/dev/null | head -1)
153 + fi
117 154 lib_ver=$(basename "$(readlink -f "$LIBGLX" 2>/dev/null)" 2>/dev/null | sed 's/.*\.so\.//')
118 155
119 156 if [[ -z "$drv_ver" || -z "$lib_ver" ]]; then
@@ -138,7 +175,7 @@ check_conflicting_pkgs() {
138 175 return 0
139 176 fi
140 177 local installed
141 - installed=$(pag list-installed 2>/dev/null || true)
178 + installed=$(pag list --installed 2>/dev/null || true)
142 179 local has_kernel=0 has_dkms=0
143 180 grep -q '^nvidia-kernel' <<<"$installed" && has_kernel=1
144 181 grep -q '^nvidia-dkms' <<<"$installed" && has_dkms=1
@@ -241,6 +278,30 @@ fix_stray_icd() {
241 278 ok "Usunięto $STRAY_ICD"
242 279 }
243 280
281 +fix_device_nodes() {
282 + [[ -e /dev/nvidiactl && -e /dev/nvidia0 ]] && return 0
283 + confirm "utworzyć brakujące węzły /dev/nvidia*" || return 1
284 +
285 + if have nvidia-modprobe; then
286 + nvidia-modprobe -c 0 || true
287 + nvidia-modprobe -m || true
288 + nvidia-modprobe -u || true
289 + fi
290 +
291 + if [[ ! -e /dev/nvidiactl ]]; then
292 + local major
293 + major=$(awk '$2=="nvidiactl"{print $1}' /proc/devices 2>/dev/null)
294 + [[ -n "$major" ]] && mknod -m 666 /dev/nvidiactl c "$major" 255 || true
295 + fi
296 + if [[ ! -e /dev/nvidia-modeset ]]; then
297 + local major
298 + major=$(awk '$2=="nvidia-modeset"{print $1}' /proc/devices 2>/dev/null)
299 + [[ -n "$major" ]] && mknod -m 666 /dev/nvidia-modeset c "$major" 254 || true
300 + fi
301 +
302 + [[ -e /dev/nvidiactl && -e /dev/nvidia0 ]]
303 +}
304 +
244 305 fix_reload() {
245 306 confirm "przeładować udev i ldconfig" || return 0
246 307 have udevadm && udevadm control --reload-rules 2>/dev/null
@@ -259,6 +320,8 @@ main() {
259 320 local rc=0
260 321 check_nvidia_smi || rc=1
261 322 check_kernel_modules || rc=1
323 + check_device_nodes || rc=1
324 + check_udev_rule || rc=1
262 325 check_libglx || rc=1
263 326 check_versions_match || rc=1
264 327 check_conflicting_pkgs
@@ -274,6 +337,7 @@ main() {
274 337
275 338 hdr "NAPRAWA"
276 339 fix_icd_file
340 + fix_device_nodes
277 341 fix_stray_icd
278 342 fix_reload
279 343