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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9B21C433F5 for ; Sat, 8 Jan 2022 16:10:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229521AbiAHQKN (ORCPT ); Sat, 8 Jan 2022 11:10:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53088 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234628AbiAHQKM (ORCPT ); Sat, 8 Jan 2022 11:10:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641658212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZfgabDSS/gH6CDQ8l3rvCMIxMgihojIJUexXgrRTlE0=; b=N/+AlIDzKro2i40JRlfz0Cso6lYzMF0CopSByJ0vChCtnJ65fRGh0EW+1reEeHfnGLrMWQ hSct3F7Jk/Rg3eqpoLLthkQsEr+m8U+9k76GXkk8wX7/JvMdEznj8PcAGAsndaoV6nzBfi frCLvl4uFpyTSTTYFPIfHHDouyp6HrI= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-202-gLlIpigSPva-Bu53M4rB1g-1; Sat, 08 Jan 2022 11:10:10 -0500 X-MC-Unique: gLlIpigSPva-Bu53M4rB1g-1 Received: by mail-ed1-f72.google.com with SMTP id i5-20020a05640242c500b003f84839a8c3so6987558edc.6 for ; Sat, 08 Jan 2022 08:10:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=ZfgabDSS/gH6CDQ8l3rvCMIxMgihojIJUexXgrRTlE0=; b=hOLQhSPia1X49rf9ppmvV6vz8/fFMDDzJJaHs54f4fJ4gb2BgTaWhMMFgVxBBcHAAs XOEEKJnMW3Bz9GWjZoWH54vlv8YtvREHiOYoKsr4esWGtuDaJZYvRippxXlaHt9VXlEv icgpcEdrQkc4OrgGl54OOJx13oYbZpYRTwZ11Vp6nK0wPNBIzyqp9d2a6xrF2Ei57can CPVTMe2qNzWwpIL6B+UbiTgGc1AmbhmU/D4oBcfLtgfuoVEEvnDvzkcvctnsHt6+W/FA 2Rxi2w+nIGPh3NTiYjPdkA0Aa6MnSNjbVu65riYYuAY1sUV3FgBASlo8j4DLuaJNR39y 3XVQ== X-Gm-Message-State: AOAM533+W7L2VvaCfR1ZPaRGs8+Mr7dLJFq77ebcyx0CBgKyq8NryfIg rO1SmGCL9SjIFkreKXtCORlftmu5QfwbDog3+T5NJdi9vYxr8CLTAt/Kv6WypcF6AtXmxaATLTC xf414JJC7kYMGMfeqefi79+E1cpfmrpKXvA== X-Received: by 2002:a17:906:86cb:: with SMTP id j11mr10313298ejy.40.1641658209793; Sat, 08 Jan 2022 08:10:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzafHPA1hS1YxU4MAlmNDyZjL5mOgs//ZNBjd0fJXg2UApooAeaTTngtJ64hglQALtpKMzMrA== X-Received: by 2002:a17:906:86cb:: with SMTP id j11mr10313276ejy.40.1641658209573; Sat, 08 Jan 2022 08:10:09 -0800 (PST) Received: from ?IPV6:2001:1c00:c1e:bf00:1db8:22d3:1bc9:8ca1? (2001-1c00-0c1e-bf00-1db8-22d3-1bc9-8ca1.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:1db8:22d3:1bc9:8ca1]) by smtp.gmail.com with ESMTPSA id r3sm619371ejr.79.2022.01.08.08.10.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 08 Jan 2022 08:10:09 -0800 (PST) Message-ID: Date: Sat, 8 Jan 2022 17:10:08 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [PATCH v5 3/3] drm/privacy_screen_x86: Add entry for ChromeOS privacy-screen Content-Language: en-US To: Benson Leung , Rajat Jain Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Benson Leung , Henrique de Moraes Holschuh , Mark Gross , 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 , rajatxjain@gmail.com References: <20220107190208.95479-1-rajatja@google.com> <20220107190208.95479-3-rajatja@google.com> From: Hans de Goede In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Hi All, On 1/7/22 20:06, Benson Leung wrote: > Hi Rajat, > > Thanks for your changes here. > > On Fri, Jan 07, 2022 at 11:02:08AM -0800, 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 >> Reviewed-by: Hans de Goede > > Hi Hans, > > Since this change depends on the privacy screen changes staged for v5.17, > I'm OK as platform/chrome maintainer to have this go through the drm tree. > > Acked-By: Benson Leung Ok, I will merge this into drm-misc-next coming Monday. Note I'm afraid that it is too late for 5.17, the drm-misc maintainers have already created the final drm-misc tag for the 5.17 pull-req. Regards, Hans > > >> --- >> 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 >> >