Commit b1d36e73 authored by Hans de Goede's avatar Hans de Goede
Browse files

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: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 2600bfa3

drivers/gpu/drm/i915/display/intel_backlight.c

+7 −0
Original line number Diff line number Diff line
@@ -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;