NVIDIA 331.20 will not load with kernel 3.13 on EFI without CSM

Linux 3.13 dropped the DEVICE_ACPI_HANDLE() macro in favor of ACPI_HANDLE(). This causes the NVIDIA 331.20 driver (and probably other versions, but I haven’t tested) to fail to load complaining something about failure to load the vbios into system RAM when running on an EFI system with CSM (Compatibility Support Module) disabled. It also causes backlight control to fail once X is running on BIOS systems or EFI systems with CSM enabled.

Editing the nv-acpi.c file and changing all references of DEVICE_ACPI_HANDLE() to ACPI_HANDLE() fixes the problem.

The kernel commit that caused the issue is https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3a83f992490f8235661b768e53bd5f14915420ac
nvidia-bug-report.log.gz (70.9 KB)

Just for info - nvidia 337.25 checks for both DEVICE_ACPI_HANDLE and ACPI_HANDLE, in nv-acpi.c