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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A9A32C433EF for ; Tue, 8 Mar 2022 22:02:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BF2A10E5D0; Tue, 8 Mar 2022 22:02:33 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 613E910E5D5 for ; Tue, 8 Mar 2022 22:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646776951; 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=ap77LvzULmdCdXsECZkw0AZ9hsXA0/DA4uea3q/cfGY=; b=cnjhwfJBT7KgbIlSMu0xENswG4t/CvMYSUa3QKDO8yjRPWnBEkfzRE6eGQ1e9Tjb7FJSRZ pgu+p4/RpZBMAFV62qSuBPFTDKmRHzA2VmFLsJboIdKtgqK9T5yCKI510sjY0PMqhlBq3Q f/hiLE97j4cPmW8BUTa7Y0eWd7QJXLY= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-344-XltGII7-Pve0W4dB4V10Fw-1; Tue, 08 Mar 2022 17:02:29 -0500 X-MC-Unique: XltGII7-Pve0W4dB4V10Fw-1 Received: by mail-ed1-f69.google.com with SMTP id x5-20020a50ba85000000b004161d68ace6so182961ede.15 for ; Tue, 08 Mar 2022 14:02:29 -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=ap77LvzULmdCdXsECZkw0AZ9hsXA0/DA4uea3q/cfGY=; b=JdAJq9l+qb9JcFV/HUCio+af6Db37IFG+8cS8QTM2LUredG1SCY111dmDB7rVcIJdj eCxgFDOA5eAbjSNFS2e85KZmLOFIZhV59ifcfeXVU2U5+GCK5GK6b5fMEndCNTv2zGTW IDyZUlBo9MatBTEyeqQMfBlWQszvRBIiHzI31SjwdoLTwo/0YYxDTDmp10TeSvMB1uiA 3uHNup+4a8Eo49ptCrizrc/qp59ZD+RehMk8siI6QqkoPTHiw+ZuOxtQgQwu1XYNaFjY bFS1MhZf+sx+G27otQzaDChtRspJz8+pILqRKf2ljDYo7o479WmGEupvbBJ0W38C7YBR QKdA== X-Gm-Message-State: AOAM533MigXL/4nNJWIRe1dr8sSbotiz9R09Ck69QnJC8gDEpxFmg6T8 LUZ8tF2WhHiI/ZBMUvfxdIOuLpQaubCMCHBBpSHYVsX8RPqMS0VgEkYCexkn/RTtwRzvw/qaAaU yHeQOV/7wtpDLtlMn7nbDs9aeQ3Ob X-Received: by 2002:a17:907:7ba3:b0:6db:263c:46d with SMTP id ne35-20020a1709077ba300b006db263c046dmr11086597ejc.586.1646776948685; Tue, 08 Mar 2022 14:02:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxcFP2yS/Xzph2CZP+wE4ZagKeqyudgd7VXqADNziB6bYQ37JIbqSOvp3W2BfwD8j1gCeMbVw== X-Received: by 2002:a17:907:7ba3:b0:6db:263c:46d with SMTP id ne35-20020a1709077ba300b006db263c046dmr11086571ejc.586.1646776948469; Tue, 08 Mar 2022 14:02:28 -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 y12-20020a50eb8c000000b00410f02e577esm28263edr.7.2022.03.08.14.02.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Mar 2022 14:02:27 -0800 (PST) Message-ID: Date: Tue, 8 Mar 2022 23:02:26 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH] drm/amdgpu: Add support for drm_privacy_screen To: Sean Paul , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, harry.wentland@amd.com, alexdeucher@gmail.com References: <20220308205638.1744064-1-sean@poorly.run> From: Hans de Goede In-Reply-To: <20220308205638.1744064-1-sean@poorly.run> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hdegoede@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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: David Airlie , "Pan, Xinhui" , Rodrigo Siqueira , Leo Li , Sean Paul , Alex Deucher , rajatja@google.com, =?UTF-8?Q?Christian_K=c3=b6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, On 3/8/22 21:56, Sean Paul wrote: > From: Sean Paul > > This patch adds the necessary hooks to make amdgpu aware of privacy > screens. On devices with privacy screen drivers (such as thinkpad-acpi), > the amdgpu driver will defer probe until it's ready and then sync the sw > and hw state on each commit the connector is involved and enabled. > > Signed-off-by: Sean Paul > --- > > I tested this locally, but am not super confident everything is in the > correct place. Hopefully the intent of the patch is clear and we can > tweak positioning if needed. Thank you for working on this, from a drm-privacy screen pov this looks good, one small remark below. > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +++++++++ > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ > .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 16 +++++++++++++++- > 3 files changed, 27 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index 2ab675123ae3..e2cfae56c020 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > #include > #include > #include "amdgpu_drv.h" > @@ -1988,6 +1989,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, > { > struct drm_device *ddev; > struct amdgpu_device *adev; > + struct drm_privacy_screen *privacy_screen; > unsigned long flags = ent->driver_data; > int ret, retry = 0, i; > bool supports_atomic = false; > @@ -2063,6 +2065,13 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, > size = pci_resource_len(pdev, 0); > is_fw_fb = amdgpu_is_fw_framebuffer(base, size); > > + /* If the LCD panel has a privacy screen, defer probe until its ready */ > + privacy_screen = drm_privacy_screen_get(&pdev->dev, NULL); > + if (IS_ERR(privacy_screen) && PTR_ERR(privacy_screen) == -EPROBE_DEFER) > + return -EPROBE_DEFER; > + > + drm_privacy_screen_put(privacy_screen); > + > /* Get rid of things like offb */ > ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &amdgpu_kms_driver); > if (ret) > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index e1d3db3fe8de..9e2bb6523add 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -9781,6 +9781,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) > if (acrtc) { > new_crtc_state = drm_atomic_get_new_crtc_state(state, &acrtc->base); > old_crtc_state = drm_atomic_get_old_crtc_state(state, &acrtc->base); > + > + /* Sync the privacy screen state between hw and sw */ > + drm_connector_update_privacy_screen(new_con_state); > } > > /* Skip any modesets/resets */ > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > index 740435ae3997..e369fc95585e 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > #include "dm_services.h" > #include "amdgpu.h" > #include "amdgpu_dm.h" > @@ -506,6 +507,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, > struct amdgpu_dm_connector *aconnector, > int link_index) > { > + struct drm_device *dev = dm->ddev; > struct dc_link_settings max_link_enc_cap = {0}; > > aconnector->dm_dp_aux.aux.name = > @@ -519,8 +521,20 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, > drm_dp_cec_register_connector(&aconnector->dm_dp_aux.aux, > &aconnector->base); > > - if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) > + if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP) { > + struct drm_privacy_screen *privacy_screen; > + > + /* Reference given up in drm_connector_cleanup() */ > + privacy_screen = drm_privacy_screen_get(dev->dev, NULL); > + if (!IS_ERR(privacy_screen)) { > + drm_connector_attach_privacy_screen_provider(&aconnector->base, > + privacy_screen); > + } else { > + drm_err(dev, "Error getting privacy screen, ret=%d\n", > + PTR_ERR(privacy_screen)); This will now log a warning on all devices without a privacy-screen. The i915 code uses this instead: } else if (PTR_ERR(privacy_screen) != -ENODEV) { drm_err(dev, "Error getting privacy screen, ret=%d\n", PTR_ERR(privacy_screen)); } Regards, Hans > + } > return; > + } > > dc_link_dp_get_max_link_enc_cap(aconnector->dc_link, &max_link_enc_cap); > aconnector->mst_mgr.cbs = &dm_mst_cbs;