Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 6.11 drm_fbdev_generic.h rename to drm_fbdev_ttm.h #692

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix 6.11 drm_fbdev_generic.h rename to drm_fbdev_ttm.h #692

wants to merge 1 commit into from
+33 −1

Conversation

leigh123linux
Copy link

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

torvalds/linux@aae4682

@CLAassistant
Copy link

CLAassistant commented Aug 17, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@aritger
Copy link
Collaborator

aritger commented Aug 21, 2024

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

@ccicnce113424 ccicnce113424 mentioned this pull request Sep 24, 2024
Closed
@fpletz fpletz mentioned this pull request Sep 25, 2024
Merged
13 tasks
timon-schelling added a commit to timon-schelling/timonos that referenced this pull request Oct 15, 2024
@timon-schelling
fix: add workaround for nvidia kernel module
6da1bd7 
Kernel parameter `initcall_blacklist=simpledrm_platform_driver_init`
is used to prevent the driver from hitting the renamed (and thus not linked) codepath.
Remove after NVIDIA/open-gpu-kernel-modules#692
and similar are merged and build in nixpkgs-unstable.
This also disables tty output and thus hides boot logs.
@Daholli Daholli mentioned this pull request Oct 29, 2024
Closed
@adminy
Copy link

adminy commented Nov 21, 2024

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

@ptr1337
Copy link

ptr1337 commented Nov 21, 2024

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@leigh123linux @CLAassistant @aritger @adminy @ptr1337