@@ -110,26 +110,6 @@ static bool nvidia_wmi_ec_supported(void)
110
110
}
111
111
#endif
112
112
113
- static bool apple_gmux_backlight_present (void )
114
- {
115
- struct acpi_device * adev ;
116
- struct device * dev ;
117
-
118
- adev = acpi_dev_get_first_match_dev (GMUX_ACPI_HID , NULL , -1 );
119
- if (!adev )
120
- return false;
121
-
122
- dev = acpi_get_first_physical_node (adev );
123
- if (!dev )
124
- return false;
125
-
126
- /*
127
- * drivers/platform/x86/apple-gmux.c only supports old style
128
- * Apple GMUX with an IO-resource.
129
- */
130
- return pnp_get_resource (to_pnp_dev (dev ), IORESOURCE_IO , 0 ) != NULL ;
131
- }
132
-
133
113
/* Force to use vendor driver when the ACPI device is known to be
134
114
* buggy */
135
115
static int video_detect_force_vendor (const struct dmi_system_id * d )
@@ -766,6 +746,7 @@ static enum acpi_backlight_type __acpi_video_get_backlight_type(bool native)
766
746
{
767
747
static DEFINE_MUTEX (init_mutex );
768
748
static bool nvidia_wmi_ec_present ;
749
+ static bool apple_gmux_present ;
769
750
static bool native_available ;
770
751
static bool init_done ;
771
752
static long video_caps ;
@@ -779,6 +760,7 @@ static enum acpi_backlight_type __acpi_video_get_backlight_type(bool native)
779
760
ACPI_UINT32_MAX , find_video , NULL ,
780
761
& video_caps , NULL );
781
762
nvidia_wmi_ec_present = nvidia_wmi_ec_supported ();
763
+ apple_gmux_present = apple_gmux_detect (NULL , NULL );
782
764
init_done = true;
783
765
}
784
766
if (native )
@@ -800,7 +782,7 @@ static enum acpi_backlight_type __acpi_video_get_backlight_type(bool native)
800
782
if (nvidia_wmi_ec_present )
801
783
return acpi_backlight_nvidia_wmi_ec ;
802
784
803
- if (apple_gmux_backlight_present () )
785
+ if (apple_gmux_present )
804
786
return acpi_backlight_apple_gmux ;
805
787
806
788
/* Use ACPI video if available, except when native should be preferred. */
0 commit comments