From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68845C433F5 for ; Thu, 16 Sep 2021 08:51:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 351A360F25 for ; Thu, 16 Sep 2021 08:51:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 351A360F25 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9DB526EB13; Thu, 16 Sep 2021 08:51:39 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 42AE96E3F7; Thu, 16 Sep 2021 08:51:38 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10108"; a="209609621" X-IronPort-AV: E=Sophos;i="5.85,297,1624345200"; d="scan'208";a="209609621" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2021 01:51:37 -0700 X-IronPort-AV: E=Sophos;i="5.85,297,1624345200"; d="scan'208";a="545444144" Received: from djustese-mobl.ger.corp.intel.com (HELO localhost) ([10.249.34.120]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2021 01:51:11 -0700 From: Jani Nikula To: Hans de Goede , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rajat Jain , Lyude , Joonas Lahtinen , Rodrigo Vivi , Mark Gross , Andy Shevchenko Cc: Hans de Goede , Daniel Vetter , David Airlie , Pekka Paalanen , Mario Limonciello , Mark Pearson , Sebastien Bacher , Marco Trevisan , Emil Velikov , intel-gfx , dri-devel@lists.freedesktop.org, platform-driver-x86@vger.kernel.org In-Reply-To: <20210906073519.4615-4-hdegoede@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210906073519.4615-1-hdegoede@redhat.com> <20210906073519.4615-4-hdegoede@redhat.com> Date: Thu, 16 Sep 2021 11:51:08 +0300 Message-ID: <87v930x5s3.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH 3/9] drm/privacy-screen: Add X86 specific arch init code X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, 06 Sep 2021, Hans de Goede wrote: > Add X86 specific arch init code, which fills the privacy-screen lookup > table by checking for various vendor specific ACPI interfaces for > controlling the privacy-screen. > > This initial version only checks for the Lenovo Thinkpad specific ACPI > methods for privacy-screen control. > > Reviewed-by: Emil Velikov > Signed-off-by: Hans de Goede > --- > drivers/gpu/drm/Makefile | 2 +- > drivers/gpu/drm/drm_privacy_screen_x86.c | 86 ++++++++++++++++++++++++ > include/drm/drm_privacy_screen_machine.h | 5 ++ > 3 files changed, 92 insertions(+), 1 deletion(-) > create mode 100644 drivers/gpu/drm/drm_privacy_screen_x86.c > > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index 788fc37096f6..12997ca5670d 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -32,7 +32,7 @@ drm-$(CONFIG_OF) += drm_of.o > drm-$(CONFIG_PCI) += drm_pci.o > drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o > drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o > -drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o > +drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o drm_privacy_screen_x86.o Would be nice to avoid building drm_privacy_screen_x86.o altogether for CONFIG_X86=n, and avoid... > > obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o > > diff --git a/drivers/gpu/drm/drm_privacy_screen_x86.c b/drivers/gpu/drm/drm_privacy_screen_x86.c > new file mode 100644 > index 000000000000..a2cafb294ca6 > --- /dev/null > +++ b/drivers/gpu/drm/drm_privacy_screen_x86.c > @@ -0,0 +1,86 @@ > +// SPDX-License-Identifier: MIT > +/* > + * Copyright (C) 2020 Red Hat, Inc. > + * > + * Authors: > + * Hans de Goede > + */ > + > +#include > +#include > + > +#ifdef CONFIG_X86 ...ifdefs that cover the entire file. This can be a future improvement, though. > +static struct drm_privacy_screen_lookup arch_lookup; > + > +struct arch_init_data { > + struct drm_privacy_screen_lookup lookup; > + bool (*detect)(void); > +}; > + > +#if IS_ENABLED(CONFIG_THINKPAD_ACPI) > +static acpi_status __init acpi_set_handle(acpi_handle handle, u32 level, > + void *context, void **return_value) > +{ > + *(acpi_handle *)return_value = handle; > + return AE_CTRL_TERMINATE; > +} > + > +static bool __init detect_thinkpad_privacy_screen(void) > +{ > + union acpi_object obj = { .type = ACPI_TYPE_INTEGER }; > + struct acpi_object_list args = { .count = 1, .pointer = &obj, }; > + acpi_handle ec_handle = NULL; > + unsigned long long output; > + acpi_status status; > + > + /* Get embedded-controller handle */ > + status = acpi_get_devices("PNP0C09", acpi_set_handle, NULL, &ec_handle); > + if (ACPI_FAILURE(status) || !ec_handle) > + return false; > + > + /* And call the privacy-screen get-status method */ > + status = acpi_evaluate_integer(ec_handle, "HKEY.GSSS", &args, &output); > + if (ACPI_FAILURE(status)) > + return false; > + > + return (output & 0x10000) ? true : false; > +} > +#endif > + > +static const struct arch_init_data arch_init_data[] __initconst = { > +#if IS_ENABLED(CONFIG_THINKPAD_ACPI) > + { > + .lookup = { > + .dev_id = NULL, > + .con_id = NULL, > + .provider = "privacy_screen-thinkpad_acpi", > + }, > + .detect = detect_thinkpad_privacy_screen, > + }, > +#endif > +}; > + > +void __init drm_privacy_screen_lookup_init(void) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(arch_init_data); i++) { > + if (!arch_init_data[i].detect()) > + continue; > + > + pr_info("Found '%s' privacy-screen provider\n", > + arch_init_data[i].lookup.provider); > + > + /* Make a copy because arch_init_data is __initconst */ > + arch_lookup = arch_init_data[i].lookup; > + drm_privacy_screen_lookup_add(&arch_lookup); > + break; > + } > +} > + > +void drm_privacy_screen_lookup_exit(void) > +{ > + if (arch_lookup.provider) > + drm_privacy_screen_lookup_remove(&arch_lookup); > +} > +#endif /* ifdef CONFIG_X86 */ > diff --git a/include/drm/drm_privacy_screen_machine.h b/include/drm/drm_privacy_screen_machine.h > index aaa0d38cce92..02e5371904d3 100644 > --- a/include/drm/drm_privacy_screen_machine.h > +++ b/include/drm/drm_privacy_screen_machine.h > @@ -31,11 +31,16 @@ struct drm_privacy_screen_lookup { > void drm_privacy_screen_lookup_add(struct drm_privacy_screen_lookup *lookup); > void drm_privacy_screen_lookup_remove(struct drm_privacy_screen_lookup *lookup); > > +#if IS_ENABLED(CONFIG_DRM_PRIVACY_SCREEN) && IS_ENABLED(CONFIG_X86) > +void drm_privacy_screen_lookup_init(void); > +void drm_privacy_screen_lookup_exit(void); > +#else > static inline void drm_privacy_screen_lookup_init(void) > { > } > static inline void drm_privacy_screen_lookup_exit(void) > { > } > +#endif > > #endif -- Jani Nikula, Intel Open Source Graphics Center From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46796C433EF for ; Thu, 16 Sep 2021 08:51:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C77060F25 for ; Thu, 16 Sep 2021 08:51:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235141AbhIPIxG (ORCPT ); Thu, 16 Sep 2021 04:53:06 -0400 Received: from mga01.intel.com ([192.55.52.88]:13284 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234268AbhIPIxG (ORCPT ); Thu, 16 Sep 2021 04:53:06 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10108"; a="244894422" X-IronPort-AV: E=Sophos;i="5.85,297,1624345200"; d="scan'208";a="244894422" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2021 01:51:36 -0700 X-IronPort-AV: E=Sophos;i="5.85,297,1624345200"; d="scan'208";a="545444144" Received: from djustese-mobl.ger.corp.intel.com (HELO localhost) ([10.249.34.120]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2021 01:51:11 -0700 From: Jani Nikula To: Hans de Goede , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rajat Jain , Lyude , Joonas Lahtinen , Rodrigo Vivi , Mark Gross , Andy Shevchenko Cc: Hans de Goede , Daniel Vetter , David Airlie , Pekka Paalanen , Mario Limonciello , Mark Pearson , Sebastien Bacher , Marco Trevisan , Emil Velikov , intel-gfx , dri-devel@lists.freedesktop.org, platform-driver-x86@vger.kernel.org Subject: Re: [PATCH 3/9] drm/privacy-screen: Add X86 specific arch init code In-Reply-To: <20210906073519.4615-4-hdegoede@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210906073519.4615-1-hdegoede@redhat.com> <20210906073519.4615-4-hdegoede@redhat.com> Date: Thu, 16 Sep 2021 11:51:08 +0300 Message-ID: <87v930x5s3.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org On Mon, 06 Sep 2021, Hans de Goede wrote: > Add X86 specific arch init code, which fills the privacy-screen lookup > table by checking for various vendor specific ACPI interfaces for > controlling the privacy-screen. > > This initial version only checks for the Lenovo Thinkpad specific ACPI > methods for privacy-screen control. > > Reviewed-by: Emil Velikov > Signed-off-by: Hans de Goede > --- > drivers/gpu/drm/Makefile | 2 +- > drivers/gpu/drm/drm_privacy_screen_x86.c | 86 ++++++++++++++++++++++++ > include/drm/drm_privacy_screen_machine.h | 5 ++ > 3 files changed, 92 insertions(+), 1 deletion(-) > create mode 100644 drivers/gpu/drm/drm_privacy_screen_x86.c > > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index 788fc37096f6..12997ca5670d 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -32,7 +32,7 @@ drm-$(CONFIG_OF) += drm_of.o > drm-$(CONFIG_PCI) += drm_pci.o > drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o > drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o > -drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o > +drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o drm_privacy_screen_x86.o Would be nice to avoid building drm_privacy_screen_x86.o altogether for CONFIG_X86=n, and avoid... > > obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o > > diff --git a/drivers/gpu/drm/drm_privacy_screen_x86.c b/drivers/gpu/drm/drm_privacy_screen_x86.c > new file mode 100644 > index 000000000000..a2cafb294ca6 > --- /dev/null > +++ b/drivers/gpu/drm/drm_privacy_screen_x86.c > @@ -0,0 +1,86 @@ > +// SPDX-License-Identifier: MIT > +/* > + * Copyright (C) 2020 Red Hat, Inc. > + * > + * Authors: > + * Hans de Goede > + */ > + > +#include > +#include > + > +#ifdef CONFIG_X86 ...ifdefs that cover the entire file. This can be a future improvement, though. > +static struct drm_privacy_screen_lookup arch_lookup; > + > +struct arch_init_data { > + struct drm_privacy_screen_lookup lookup; > + bool (*detect)(void); > +}; > + > +#if IS_ENABLED(CONFIG_THINKPAD_ACPI) > +static acpi_status __init acpi_set_handle(acpi_handle handle, u32 level, > + void *context, void **return_value) > +{ > + *(acpi_handle *)return_value = handle; > + return AE_CTRL_TERMINATE; > +} > + > +static bool __init detect_thinkpad_privacy_screen(void) > +{ > + union acpi_object obj = { .type = ACPI_TYPE_INTEGER }; > + struct acpi_object_list args = { .count = 1, .pointer = &obj, }; > + acpi_handle ec_handle = NULL; > + unsigned long long output; > + acpi_status status; > + > + /* Get embedded-controller handle */ > + status = acpi_get_devices("PNP0C09", acpi_set_handle, NULL, &ec_handle); > + if (ACPI_FAILURE(status) || !ec_handle) > + return false; > + > + /* And call the privacy-screen get-status method */ > + status = acpi_evaluate_integer(ec_handle, "HKEY.GSSS", &args, &output); > + if (ACPI_FAILURE(status)) > + return false; > + > + return (output & 0x10000) ? true : false; > +} > +#endif > + > +static const struct arch_init_data arch_init_data[] __initconst = { > +#if IS_ENABLED(CONFIG_THINKPAD_ACPI) > + { > + .lookup = { > + .dev_id = NULL, > + .con_id = NULL, > + .provider = "privacy_screen-thinkpad_acpi", > + }, > + .detect = detect_thinkpad_privacy_screen, > + }, > +#endif > +}; > + > +void __init drm_privacy_screen_lookup_init(void) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(arch_init_data); i++) { > + if (!arch_init_data[i].detect()) > + continue; > + > + pr_info("Found '%s' privacy-screen provider\n", > + arch_init_data[i].lookup.provider); > + > + /* Make a copy because arch_init_data is __initconst */ > + arch_lookup = arch_init_data[i].lookup; > + drm_privacy_screen_lookup_add(&arch_lookup); > + break; > + } > +} > + > +void drm_privacy_screen_lookup_exit(void) > +{ > + if (arch_lookup.provider) > + drm_privacy_screen_lookup_remove(&arch_lookup); > +} > +#endif /* ifdef CONFIG_X86 */ > diff --git a/include/drm/drm_privacy_screen_machine.h b/include/drm/drm_privacy_screen_machine.h > index aaa0d38cce92..02e5371904d3 100644 > --- a/include/drm/drm_privacy_screen_machine.h > +++ b/include/drm/drm_privacy_screen_machine.h > @@ -31,11 +31,16 @@ struct drm_privacy_screen_lookup { > void drm_privacy_screen_lookup_add(struct drm_privacy_screen_lookup *lookup); > void drm_privacy_screen_lookup_remove(struct drm_privacy_screen_lookup *lookup); > > +#if IS_ENABLED(CONFIG_DRM_PRIVACY_SCREEN) && IS_ENABLED(CONFIG_X86) > +void drm_privacy_screen_lookup_init(void); > +void drm_privacy_screen_lookup_exit(void); > +#else > static inline void drm_privacy_screen_lookup_init(void) > { > } > static inline void drm_privacy_screen_lookup_exit(void) > { > } > +#endif > > #endif -- Jani Nikula, Intel Open Source Graphics Center