From: Rajat Jain <rajatja@google.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Hans de Goede <hdegoede@redhat.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Benson Leung <bleung@chromium.org>,
Henrique de Moraes Holschuh <hmh@hmh.eng.br>,
Mark Gross <markgross@kernel.org>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
ibm-acpi-devel@lists.sourceforge.net,
platform-driver-x86@vger.kernel.org, gwendal@google.com,
seanpaul@google.com, marcheu@google.com, dtor@google.com,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Benson Leung <bleung@google.com>
Cc: Rajat Jain <rajatja@google.com>, rajatxjain@gmail.com
Subject: [PATCH v5 3/3] drm/privacy_screen_x86: Add entry for ChromeOS privacy-screen
Date: Fri, 7 Jan 2022 11:02:08 -0800 [thread overview]
Message-ID: <20220107190208.95479-3-rajatja@google.com> (raw)
In-Reply-To: <20220107190208.95479-1-rajatja@google.com>
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>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
v5: * Add Hans' "Reviewed by"
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)
--
2.34.1.575.g55b058a8bb-goog
next prev parent reply other threads:[~2022-01-07 19:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 19:02 [PATCH v5 1/3] drm/privacy_screen: Add drvdata in drm_privacy_screen Rajat Jain
2022-01-07 19:02 ` [PATCH v5 2/3] platform/chrome: Add driver for ChromeOS privacy-screen Rajat Jain
2022-01-07 19:09 ` Benson Leung
2022-01-07 19:09 ` Benson Leung
2022-01-07 19:02 ` Rajat Jain [this message]
2022-01-07 19:06 ` [PATCH v5 3/3] drm/privacy_screen_x86: Add entry " Benson Leung
2022-01-07 19:06 ` Benson Leung
2022-01-08 16:10 ` Hans de Goede
2022-01-08 16:10 ` Hans de Goede
2022-01-08 17:21 ` Rajat Jain
2022-01-08 17:21 ` Rajat Jain
2022-01-10 11:24 ` [PATCH v5 1/3] drm/privacy_screen: Add drvdata in drm_privacy_screen Hans de Goede
2022-01-10 19:12 ` Rajat Jain
2022-01-10 19:12 ` Rajat Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220107190208.95479-3-rajatja@google.com \
--to=rajatja@google.com \
--cc=airlied@linux.ie \
--cc=bleung@chromium.org \
--cc=bleung@google.com \
--cc=daniel@ffwll.ch \
--cc=dmitry.torokhov@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=dtor@google.com \
--cc=gwendal@google.com \
--cc=hdegoede@redhat.com \
--cc=hmh@hmh.eng.br \
--cc=ibm-acpi-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=marcheu@google.com \
--cc=markgross@kernel.org \
--cc=mripard@kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rajatxjain@gmail.com \
--cc=seanpaul@google.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.