Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 168cf0ec authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Revert "ACPI / video: Always call acpi_video_init_brightness() on init" 

Revert commit c04c697c (ACPI / video: Always call acpi_video_init_brightness()
on init), because it breaks eDP backlight at 1920x1080 on Acer Aspire S3
for Trevor Bortins.

References: https://bugs.freedesktop.org/show_bug.cgi?id=68355


Reported-and-bisected-by: default avatarTrevor Bortins <enabfluw@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b36f4be3

drivers/acpi/video.c

+3 −8
Original line number Diff line number Diff line
@@ -908,9 +908,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) 
		device->cap._DDC = 1;

	}



	if (acpi_video_init_brightness(device))

		return;



	if (acpi_video_backlight_support()) {

		struct backlight_properties props;

		struct pci_dev *pdev;
@@ -920,6 +917,9 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) 
		static int count = 0;

		char *name;



		result = acpi_video_init_brightness(device);

		if (result)

			return;

		name = kasprintf(GFP_KERNEL, "acpi_video%d", count);

		if (!name)

			return;
@@ -979,11 +979,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) 
		if (result)

			printk(KERN_ERR PREFIX "Create sysfs link\n");



	} else {

		/* Remove the brightness object. */

		kfree(device->brightness->levels);

		kfree(device->brightness);

		device->brightness = NULL;

	}

}