open-gpu-kernel-modules icon indicating copy to clipboard operation
open-gpu-kernel-modules copied to clipboard

Fix 6.11 drm_fbdev_generic.h rename to drm_fbdev_ttm.h

Open leigh123linux opened this issue 1 year ago • 5 comments

drm_fbdev_generic.h has been renamed to drm_fbdev_ttm.h in kernel-6.11

https://github.com/torvalds/linux/commit/aae4682e5d66c1e1dc181fa341652e037237f144

leigh123linux avatar Aug 17 '24 17:08 leigh123linux

CLA assistant check
All committers have signed the CLA.

CLAassistant avatar Aug 17 '24 17:08 CLAassistant

Thank you for this, @leigh123linux. We'll be sure to incorporate this, or something similar, in a near-future release.

aritger avatar Aug 21 '24 22:08 aritger

new error also related t kernel 6.12 update:

> /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-modeset/nvidia-modeset-linux.c:1139:6: warning: no previous prototype for 'nvkms_close_pm_locked' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wmissing-prototypes-Wmissing-prototypes8;;]
>  1139 | void nvkms_close_pm_locked(struct nvkms_per_open *popen)
>       |      ^~~~~~~~~~~~~~~~~~~~~
> /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-modeset/nvidia-modeset-linux.c:1202:5: warning: no previous prototype for 'nvkms_ioctl_common' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wmissing-prototypes-Wmissing-prototypes8;;]
>  1202 | int nvkms_ioctl_common
>       |     ^~~~~~~~~~~~~~~~~~
>   CC [M]  /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-fence.o
>   CC [M]  /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-helper.o
>   CC [M]  /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nv-kthread-q.o
> /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-drv.c:207:6: error: 'const struct drm_mode_config_funcs' has no member named 'output_poll_changed'
>   207 |     .output_poll_changed = nv_drm_output_poll_changed,
>       |      ^~~~~~~~~~~~~~~~~~~
> /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-drv.c:207:28: error: initialization of 'struct drm_atomic_state * (*)(struct drm_device *)' from incompatible pointer type 'void (*)(struct drm_device *)' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Werror=incompatible-pointer-types8;;]
>   207 |     .output_poll_changed = nv_drm_output_poll_changed,
>       |                            ^~~~~~~~~~~~~~~~~~~~~~~~~~
> /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-drv.c:207:28: note: (near initialization for 'nv_mode_config_funcs.atomic_state_alloc')
> cc1: some warnings being treated as errors
> make[4]: *** [/nix/store/lacdcr5zi7w59f8xsq4cfi41mzgc6dcn-linux-6.12-dev/lib/modules/6.12.0/source/scripts/Makefile.build:229: /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-drv.o] Error 1
> make[4]: *** Waiting for unfinished jobs....
> make[3]: *** [/nix/store/lacdcr5zi7w59f8xsq4cfi41mzgc6dcn-linux-6.12-dev/lib/modules/6.12.0/source/Makefile:1936: /build/NVIDIA-Linux-x86_64-560.35.03/kernel] Error 2
> make[2]: *** [/nix/store/lacdcr5zi7w59f8xsq4cfi41mzgc6dcn-linux-6.12-dev/lib/modules/6.12.0/source/Makefile:224: __sub-make] Error 2
> make[2]: Leaving directory '/nix/store/lacdcr5zi7w59f8xsq4cfi41mzgc6dcn-linux-6.12-dev/lib/modules/6.12.0/build'
> make[1]: *** [Makefile:224: __sub-make] Error 2
> make[1]: Leaving directory '/nix/store/lacdcr5zi7w59f8xsq4cfi41mzgc6dcn-linux-6.12-dev/lib/modules/6.12.0/source'
> make: *** [Makefile:89: modules] Error 2

adminy avatar Nov 21 '24 17:11 adminy

new error also related t kernel 6.12 update:

> /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-modeset/nvidia-modeset-linux.c:1139:6: warning: no previous prototype for 'nvkms_close_pm_locked' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wmissing-prototypes-Wmissing-prototypes8;;]
>  1139 | void nvkms_close_pm_locked(struct nvkms_per_open *popen)
>       |      ^~~~~~~~~~~~~~~~~~~~~
> /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-modeset/nvidia-modeset-linux.c:1202:5: warning: no previous prototype for 'nvkms_ioctl_common' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wmissing-prototypes-Wmissing-prototypes8;;]
>  1202 | int nvkms_ioctl_common
>       |     ^~~~~~~~~~~~~~~~~~
>   CC [M]  /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-fence.o
>   CC [M]  /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-helper.o
>   CC [M]  /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nv-kthread-q.o
> /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-drv.c:207:6: error: 'const struct drm_mode_config_funcs' has no member named 'output_poll_changed'
>   207 |     .output_poll_changed = nv_drm_output_poll_changed,
>       |      ^~~~~~~~~~~~~~~~~~~
> /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-drv.c:207:28: error: initialization of 'struct drm_atomic_state * (*)(struct drm_device *)' from incompatible pointer type 'void (*)(struct drm_device *)' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Werror=incompatible-pointer-types8;;]
>   207 |     .output_poll_changed = nv_drm_output_poll_changed,
>       |                            ^~~~~~~~~~~~~~~~~~~~~~~~~~
> /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-drv.c:207:28: note: (near initialization for 'nv_mode_config_funcs.atomic_state_alloc')
> cc1: some warnings being treated as errors
> make[4]: *** [/nix/store/lacdcr5zi7w59f8xsq4cfi41mzgc6dcn-linux-6.12-dev/lib/modules/6.12.0/source/scripts/Makefile.build:229: /build/NVIDIA-Linux-x86_64-560.35.03/kernel/nvidia-drm/nvidia-drm-drv.o] Error 1
> make[4]: *** Waiting for unfinished jobs....
> make[3]: *** [/nix/store/lacdcr5zi7w59f8xsq4cfi41mzgc6dcn-linux-6.12-dev/lib/modules/6.12.0/source/Makefile:1936: /build/NVIDIA-Linux-x86_64-560.35.03/kernel] Error 2
> make[2]: *** [/nix/store/lacdcr5zi7w59f8xsq4cfi41mzgc6dcn-linux-6.12-dev/lib/modules/6.12.0/source/Makefile:224: __sub-make] Error 2
> make[2]: Leaving directory '/nix/store/lacdcr5zi7w59f8xsq4cfi41mzgc6dcn-linux-6.12-dev/lib/modules/6.12.0/build'
> make[1]: *** [Makefile:224: __sub-make] Error 2
> make[1]: Leaving directory '/nix/store/lacdcr5zi7w59f8xsq4cfi41mzgc6dcn-linux-6.12-dev/lib/modules/6.12.0/source'
> make: *** [Makefile:89: modules] Error 2

This is fixed in 565 and 550 branch. You should update your drivers. 565 also needs an additional patch: https://forums.developer.nvidia.com/t/patch-for-565-57-01-linux-kernel-6-12/313260

ptr1337 avatar Nov 21 '24 17:11 ptr1337