acpi_video_get_backlight_type() is deprecated and now there is
no user of it.
Signed-off-by: Akihiko Odaki <akihiko.odaki@xxxxxxxxxx>
---
Documentation/gpu/todo.rst | 8 +++----
drivers/acpi/video_detect.c | 46 +++++++++++++++++++------------------
include/acpi/video.h | 31 +++++++------------------
3 files changed, 36 insertions(+), 49 deletions(-)
diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst
index 393d218e4a0c..39e2ff2beb29 100644
--- a/Documentation/gpu/todo.rst
+++ b/Documentation/gpu/todo.rst
@@ -687,7 +687,7 @@ On x86/ACPI devices there can be multiple backlight firmware interfaces:
register programming by the KMS driver.
To deal with this backlight drivers used on x86/ACPI call
-acpi_video_get_backlight_type() which has heuristics (+quirks) to select
+acpi_video_get_backlight_types() which has heuristics (+quirks) to select
which backlight interface to use; and backlight drivers which do not match
the returned type will not register themselves, so that only one backlight
device gets registered (in a single GPU setup, see below).
@@ -696,7 +696,7 @@ At the moment this more or less assumes that there will only
be 1 (internal) panel on a system.
On systems with 2 panels this may be a problem, depending on
-what interface acpi_video_get_backlight_type() selects:
+what interface acpi_video_get_backlight_types() selects:
1. native: in this case the KMS driver is expected to know which backlight
device belongs to which output so everything should just work.
@@ -708,11 +708,11 @@ Things will break on systems with multiple panels where the 2 panels need
a different type of control. E.g. one panel needs ACPI video backlight control,
where as the other is using native backlight control. Currently in this case
only one of the 2 required backlight devices will get registered, based on
-the acpi_video_get_backlight_type() return value.
+the acpi_video_get_backlight_types() return value.
If this (theoretical) case ever shows up, then supporting this will need some
work. A possible solution here would be to pass a device and connector-name
-to acpi_video_get_backlight_type() so that it can deal with this.
+to acpi_video_get_backlight_types() so that it can deal with this.
Note in a way we already have a case where userspace sees 2 panels,
in dual GPU laptop setups with a mux. On those systems we may see
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 9cb12e4f06f7..88462f2fb8cc 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -38,19 +38,21 @@
#include <linux/workqueue.h>
#include <acpi/video.h>
-static enum acpi_backlight_type acpi_backlight_cmdline = acpi_backlight_undef;
-static enum acpi_backlight_type acpi_backlight_dmi = acpi_backlight_undef;
+#define ACPI_BACKLIGHT_UNDEF (-1)
+
+static int acpi_backlight_cmdline = ACPI_BACKLIGHT_UNDEF;
+static int acpi_backlight_dmi = ACPI_BACKLIGHT_UNDEF;
static void acpi_video_parse_cmdline(void)
{
if (!strcmp("vendor", acpi_video_backlight_string))
- acpi_backlight_cmdline = acpi_backlight_vendor;
+ acpi_backlight_cmdline = ACPI_BACKLIGHT_VENDOR;
if (!strcmp("video", acpi_video_backlight_string))
- acpi_backlight_cmdline = acpi_backlight_video;
+ acpi_backlight_cmdline = ACPI_BACKLIGHT_VIDEO;
if (!strcmp("native", acpi_video_backlight_string))
- acpi_backlight_cmdline = acpi_backlight_native;
+ acpi_backlight_cmdline = ACPI_BACKLIGHT_NATIVE;
if (!strcmp("none", acpi_video_backlight_string))
- acpi_backlight_cmdline = acpi_backlight_none;
+ acpi_backlight_cmdline = 0;
}
static acpi_status
@@ -109,25 +111,25 @@ static bool nvidia_wmi_ec_supported(void)
* buggy */
static int video_detect_force_vendor(const struct dmi_system_id *d)
{
- acpi_backlight_dmi = acpi_backlight_vendor;
+ acpi_backlight_dmi = ACPI_BACKLIGHT_VENDOR;
return 0;
}
static int video_detect_force_video(const struct dmi_system_id *d)
{
- acpi_backlight_dmi = acpi_backlight_video;
+ acpi_backlight_dmi = ACPI_BACKLIGHT_VIDEO;
return 0;
}
static int video_detect_force_native(const struct dmi_system_id *d)
{
- acpi_backlight_dmi = acpi_backlight_native;
+ acpi_backlight_dmi = ACPI_BACKLIGHT_NATIVE;
return 0;
}
static int video_detect_force_none(const struct dmi_system_id *d)
{
- acpi_backlight_dmi = acpi_backlight_none;
+ acpi_backlight_dmi = 0;
return 0;
}
@@ -672,7 +674,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
* Determine which type of backlight interface to use on this system,
* First check cmdline, then dmi quirks, then do autodetect.
*/
-static enum acpi_backlight_type __acpi_video_get_backlight_type(bool native)
+static int __acpi_video_get_backlight_types(bool native)
{
static DEFINE_MUTEX(init_mutex);
static bool nvidia_wmi_ec_present;
@@ -699,19 +701,19 @@ static enum acpi_backlight_type __acpi_video_get_backlight_type(bool native)
* The below heuristics / detection steps are in order of descending
* presedence. The commandline takes presedence over anything else.
*/
- if (acpi_backlight_cmdline != acpi_backlight_undef)
+ if (acpi_backlight_cmdline != ACPI_BACKLIGHT_UNDEF)
return acpi_backlight_cmdline;
/* DMI quirks override any autodetection. */
- if (acpi_backlight_dmi != acpi_backlight_undef)
+ if (acpi_backlight_dmi != ACPI_BACKLIGHT_UNDEF)
return acpi_backlight_dmi;
/* Special cases such as nvidia_wmi_ec and apple gmux. */
if (nvidia_wmi_ec_present)
- return acpi_backlight_nvidia_wmi_ec;
+ return ACPI_BACKLIGHT_NVIDIA_WMI_EC;
if (apple_gmux_present())
- return acpi_backlight_apple_gmux;
+ return ACPI_BACKLIGHT_APPLE_GMUX;
/* On systems with ACPI video use either native or ACPI video. */
if (video_caps & ACPI_VIDEO_BACKLIGHT) {
@@ -725,23 +727,23 @@ static enum acpi_backlight_type __acpi_video_get_backlight_type(bool native)
* is usually not the best choice.
*/
if (acpi_osi_is_win8() && native_available)
- return acpi_backlight_native;
+ return ACPI_BACKLIGHT_NATIVE;
else
- return acpi_backlight_video;
+ return ACPI_BACKLIGHT_VIDEO;
}
/* No ACPI video (old hw), use vendor specific fw methods. */
- return acpi_backlight_vendor;
+ return ACPI_BACKLIGHT_VENDOR;
}
-enum acpi_backlight_type acpi_video_get_backlight_type(void)
+int acpi_video_get_backlight_types(void)
{
- return __acpi_video_get_backlight_type(false);
+ return __acpi_video_get_backlight_types(false);
}
-EXPORT_SYMBOL(acpi_video_get_backlight_type);
+EXPORT_SYMBOL(acpi_video_get_backlight_types);
bool acpi_video_backlight_use_native(void)
{
- return __acpi_video_get_backlight_type(true) == acpi_backlight_native;
+ return !!(__acpi_video_get_backlight_types(true) & ACPI_BACKLIGHT_NATIVE);
}
EXPORT_SYMBOL(acpi_video_backlight_use_native);
diff --git a/include/acpi/video.h b/include/acpi/video.h
index a565ba27fae0..5b748fdb606e 100644
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
@@ -43,21 +43,11 @@ struct acpi_device;
#define ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS 0x88
#define ACPI_VIDEO_NOTIFY_DISPLAY_OFF 0x89
-enum acpi_backlight_type {
- acpi_backlight_undef = -1,
- acpi_backlight_none = 0,
- acpi_backlight_video,
- acpi_backlight_vendor,
- acpi_backlight_native,
- acpi_backlight_nvidia_wmi_ec,
- acpi_backlight_apple_gmux,
-};
-
-#define ACPI_BACKLIGHT_VIDEO BIT(acpi_backlight_video)
-#define ACPI_BACKLIGHT_VENDOR BIT(acpi_backlight_vendor)
-#define ACPI_BACKLIGHT_NATIVE BIT(acpi_backlight_native)
-#define ACPI_BACKLIGHT_NVIDIA_WMI_EC BIT(acpi_backlight_nvidia_wmi_ec)
-#define ACPI_BACKLIGHT_APPLE_GMUX BIT(acpi_backlight_apple_gmux)
+#define ACPI_BACKLIGHT_VIDEO BIT(0)
+#define ACPI_BACKLIGHT_VENDOR BIT(1)
+#define ACPI_BACKLIGHT_NATIVE BIT(2)
+#define ACPI_BACKLIGHT_NVIDIA_WMI_EC BIT(3)
+#define ACPI_BACKLIGHT_APPLE_GMUX BIT(4)
#if IS_ENABLED(CONFIG_ACPI_VIDEO)
extern int acpi_video_register(void);
@@ -65,7 +55,7 @@ extern void acpi_video_unregister(void);
extern void acpi_video_register_backlight(void);
extern int acpi_video_get_edid(struct acpi_device *device, int type,
int device_id, void **edid);
-extern enum acpi_backlight_type acpi_video_get_backlight_type(void);
+extern int acpi_video_get_backlight_types(void);
extern bool acpi_video_backlight_use_native(void);
/*
* Note: The value returned by acpi_video_handles_brightness_key_presses()
@@ -84,9 +74,9 @@ static inline int acpi_video_get_edid(struct acpi_device *device, int type,
{
return -ENODEV;
}
-static inline enum acpi_backlight_type acpi_video_get_backlight_type(void)
+static inline int acpi_video_get_backlight_types(void)
{
- return acpi_backlight_vendor;
+ return ACPI_BACKLIGHT_VENDOR;
}
static inline bool acpi_video_backlight_use_native(void)
{
@@ -104,9 +94,4 @@ static inline int acpi_video_get_levels(struct acpi_device *device,
}
#endif
-static inline int acpi_video_get_backlight_types(void)
-{
- return BIT(acpi_video_get_backlight_type());
-}
-
#endif
--
2.37.3
