Merge branches 'acpi-misc' and 'acpi-video' (2c66a5b5) · Commits · 戴 / test

drivers/acpi/acpi_video.c

+37 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,12 @@ module_param(report_key_events, int, 0644);
		MODULE_PARM_DESC(report_key_events,
		"0: none, 1: output changes, 2: brightness changes, 3: all");

		static int hw_changes_brightness = -1;
		module_param(hw_changes_brightness, int, 0644);
		MODULE_PARM_DESC(hw_changes_brightness,
		"Set this to 1 on buggy hw which changes the brightness itself when "
		"a hotkey is pressed: -1: auto, 0: normal 1: hw-changes-brightness");

		/*
		* Whether the struct acpi_video_device_attrib::device_id_scheme bit should be
		* assumed even if not actually set.
		@@ -405,6 +411,14 @@ static int video_set_report_key_events(const struct dmi_system_id *id)
		return 0;
		}

		static int video_hw_changes_brightness(
		const struct dmi_system_id *d)
		{
		if (hw_changes_brightness == -1)
		hw_changes_brightness = 1;
		return 0;
		}

		static const struct dmi_system_id video_dmi_table[] = {
		/*
		* Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
		@@ -529,6 +543,21 @@ static const struct dmi_system_id video_dmi_table[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"),
		},
		},
		/*
		* Some machines change the brightness themselves when a brightness
		* hotkey gets pressed, despite us telling them not to. In this case
		* acpi_video_device_notify() should only call backlight_force_update(
		* BACKLIGHT_UPDATE_HOTKEY) and not do anything else.
		*/
		{
		/* https://bugzilla.kernel.org/show_bug.cgi?id=204077 */
		.callback = video_hw_changes_brightness,
		.ident = "Packard Bell EasyNote MZ35",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Packard Bell"),
		DMI_MATCH(DMI_PRODUCT_NAME, "EasyNote MZ35"),
		},
		},
		{}
		};

		@@ -1612,6 +1641,14 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
		bus = video_device->video;
		input = bus->input;

		if (hw_changes_brightness > 0) {
		if (video_device->backlight)
		backlight_force_update(video_device->backlight,
		BACKLIGHT_UPDATE_HOTKEY);
		acpi_notifier_call_chain(device, event, 0);
		return;
		}

		switch (event) {
		case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS: /* Cycle brightness */
		brightness_switch_event(video_device, event);

drivers/acpi/blacklist.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -17,7 +17,9 @@

		#include "internal.h"

		#ifdef CONFIG_DMI
		static const struct dmi_system_id acpi_rev_dmi_table[] __initconst;
		#endif

		/*
		* POLICY: If anything doesn't work, put it on the blacklist.
		@@ -61,7 +63,9 @@ int __init acpi_blacklisted(void)
		}

		(void)early_acpi_osi_init();
		#ifdef CONFIG_DMI
		dmi_check_system(acpi_rev_dmi_table);
		#endif

		return blacklisted;
		}

include/linux/acpi.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -324,7 +324,10 @@ struct irq_domain *acpi_irq_create_hierarchy(unsigned int flags,
		#ifdef CONFIG_X86_IO_APIC
		extern int acpi_get_override_irq(u32 gsi, int trigger, int polarity);
		#else
		#define acpi_get_override_irq(gsi, trigger, polarity) (-1)
		static inline int acpi_get_override_irq(u32 gsi, int trigger, int polarity)
		{
		return -1;
		}
		#endif
		/*
		* This function undoes the effect of one call to acpi_register_gsi().

Admin message