| Message ID | 20220825143726.269890-16-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Commit | 3db2aeb121b9c54f52c399b8905c2bbbf201b7b5 |
| Headers | show |
| Series | drm/kms: Stop registering multiple /sys/class/backlight devs for a single display | expand |
Thanks, Hans. Reviewed-by: Daniel Dadap <ddadap@nvidia.com> On 8/25/22 9:37 AM, Hans de Goede wrote: > Move the WMI interface definitions to a header, so that the definitions > can be shared with drivers/acpi/video_detect.c . > > Changes in v2: > - Add missing Nvidia copyright header > - Move WMI_BRIGHTNESS_GUID to nvidia-wmi-ec-backlight.h as well > > Suggested-by: Daniel Dadap <ddadap@nvidia.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > MAINTAINERS | 1 + > .../platform/x86/nvidia-wmi-ec-backlight.c | 68 +---------------- > .../x86/nvidia-wmi-ec-backlight.h | 76 +++++++++++++++++++ > 3 files changed, 78 insertions(+), 67 deletions(-) > create mode 100644 include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 9d7f64dc0efe..d6f6b96f51f7 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -14527,6 +14527,7 @@ M: Daniel Dadap <ddadap@nvidia.com> > L: platform-driver-x86@vger.kernel.org > S: Supported > F: drivers/platform/x86/nvidia-wmi-ec-backlight.c > +F: include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h > > NVM EXPRESS DRIVER > M: Keith Busch <kbusch@kernel.org> > diff --git a/drivers/platform/x86/nvidia-wmi-ec-backlight.c b/drivers/platform/x86/nvidia-wmi-ec-backlight.c > index 61e37194df70..be803e47eac0 100644 > --- a/drivers/platform/x86/nvidia-wmi-ec-backlight.c > +++ b/drivers/platform/x86/nvidia-wmi-ec-backlight.c > @@ -7,74 +7,10 @@ > #include <linux/backlight.h> > #include <linux/mod_devicetable.h> > #include <linux/module.h> > +#include <linux/platform_data/x86/nvidia-wmi-ec-backlight.h> > #include <linux/types.h> > #include <linux/wmi.h> > > -/** > - * enum wmi_brightness_method - WMI method IDs > - * @WMI_BRIGHTNESS_METHOD_LEVEL: Get/Set EC brightness level status > - * @WMI_BRIGHTNESS_METHOD_SOURCE: Get/Set EC Brightness Source > - */ > -enum wmi_brightness_method { > - WMI_BRIGHTNESS_METHOD_LEVEL = 1, > - WMI_BRIGHTNESS_METHOD_SOURCE = 2, > - WMI_BRIGHTNESS_METHOD_MAX > -}; > - > -/** > - * enum wmi_brightness_mode - Operation mode for WMI-wrapped method > - * @WMI_BRIGHTNESS_MODE_GET: Get the current brightness level/source. > - * @WMI_BRIGHTNESS_MODE_SET: Set the brightness level. > - * @WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL: Get the maximum brightness level. This > - * is only valid when the WMI method is > - * %WMI_BRIGHTNESS_METHOD_LEVEL. > - */ > -enum wmi_brightness_mode { > - WMI_BRIGHTNESS_MODE_GET = 0, > - WMI_BRIGHTNESS_MODE_SET = 1, > - WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL = 2, > - WMI_BRIGHTNESS_MODE_MAX > -}; > - > -/** > - * enum wmi_brightness_source - Backlight brightness control source selection > - * @WMI_BRIGHTNESS_SOURCE_GPU: Backlight brightness is controlled by the GPU. > - * @WMI_BRIGHTNESS_SOURCE_EC: Backlight brightness is controlled by the > - * system's Embedded Controller (EC). > - * @WMI_BRIGHTNESS_SOURCE_AUX: Backlight brightness is controlled over the > - * DisplayPort AUX channel. > - */ > -enum wmi_brightness_source { > - WMI_BRIGHTNESS_SOURCE_GPU = 1, > - WMI_BRIGHTNESS_SOURCE_EC = 2, > - WMI_BRIGHTNESS_SOURCE_AUX = 3, > - WMI_BRIGHTNESS_SOURCE_MAX > -}; > - > -/** > - * struct wmi_brightness_args - arguments for the WMI-wrapped ACPI method > - * @mode: Pass in an &enum wmi_brightness_mode value to select between > - * getting or setting a value. > - * @val: In parameter for value to set when using %WMI_BRIGHTNESS_MODE_SET > - * mode. Not used in conjunction with %WMI_BRIGHTNESS_MODE_GET or > - * %WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL mode. > - * @ret: Out parameter returning retrieved value when operating in > - * %WMI_BRIGHTNESS_MODE_GET or %WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL > - * mode. Not used in %WMI_BRIGHTNESS_MODE_SET mode. > - * @ignored: Padding; not used. The ACPI method expects a 24 byte params struct. > - * > - * This is the parameters structure for the WmiBrightnessNotify ACPI method as > - * wrapped by WMI. The value passed in to @val or returned by @ret will be a > - * brightness value when the WMI method ID is %WMI_BRIGHTNESS_METHOD_LEVEL, or > - * an &enum wmi_brightness_source value with %WMI_BRIGHTNESS_METHOD_SOURCE. > - */ > -struct wmi_brightness_args { > - u32 mode; > - u32 val; > - u32 ret; > - u32 ignored[3]; > -}; > - > /** > * wmi_brightness_notify() - helper function for calling WMI-wrapped ACPI method > * @w: Pointer to the struct wmi_device identified by %WMI_BRIGHTNESS_GUID > @@ -191,8 +127,6 @@ static int nvidia_wmi_ec_backlight_probe(struct wmi_device *wdev, const void *ct > return PTR_ERR_OR_ZERO(bdev); > } > > -#define WMI_BRIGHTNESS_GUID "603E9613-EF25-4338-A3D0-C46177516DB7" > - > static const struct wmi_device_id nvidia_wmi_ec_backlight_id_table[] = { > { .guid_string = WMI_BRIGHTNESS_GUID }, > { } > diff --git a/include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h b/include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h > new file mode 100644 > index 000000000000..23d60130272c > --- /dev/null > +++ b/include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h > @@ -0,0 +1,76 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved. > + */ > + > +#ifndef __PLATFORM_DATA_X86_NVIDIA_WMI_EC_BACKLIGHT_H > +#define __PLATFORM_DATA_X86_NVIDIA_WMI_EC_BACKLIGHT_H > + > +#define WMI_BRIGHTNESS_GUID "603E9613-EF25-4338-A3D0-C46177516DB7" > + > +/** > + * enum wmi_brightness_method - WMI method IDs > + * @WMI_BRIGHTNESS_METHOD_LEVEL: Get/Set EC brightness level status > + * @WMI_BRIGHTNESS_METHOD_SOURCE: Get/Set EC Brightness Source > + */ > +enum wmi_brightness_method { > + WMI_BRIGHTNESS_METHOD_LEVEL = 1, > + WMI_BRIGHTNESS_METHOD_SOURCE = 2, > + WMI_BRIGHTNESS_METHOD_MAX > +}; > + > +/** > + * enum wmi_brightness_mode - Operation mode for WMI-wrapped method > + * @WMI_BRIGHTNESS_MODE_GET: Get the current brightness level/source. > + * @WMI_BRIGHTNESS_MODE_SET: Set the brightness level. > + * @WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL: Get the maximum brightness level. This > + * is only valid when the WMI method is > + * %WMI_BRIGHTNESS_METHOD_LEVEL. > + */ > +enum wmi_brightness_mode { > + WMI_BRIGHTNESS_MODE_GET = 0, > + WMI_BRIGHTNESS_MODE_SET = 1, > + WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL = 2, > + WMI_BRIGHTNESS_MODE_MAX > +}; > + > +/** > + * enum wmi_brightness_source - Backlight brightness control source selection > + * @WMI_BRIGHTNESS_SOURCE_GPU: Backlight brightness is controlled by the GPU. > + * @WMI_BRIGHTNESS_SOURCE_EC: Backlight brightness is controlled by the > + * system's Embedded Controller (EC). > + * @WMI_BRIGHTNESS_SOURCE_AUX: Backlight brightness is controlled over the > + * DisplayPort AUX channel. > + */ > +enum wmi_brightness_source { > + WMI_BRIGHTNESS_SOURCE_GPU = 1, > + WMI_BRIGHTNESS_SOURCE_EC = 2, > + WMI_BRIGHTNESS_SOURCE_AUX = 3, > + WMI_BRIGHTNESS_SOURCE_MAX > +}; > + > +/** > + * struct wmi_brightness_args - arguments for the WMI-wrapped ACPI method > + * @mode: Pass in an &enum wmi_brightness_mode value to select between > + * getting or setting a value. > + * @val: In parameter for value to set when using %WMI_BRIGHTNESS_MODE_SET > + * mode. Not used in conjunction with %WMI_BRIGHTNESS_MODE_GET or > + * %WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL mode. > + * @ret: Out parameter returning retrieved value when operating in > + * %WMI_BRIGHTNESS_MODE_GET or %WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL > + * mode. Not used in %WMI_BRIGHTNESS_MODE_SET mode. > + * @ignored: Padding; not used. The ACPI method expects a 24 byte params struct. > + * > + * This is the parameters structure for the WmiBrightnessNotify ACPI method as > + * wrapped by WMI. The value passed in to @val or returned by @ret will be a > + * brightness value when the WMI method ID is %WMI_BRIGHTNESS_METHOD_LEVEL, or > + * an &enum wmi_brightness_source value with %WMI_BRIGHTNESS_METHOD_SOURCE. > + */ > +struct wmi_brightness_args { > + u32 mode; > + u32 val; > + u32 ret; > + u32 ignored[3]; > +}; > + > +#endif
diff --git a/MAINTAINERS b/MAINTAINERS index 9d7f64dc0efe..d6f6b96f51f7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14527,6 +14527,7 @@ M: Daniel Dadap <ddadap@nvidia.com> L: platform-driver-x86@vger.kernel.org S: Supported F: drivers/platform/x86/nvidia-wmi-ec-backlight.c +F: include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h NVM EXPRESS DRIVER M: Keith Busch <kbusch@kernel.org> diff --git a/drivers/platform/x86/nvidia-wmi-ec-backlight.c b/drivers/platform/x86/nvidia-wmi-ec-backlight.c index 61e37194df70..be803e47eac0 100644 --- a/drivers/platform/x86/nvidia-wmi-ec-backlight.c +++ b/drivers/platform/x86/nvidia-wmi-ec-backlight.c @@ -7,74 +7,10 @@ #include <linux/backlight.h> #include <linux/mod_devicetable.h> #include <linux/module.h> +#include <linux/platform_data/x86/nvidia-wmi-ec-backlight.h> #include <linux/types.h> #include <linux/wmi.h> -/** - * enum wmi_brightness_method - WMI method IDs - * @WMI_BRIGHTNESS_METHOD_LEVEL: Get/Set EC brightness level status - * @WMI_BRIGHTNESS_METHOD_SOURCE: Get/Set EC Brightness Source - */ -enum wmi_brightness_method { - WMI_BRIGHTNESS_METHOD_LEVEL = 1, - WMI_BRIGHTNESS_METHOD_SOURCE = 2, - WMI_BRIGHTNESS_METHOD_MAX -}; - -/** - * enum wmi_brightness_mode - Operation mode for WMI-wrapped method - * @WMI_BRIGHTNESS_MODE_GET: Get the current brightness level/source. - * @WMI_BRIGHTNESS_MODE_SET: Set the brightness level. - * @WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL: Get the maximum brightness level. This - * is only valid when the WMI method is - * %WMI_BRIGHTNESS_METHOD_LEVEL. - */ -enum wmi_brightness_mode { - WMI_BRIGHTNESS_MODE_GET = 0, - WMI_BRIGHTNESS_MODE_SET = 1, - WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL = 2, - WMI_BRIGHTNESS_MODE_MAX -}; - -/** - * enum wmi_brightness_source - Backlight brightness control source selection - * @WMI_BRIGHTNESS_SOURCE_GPU: Backlight brightness is controlled by the GPU. - * @WMI_BRIGHTNESS_SOURCE_EC: Backlight brightness is controlled by the - * system's Embedded Controller (EC). - * @WMI_BRIGHTNESS_SOURCE_AUX: Backlight brightness is controlled over the - * DisplayPort AUX channel. - */ -enum wmi_brightness_source { - WMI_BRIGHTNESS_SOURCE_GPU = 1, - WMI_BRIGHTNESS_SOURCE_EC = 2, - WMI_BRIGHTNESS_SOURCE_AUX = 3, - WMI_BRIGHTNESS_SOURCE_MAX -}; - -/** - * struct wmi_brightness_args - arguments for the WMI-wrapped ACPI method - * @mode: Pass in an &enum wmi_brightness_mode value to select between - * getting or setting a value. - * @val: In parameter for value to set when using %WMI_BRIGHTNESS_MODE_SET - * mode. Not used in conjunction with %WMI_BRIGHTNESS_MODE_GET or - * %WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL mode. - * @ret: Out parameter returning retrieved value when operating in - * %WMI_BRIGHTNESS_MODE_GET or %WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL - * mode. Not used in %WMI_BRIGHTNESS_MODE_SET mode. - * @ignored: Padding; not used. The ACPI method expects a 24 byte params struct. - * - * This is the parameters structure for the WmiBrightnessNotify ACPI method as - * wrapped by WMI. The value passed in to @val or returned by @ret will be a - * brightness value when the WMI method ID is %WMI_BRIGHTNESS_METHOD_LEVEL, or - * an &enum wmi_brightness_source value with %WMI_BRIGHTNESS_METHOD_SOURCE. - */ -struct wmi_brightness_args { - u32 mode; - u32 val; - u32 ret; - u32 ignored[3]; -}; - /** * wmi_brightness_notify() - helper function for calling WMI-wrapped ACPI method * @w: Pointer to the struct wmi_device identified by %WMI_BRIGHTNESS_GUID @@ -191,8 +127,6 @@ static int nvidia_wmi_ec_backlight_probe(struct wmi_device *wdev, const void *ct return PTR_ERR_OR_ZERO(bdev); } -#define WMI_BRIGHTNESS_GUID "603E9613-EF25-4338-A3D0-C46177516DB7" - static const struct wmi_device_id nvidia_wmi_ec_backlight_id_table[] = { { .guid_string = WMI_BRIGHTNESS_GUID }, { } diff --git a/include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h b/include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h new file mode 100644 index 000000000000..23d60130272c --- /dev/null +++ b/include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h @@ -0,0 +1,76 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved. + */ + +#ifndef __PLATFORM_DATA_X86_NVIDIA_WMI_EC_BACKLIGHT_H +#define __PLATFORM_DATA_X86_NVIDIA_WMI_EC_BACKLIGHT_H + +#define WMI_BRIGHTNESS_GUID "603E9613-EF25-4338-A3D0-C46177516DB7" + +/** + * enum wmi_brightness_method - WMI method IDs + * @WMI_BRIGHTNESS_METHOD_LEVEL: Get/Set EC brightness level status + * @WMI_BRIGHTNESS_METHOD_SOURCE: Get/Set EC Brightness Source + */ +enum wmi_brightness_method { + WMI_BRIGHTNESS_METHOD_LEVEL = 1, + WMI_BRIGHTNESS_METHOD_SOURCE = 2, + WMI_BRIGHTNESS_METHOD_MAX +}; + +/** + * enum wmi_brightness_mode - Operation mode for WMI-wrapped method + * @WMI_BRIGHTNESS_MODE_GET: Get the current brightness level/source. + * @WMI_BRIGHTNESS_MODE_SET: Set the brightness level. + * @WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL: Get the maximum brightness level. This + * is only valid when the WMI method is + * %WMI_BRIGHTNESS_METHOD_LEVEL. + */ +enum wmi_brightness_mode { + WMI_BRIGHTNESS_MODE_GET = 0, + WMI_BRIGHTNESS_MODE_SET = 1, + WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL = 2, + WMI_BRIGHTNESS_MODE_MAX +}; + +/** + * enum wmi_brightness_source - Backlight brightness control source selection + * @WMI_BRIGHTNESS_SOURCE_GPU: Backlight brightness is controlled by the GPU. + * @WMI_BRIGHTNESS_SOURCE_EC: Backlight brightness is controlled by the + * system's Embedded Controller (EC). + * @WMI_BRIGHTNESS_SOURCE_AUX: Backlight brightness is controlled over the + * DisplayPort AUX channel. + */ +enum wmi_brightness_source { + WMI_BRIGHTNESS_SOURCE_GPU = 1, + WMI_BRIGHTNESS_SOURCE_EC = 2, + WMI_BRIGHTNESS_SOURCE_AUX = 3, + WMI_BRIGHTNESS_SOURCE_MAX +}; + +/** + * struct wmi_brightness_args - arguments for the WMI-wrapped ACPI method + * @mode: Pass in an &enum wmi_brightness_mode value to select between + * getting or setting a value. + * @val: In parameter for value to set when using %WMI_BRIGHTNESS_MODE_SET + * mode. Not used in conjunction with %WMI_BRIGHTNESS_MODE_GET or + * %WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL mode. + * @ret: Out parameter returning retrieved value when operating in + * %WMI_BRIGHTNESS_MODE_GET or %WMI_BRIGHTNESS_MODE_GET_MAX_LEVEL + * mode. Not used in %WMI_BRIGHTNESS_MODE_SET mode. + * @ignored: Padding; not used. The ACPI method expects a 24 byte params struct. + * + * This is the parameters structure for the WmiBrightnessNotify ACPI method as + * wrapped by WMI. The value passed in to @val or returned by @ret will be a + * brightness value when the WMI method ID is %WMI_BRIGHTNESS_METHOD_LEVEL, or + * an &enum wmi_brightness_source value with %WMI_BRIGHTNESS_METHOD_SOURCE. + */ +struct wmi_brightness_args { + u32 mode; + u32 val; + u32 ret; + u32 ignored[3]; +}; + +#endif
Move the WMI interface definitions to a header, so that the definitions can be shared with drivers/acpi/video_detect.c . Changes in v2: - Add missing Nvidia copyright header - Move WMI_BRIGHTNESS_GUID to nvidia-wmi-ec-backlight.h as well Suggested-by: Daniel Dadap <ddadap@nvidia.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- MAINTAINERS | 1 + .../platform/x86/nvidia-wmi-ec-backlight.c | 68 +---------------- .../x86/nvidia-wmi-ec-backlight.h | 76 +++++++++++++++++++ 3 files changed, 78 insertions(+), 67 deletions(-) create mode 100644 include/linux/platform_data/x86/nvidia-wmi-ec-backlight.h