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=-8.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 3496CC2D0F8 for ; Tue, 12 May 2020 21:30:23 +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 079CD20740 for ; Tue, 12 May 2020 21:30:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FrJyQ8UL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 079CD20740 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7064B6E9BA; Tue, 12 May 2020 21:30:22 +0000 (UTC) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3E5046E9BA for ; Tue, 12 May 2020 21:30:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589319019; 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=s2GcklFKStNYTB0X3tq/jy/sL1G7okN2msxZqoCO4u0=; b=FrJyQ8ULSgUqTnPKG3deWd7k2iJaRkgIxO8HGVyl8og4NcYphfnEEtQdA7A5Q2ZKEfgjBW A0QDq2Yt2rRSHe587FI+R8Vt+Dq16sy7ks970Npd30CqN0FSlo3ijYbPNA0xk0z6ONzXeM ppdITWzm+a/nd80Am5YKd3iNGp/0B8g= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-114-Cd5wxUx4No2BT0i7g81G9Q-1; Tue, 12 May 2020 17:30:18 -0400 X-MC-Unique: Cd5wxUx4No2BT0i7g81G9Q-1 Received: by mail-wm1-f69.google.com with SMTP id 23so2398195wma.8 for ; Tue, 12 May 2020 14:30:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=s2GcklFKStNYTB0X3tq/jy/sL1G7okN2msxZqoCO4u0=; b=KcQbCHeONAlPb7j/jd3xK5+Gh6I0c1JdSbSjatd0QvOwVBr5jDEFBXyUc5MDTOrY8T KZrP3685L7RECau/XatZcWj3J7RbmxSv02BAwuDdOQAnGJt2MVbbZstaMVLrcjya7/iv ijMLgFq99GPVlpncBNxMLanGm+muAEMR7ofDvy6oxXTpxSfH7rRZ3tIfBORquiFdeHcr VDpeiltwAHCU+txGkLf/py0/evqJovo8N7oJt+99QLMpV6Ddm3cE7lphpiRAekqoN8av t2iA7f2AM90o7Rhr+0NCEMVH3B3qs8WEZgXITiXBGHJV2z8gNHXFbJt47YujxzHfxEZa 9z1A== X-Gm-Message-State: AGi0PuYWT43NPXJBUf5Wv308RZ7ht2l3jZTV5GfgCo5gydtWicHJRhfL IMmo5eWYXtP5pze66Db8pZdjEfNwK0en65+nTSSUKU4wBtcO16nFHn2q+5rWdRJb7YvzRTGB5Fu ivi8zNgHxVXlJCtybaPEp5pEuw2vy X-Received: by 2002:a5d:60c3:: with SMTP id x3mr8682408wrt.48.1589319016607; Tue, 12 May 2020 14:30:16 -0700 (PDT) X-Google-Smtp-Source: APiQypJ11CRh/xnXuRW3jzZDJPEBLeEiUKTkxZ3lF0eMQZJ2bg+h27QkAWTuUl4Nu8Ck1j+hXCtlug== X-Received: by 2002:a5d:60c3:: with SMTP id x3mr8682387wrt.48.1589319016356; Tue, 12 May 2020 14:30:16 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c0c-fe00-d2ea-f29d-118b-24dc.cable.dynamic.v6.ziggo.nl. [2001:1c00:c0c:fe00:d2ea:f29d:118b:24dc]) by smtp.gmail.com with ESMTPSA id v205sm15684600wmg.11.2020.05.12.14.30.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2020 14:30:15 -0700 (PDT) Subject: Re: [RFC v2] drm/connector: Add support for privacy-screen properties (v2) To: Mario.Limonciello@dell.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, daniel@ffwll.ch, airlied@linux.ie, rajatja@google.com, jani.nikula@linux.intel.com References: <20200511174724.21512-1-hdegoede@redhat.com> <20200511174724.21512-2-hdegoede@redhat.com> <64cb58c2e5254b4c8f539cecd6953090@AUSX13MPC105.AMER.DELL.COM> From: Hans de Goede Message-ID: <36769872-16ac-4eb4-e383-11b175874ea2@redhat.com> Date: Tue, 12 May 2020 23:30:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <64cb58c2e5254b4c8f539cecd6953090@AUSX13MPC105.AMER.DELL.COM> Content-Language: en-US X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, Sonny.Quintanilla@dell.com, jaredz@redhat.com, mpearson@lenovo.com Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, On 5/12/20 10:44 PM, Mario.Limonciello@dell.com wrote: >> -----Original Message----- >> From: Hans de Goede >> Sent: Monday, May 11, 2020 12:47 PM >> To: Maarten Lankhorst; Maxime Ripard; Thomas Zimmermann; Daniel Vetter; David >> Airlie; Rajat Jain; Jani Nikula >> Cc: Hans de Goede; Pekka Paalanen; Limonciello, Mario; Quintanilla, Sonny; >> Jared Dominguez; Mark Pearson; dri-devel@lists.freedesktop.org >> Subject: [RFC v2] drm/connector: Add support for privacy-screen properties >> (v2) >> >> >> [EXTERNAL EMAIL] >> >> From: Rajat Jain >> >> Add support for generic electronic privacy screen properties, that >> can be added by systems that have an integrated EPS. >> >> Changes in v2 (Hans de Goede) >> - Create 2 properties, "privacy-screen sw-state" and >> "privacy-screen hw-state", to deal with devices where the OS might be >> locked out of making state changes >> - Write kerneldoc explaining how the 2 properties work together, what >> happens when changes to the state are made outside of the DRM code's >> control, etc. >> >> Signed-off-by: Rajat Jain >> Co-authored-by: Hans de Goede >> Signed-off-by: Hans de Goede >> --- >> Documentation/gpu/drm-kms.rst | 2 + >> drivers/gpu/drm/drm_atomic_uapi.c | 6 ++ >> drivers/gpu/drm/drm_connector.c | 100 ++++++++++++++++++++++++++++++ >> include/drm/drm_connector.h | 50 +++++++++++++++ >> 4 files changed, 158 insertions(+) >> >> diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst >> index 906771e03103..b72b1e0db343 100644 >> --- a/Documentation/gpu/drm-kms.rst >> +++ b/Documentation/gpu/drm-kms.rst >> @@ -445,6 +445,8 @@ Property Types and Blob Property Support >> .. kernel-doc:: drivers/gpu/drm/drm_property.c >> :export: >> >> +.. _standard_connector_properties: >> + >> Standard Connector Properties >> ----------------------------- >> >> diff --git a/drivers/gpu/drm/drm_atomic_uapi.c >> b/drivers/gpu/drm/drm_atomic_uapi.c >> index a1e5e262bae2..e56a11208515 100644 >> --- a/drivers/gpu/drm/drm_atomic_uapi.c >> +++ b/drivers/gpu/drm/drm_atomic_uapi.c >> @@ -766,6 +766,8 @@ static int drm_atomic_connector_set_property(struct >> drm_connector *connector, >> fence_ptr); >> } else if (property == connector->max_bpc_property) { >> state->max_requested_bpc = val; >> + } else if (property == connector->privacy_screen_sw_state_property) { >> + state->privacy_screen_sw_state = val; >> } else if (connector->funcs->atomic_set_property) { >> return connector->funcs->atomic_set_property(connector, >> state, property, val); >> @@ -842,6 +844,10 @@ drm_atomic_connector_get_property(struct drm_connector >> *connector, >> *val = 0; >> } else if (property == connector->max_bpc_property) { >> *val = state->max_requested_bpc; >> + } else if (property == connector->privacy_screen_sw_state_property) { >> + *val = state->privacy_screen_sw_state; >> + } else if (property == connector->privacy_screen_hw_state_property) { >> + *val = state->privacy_screen_hw_state; >> } else if (connector->funcs->atomic_get_property) { >> return connector->funcs->atomic_get_property(connector, >> state, property, val); >> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c >> index 644f0ad10671..01360edc2376 100644 >> --- a/drivers/gpu/drm/drm_connector.c >> +++ b/drivers/gpu/drm/drm_connector.c >> @@ -1186,6 +1186,45 @@ static const struct drm_prop_enum_list dp_colorspaces[] >> = { >> * can also expose this property to external outputs, in which case they >> * must support "None", which should be the default (since external screens >> * have a built-in scaler). >> + * >> + * privacy-screen sw-state, privacy-screen hw-state: >> + * These 2 optional properties can be used to query the state of the >> + * electronic privacy screen that is available on some displays; and in >> + * some cases also control the state. If a driver implements these >> + * properties then both properties must be present. >> + * >> + * "privacy-screen hw-state" is read-only and reflects the actual state >> + * of the privacy-screen, possible values: "Enabled", "Disabled, >> + * "Enabled, locked", "Disabled, locked". The locked states indicate >> + * that the state cannot be changed through the DRM API. E.g. there >> + * might be devices where the firmware-setup options, or a hardware >> + * slider-switch, offer always on / off modes. >> + * >> + * "privacy-screen sw-state" can be set to change the privacy-screen state >> + * when not locked. In this case the driver must update the hw-state >> + * property to reflect the new state on completion of the commit of the >> + * sw-state property. Setting the sw-state property when the hw-state is >> + * locked must be interpreted by the driver as a request to change the >> + * state to the set state when the hw-state becomes unlocked. E.g. if >> + * "privacy-screen hw-state" is "Enabled, locked" and the sw-state >> + * gets set to "Disabled" followed by the user unlocking the state by >> + * changing the slider-switch position, then the driver must set the >> + * state to "Disabled" upon receiving the unlock event. >> + * >> + * In some cases the privacy-screen state might change outside of control >> + * of the DRM code. E.g. there might be a firmware handled hotkey which >> + * toggles the state, or the state might be changed through another >> + * userspace API such as writing /proc/acpi/ibm/lcdshadow. In this case >> + * the driver must update both the hw-state and the sw-state to reflect >> + * the new value, overwriting any pending state requests in the sw-state. >> + * >> + * Note that the ability for the state to change outside of control of >> + * the DRM master process means that userspace must not cache the value >> + * of the sw-state. Ccaching the sw-state value and including it in later >> + * atomic commits may lead to overriding a state change done through e.g. >> + * a firmware handled hotkey. Therefor userspace must not include the >> + * privacy-screen sw-state in an atomic commit unless it wants to change >> + * its value. >> */ >> >> int drm_connector_create_standard_properties(struct drm_device *dev) >> @@ -2152,6 +2191,67 @@ int drm_connector_set_panel_orientation_with_quirk( >> } >> EXPORT_SYMBOL(drm_connector_set_panel_orientation_with_quirk); >> >> +static const struct drm_prop_enum_list privacy_screen_enum[] = { >> + { PRIVACY_SCREEN_DISABLED, "Disabled" }, >> + { PRIVACY_SCREEN_ENABLED, "Enabled" }, >> + { PRIVACY_SCREEN_DISABLED_LOCKED, "Disabled, locked" }, >> + { PRIVACY_SCREEN_ENABLED_LOCKED, "Enabled, locked" }, >> +}; >> + >> +/** >> + * drm_connector_create_privacy_screen_properties - >> + * create the drm connecter's privacy-screen properties. >> + * @connector: connector for which to create the privacy-screen properties >> + * >> + * This function creates the "privacy-screen sw-state" and "privacy-screen >> + * hw-state" properties for the connector. They are not attached. >> + */ >> +void >> +drm_connector_create_privacy_screen_properties(struct drm_connector >> *connector) >> +{ >> + if (connector->privacy_screen_sw_state_property) >> + return; >> + >> + /* Note sw-state only supports the first 2 values of the enum */ >> + connector->privacy_screen_sw_state_property = >> + drm_property_create_enum(connector->dev, DRM_MODE_PROP_ENUM, >> + "privacy-screen sw-state", >> + privacy_screen_enum, 2); >> + >> + connector->privacy_screen_hw_state_property = >> + drm_property_create_enum(connector->dev, >> + DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_ENUM, >> + "privacy-screen hw-state", >> + privacy_screen_enum, >> + ARRAY_SIZE(privacy_screen_enum)); >> +} >> +EXPORT_SYMBOL(drm_connector_create_privacy_screen_properties); >> + >> +/** >> + * drm_connector_attach_privacy_screen_properties - >> + * attach the drm connecter's privacy-screen properties. >> + * @connector: connector on which to attach the privacy-screen properties >> + * >> + * This function attaches the "privacy-screen sw-state" and "privacy-screen >> + * hw-state" properties to the connector. The initial state of both is set >> + * to "Disabled". >> + */ >> +void >> +drm_connector_attach_privacy_screen_properties(struct drm_connector >> *connector) >> +{ >> + if (!connector->privacy_screen_sw_state_property) >> + return; >> + >> + drm_object_attach_property(&connector->base, >> + connector->privacy_screen_sw_state_property, >> + PRIVACY_SCREEN_DISABLED); >> + >> + drm_object_attach_property(&connector->base, >> + connector->privacy_screen_hw_state_property, >> + PRIVACY_SCREEN_DISABLED); >> +} >> +EXPORT_SYMBOL(drm_connector_attach_privacy_screen_properties); >> + >> int drm_connector_set_obj_prop(struct drm_mode_object *obj, >> struct drm_property *property, >> uint64_t value) >> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h >> index 19ae6bb5c85b..a8844f4c6ae9 100644 >> --- a/include/drm/drm_connector.h >> +++ b/include/drm/drm_connector.h >> @@ -271,6 +271,30 @@ struct drm_monitor_range_info { >> u8 max_vfreq; >> }; >> >> +/** >> + * enum drm_privacy_screen_status - privacy screen status >> + * >> + * This enum is used to track and control the state of the integrated privacy >> + * screen present on some display panels, via the "privacy-screen sw-state" >> + * and "privacy-screen hw-state" properties. Note the _LOCKED enum values >> + * are only valid for the "privacy-screen hw-state" property. >> + * >> + * @PRIVACY_SCREEN_DISABLED: >> + * The privacy-screen on the panel is disabled >> + * @PRIVACY_SCREEN_ENABLED: >> + * The privacy-screen on the panel is enabled >> + * @PRIVACY_SCREEN_DISABLED_LOCKED: >> + * The privacy-screen on the panel is disabled and locked (cannot be >> changed) >> + * @PRIVACY_SCREEN_ENABLED_LOCKED: >> + * The privacy-screen on the panel is enabled and locked (cannot be changed) >> + */ >> +enum drm_privacy_screen_status { >> + PRIVACY_SCREEN_DISABLED = 0, >> + PRIVACY_SCREEN_ENABLED, >> + PRIVACY_SCREEN_DISABLED_LOCKED, >> + PRIVACY_SCREEN_ENABLED_LOCKED, >> +}; >> + >> /* >> * This is a consolidated colorimetry list supported by HDMI and >> * DP protocol standard. The respective connectors will register >> @@ -686,6 +710,18 @@ struct drm_connector_state { >> */ >> u8 max_bpc; >> >> + /** >> + * @privacy_screen_sw_state: See :ref:`Standard Connector >> + * Properties` >> + */ >> + enum drm_privacy_screen_status privacy_screen_sw_state; >> + >> + /** >> + * @privacy_screen_hw_state: See :ref:`Standard Connector >> + * Properties` >> + */ >> + enum drm_privacy_screen_status privacy_screen_hw_state; >> + >> /** >> * @hdr_output_metadata: >> * DRM blob property for HDR output metadata >> @@ -1285,6 +1321,18 @@ struct drm_connector { >> */ >> struct drm_property *max_bpc_property; >> >> + /** >> + * @privacy_screen_sw_state_property: Optional atomic property for the >> + * connector to control the integrated privacy screen. >> + */ >> + struct drm_property *privacy_screen_sw_state_property; >> + >> + /** >> + * @privacy_screen_hw_state_property: Optional atomic property for the >> + * connector to report the actual integrated privacy screen state. >> + */ >> + struct drm_property *privacy_screen_hw_state_property; >> + >> #define DRM_CONNECTOR_POLL_HPD (1 << 0) >> #define DRM_CONNECTOR_POLL_CONNECT (1 << 1) >> #define DRM_CONNECTOR_POLL_DISCONNECT (1 << 2) >> @@ -1598,6 +1646,8 @@ int drm_connector_set_panel_orientation_with_quirk( >> int width, int height); >> int drm_connector_attach_max_bpc_property(struct drm_connector *connector, >> int min, int max); >> +void drm_connector_create_privacy_screen_properties(struct drm_connector >> *conn); >> +void drm_connector_attach_privacy_screen_properties(struct drm_connector >> *conn); >> >> /** >> * struct drm_tile_group - Tile group metadata >> -- >> 2.26.0 > > Hans, > > Thanks for putting together this set of modifications. I believe it does sufficiently > reflect the implementation of privacy screens present on Dell notebooks today containing > them: Latitude 7300 and Latitude 7400. > > Those models only offer a HW controlled screen via a hotkey, but that hotkey control > can be removed permanently locking them in an enabled or disabled state. > > I feel that your concept of HW state "Enabled, Locked" and "Disabled, Locked" sufficiently > reflects that. That is good to hear. > Reviewed-by: Mario Limonciello Thank you. Regards, Hans _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel