| Message ID | 20211222001127.3337471-3-rajatja@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4,1/3] drm/privacy_screen: Add drvdata in drm_privacy_screen | expand |
Hi, On 12/22/21 01:11, Rajat Jain wrote: > Add a static entry in the x86 table, to detect and wait for > privacy-screen on some ChromeOS platforms. > > Please note that this means that if CONFIG_CHROMEOS_PRIVACY_SCREEN is > enabled, and if "GOOG0010" device is found in ACPI, then the i915 probe > shall return EPROBE_DEFER until a platform driver actually registers the > privacy-screen: https://hansdegoede.livejournal.com/25948.html > > Signed-off-by: Rajat Jain <rajatja@google.com> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > v4: * Simplify the detect_chromeos_privacy_screen() function > * Don't change the existing print statement > v3: * Remove the pr_info() from detect_chromeos_privacy_screen(), instead > enhance the one already present in drm_privacy_screen_lookup_init() > v2: * Use #if instead of #elif > * Reorder the patches in the series. > * Rebased on drm-tip > > drivers/gpu/drm/drm_privacy_screen_x86.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/gpu/drm/drm_privacy_screen_x86.c b/drivers/gpu/drm/drm_privacy_screen_x86.c > index a2cafb294ca6..88802cd7a1ee 100644 > --- a/drivers/gpu/drm/drm_privacy_screen_x86.c > +++ b/drivers/gpu/drm/drm_privacy_screen_x86.c > @@ -47,6 +47,13 @@ static bool __init detect_thinkpad_privacy_screen(void) > } > #endif > > +#if IS_ENABLED(CONFIG_CHROMEOS_PRIVACY_SCREEN) > +static bool __init detect_chromeos_privacy_screen(void) > +{ > + return acpi_dev_present("GOOG0010", NULL, -1); > +} > +#endif > + > static const struct arch_init_data arch_init_data[] __initconst = { > #if IS_ENABLED(CONFIG_THINKPAD_ACPI) > { > @@ -58,6 +65,16 @@ static const struct arch_init_data arch_init_data[] __initconst = { > .detect = detect_thinkpad_privacy_screen, > }, > #endif > +#if IS_ENABLED(CONFIG_CHROMEOS_PRIVACY_SCREEN) > + { > + .lookup = { > + .dev_id = NULL, > + .con_id = NULL, > + .provider = "privacy_screen-GOOG0010:00", > + }, > + .detect = detect_chromeos_privacy_screen, > + }, > +#endif > }; > > void __init drm_privacy_screen_lookup_init(void) >
diff --git a/drivers/gpu/drm/drm_privacy_screen_x86.c b/drivers/gpu/drm/drm_privacy_screen_x86.c index a2cafb294ca6..88802cd7a1ee 100644 --- a/drivers/gpu/drm/drm_privacy_screen_x86.c +++ b/drivers/gpu/drm/drm_privacy_screen_x86.c @@ -47,6 +47,13 @@ static bool __init detect_thinkpad_privacy_screen(void) } #endif +#if IS_ENABLED(CONFIG_CHROMEOS_PRIVACY_SCREEN) +static bool __init detect_chromeos_privacy_screen(void) +{ + return acpi_dev_present("GOOG0010", NULL, -1); +} +#endif + static const struct arch_init_data arch_init_data[] __initconst = { #if IS_ENABLED(CONFIG_THINKPAD_ACPI) { @@ -58,6 +65,16 @@ static const struct arch_init_data arch_init_data[] __initconst = { .detect = detect_thinkpad_privacy_screen, }, #endif +#if IS_ENABLED(CONFIG_CHROMEOS_PRIVACY_SCREEN) + { + .lookup = { + .dev_id = NULL, + .con_id = NULL, + .provider = "privacy_screen-GOOG0010:00", + }, + .detect = detect_chromeos_privacy_screen, + }, +#endif }; void __init drm_privacy_screen_lookup_init(void)
Add a static entry in the x86 table, to detect and wait for privacy-screen on some ChromeOS platforms. Please note that this means that if CONFIG_CHROMEOS_PRIVACY_SCREEN is enabled, and if "GOOG0010" device is found in ACPI, then the i915 probe shall return EPROBE_DEFER until a platform driver actually registers the privacy-screen: https://hansdegoede.livejournal.com/25948.html Signed-off-by: Rajat Jain <rajatja@google.com> --- v4: * Simplify the detect_chromeos_privacy_screen() function * Don't change the existing print statement v3: * Remove the pr_info() from detect_chromeos_privacy_screen(), instead enhance the one already present in drm_privacy_screen_lookup_init() v2: * Use #if instead of #elif * Reorder the patches in the series. * Rebased on drm-tip drivers/gpu/drm/drm_privacy_screen_x86.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)