Skip to content

nvidia-modeset: skip ACPI native-backlight query when ACPI is disabled #1273

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

Open
jsoltren-bcm wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −1
Open

nvidia-modeset: skip ACPI native-backlight query when ACPI is disabled #1273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion kernel-open/nvidia-modeset/nvidia-modeset-linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@

#include <acpi/video.h>

#if defined(CONFIG_ACPI)
#include <linux/acpi.h>
#endif

#include "nvstatus.h"

#include "nv-modeset-interface.h"
Expand Down Expand Up @@ -1315,7 +1319,19 @@ nvkms_register_backlight(NvU32 gpu_id, NvU32 display_id, void *drv_priv,
int i;

#if defined(NV_ACPI_VIDEO_BACKLIGHT_USE_NATIVE)
if (!acpi_video_backlight_use_native()) {
/*
* acpi_video_backlight_use_native() consults ACPI state that is never
* populated when the kernel is booted with "acpi=off", so only consult
* it when ACPI is actually enabled at runtime. Otherwise, fall through
* and register NVIDIA's own backlight device as if native ACPI
* backlight were unavailable.
*/
#if defined(CONFIG_ACPI)
if (!acpi_disabled && !acpi_video_backlight_use_native())
#else
if (!acpi_video_backlight_use_native())
#endif
{
#if defined(NV_ACPI_VIDEO_REGISTER_BACKLIGHT)
nvkms_log(NVKMS_LOG_LEVEL_INFO, NVKMS_LOG_PREFIX,
"ACPI reported no NVIDIA native backlight available; attempting to use ACPI backlight.");
Expand Down