diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2022-04-15 21:55:35 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2022-08-25 10:55:58 +0200 |
| commit | b1d36e73cc1c68d28f63cbd14767d0d0861147e0 (patch) | |
| tree | 84fc2702659dadf4e660b1eb816a12b053b41888 /drivers | |
| parent | 2600bfa3df9944562d43d1f17016832a6ffa3b38 (diff) | |
| download | linux-b1d36e73cc1c68d28f63cbd14767d0d0861147e0.tar.bz2 | |
drm/i915: Don't register backlight when another backlight should be used (v2)
Before this commit when we want userspace to use the acpi_video backlight
device we register both the GPU's native backlight device and acpi_video's
firmware acpi_video# backlight device. This relies on userspace preferring
firmware type backlight devices over native ones.
Registering 2 backlight devices for a single display really is
undesirable, don't register the GPU's native backlight device when
another backlight device should be used.
Changes in v2:
- Use drm_info(drm_dev, ...) for log messages
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_backlight.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c index 110fc98ec280..84639e9df5c9 100644 --- a/drivers/gpu/drm/i915/display/intel_backlight.c +++ b/drivers/gpu/drm/i915/display/intel_backlight.c @@ -8,6 +8,8 @@ #include <linux/pwm.h> #include <linux/string_helpers.h> +#include <acpi/video.h> + #include "intel_backlight.h" #include "intel_connector.h" #include "intel_de.h" @@ -950,6 +952,11 @@ int intel_backlight_device_register(struct intel_connector *connector) WARN_ON(panel->backlight.max == 0); + if (!acpi_video_backlight_use_native()) { + drm_info(&i915->drm, "Skipping intel_backlight registration\n"); + return 0; + } + memset(&props, 0, sizeof(props)); props.type = BACKLIGHT_RAW; |