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 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 0D166C3DA6E for ; Wed, 10 Jan 2024 11:10:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 544F210E5C3; Wed, 10 Jan 2024 11:10:52 +0000 (UTC) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by gabe.freedesktop.org (Postfix) with ESMTPS id 74E4C10E5C3 for ; Wed, 10 Jan 2024 11:10:50 +0000 (UTC) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a2bea904e72so9389066b.0 for ; Wed, 10 Jan 2024 03:10:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; t=1704885049; x=1705489849; darn=lists.freedesktop.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=3QlF0rRTBRD1E5jWA0kISaH2vZgtmpP2AfnIty3q4TQ=; b=GWX16YjwJXgapnM3J1eSZYjvbnsmYQGZSGR1n43N1zwx/7ldxaizqz3K4LSm/9AllY nL8+LRYHKhHp0dFHLEvVWXL5eQelTaVGkHppHBGgU02zaUY7jl+NFBOHuH4FSPRWu2ZX ha697XxMU5+dyfVlfdie7PqD5Fe+0fw34UIbk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704885049; x=1705489849; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3QlF0rRTBRD1E5jWA0kISaH2vZgtmpP2AfnIty3q4TQ=; b=IuZO5CQVFmpIBlUaDSEJhgBsoTXqMG0unDAjwpCU0VfqPIVgIF5CrSC87fZgzHuXi/ q3Dq7bzSl+DyZbY0sOIel6kfFc1VraV9g4uO/gnXu7WVYvS8saUvIuX46NZlYrxkTD/7 iPPFR5LSBmLXYXf8sG3NsW+/Tr+W180rcs7T2me81Trb82tsV7nb9cAHQHFJaYD5Xiiv I3Q+ZtvkpL7o13dXoWXX1XbrAfNoP9SMgTq1AjEJgydLYWAxFDFn7/8bg9l+UPXtt4PX tIQfmZgd0THC71NU5QAUbBdxWlZEl/Sea/ETplTx77X1CKG5bnwYWElzpV8sfcdUAYN9 Wp/w== X-Gm-Message-State: AOJu0YzUwEm5JdG6Agv5rL9RlaiCFZxwuZwYcDnUwcYewqXFebo6Qgdm IaQDudrhjt6Rk8qPl4TrFvdSexMVoEJQ/A== X-Google-Smtp-Source: AGHT+IH17mNNLFHB3A8wZSZTcWuwmMBTnERZR6Mu2RaoActQZZYYvzEUdcGN2VlFuia3B3Yo7xfaKw== X-Received: by 2002:a17:907:9445:b0:a27:7701:f16 with SMTP id dl5-20020a170907944500b00a2777010f16mr1131131ejc.7.1704885048816; Wed, 10 Jan 2024 03:10:48 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id m27-20020a1709062adb00b00a269f8e8869sm1976817eje.128.2024.01.10.03.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 03:10:48 -0800 (PST) Date: Wed, 10 Jan 2024 12:10:46 +0100 From: Daniel Vetter To: Andri Yngvason Subject: Re: [PATCH 3/7] drm/amd/display: Add handling for new "active color format" property Message-ID: Mail-Followup-To: Andri Yngvason , Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= , "Pan, Xinhui" , David Airlie , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, Simon Ser , Werner Sembach References: <20240109181104.1670304-1-andri@yngvason.is> <20240109181104.1670304-4-andri@yngvason.is> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240109181104.1670304-4-andri@yngvason.is> X-Operating-System: Linux phenom 6.5.0-4-amd64 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: , Cc: Thomas Zimmermann , intel-gfx@lists.freedesktop.org, Leo Li , David Airlie , dri-devel@lists.freedesktop.org, "Pan, Xinhui" , Rodrigo Siqueira , linux-kernel@vger.kernel.org, Maxime Ripard , Daniel Vetter , Rodrigo Vivi , Alex Deucher , Simon Ser , amd-gfx@lists.freedesktop.org, Harry Wentland , Christian =?iso-8859-1?Q?K=F6nig?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Jan 09, 2024 at 06:11:00PM +0000, Andri Yngvason wrote: > From: Werner Sembach > > This commit implements the "active color format" drm property for the AMD > GPU driver. > > Signed-off-by: Werner Sembach > Signed-off-by: Andri Yngvason > Tested-by: Andri Yngvason > --- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 42 ++++++++++++++++++- > .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++ > 2 files changed, 45 insertions(+), 1 deletion(-) > > 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 10e041a3b2545..b44d06c3b1706 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -6882,6 +6882,24 @@ int convert_dc_color_depth_into_bpc(enum dc_color_depth display_color_depth) > return 0; > } > > +static int convert_dc_pixel_encoding_into_drm_color_format( > + enum dc_pixel_encoding display_pixel_encoding) > +{ > + switch (display_pixel_encoding) { > + case PIXEL_ENCODING_RGB: > + return DRM_COLOR_FORMAT_RGB444; > + case PIXEL_ENCODING_YCBCR422: > + return DRM_COLOR_FORMAT_YCBCR422; > + case PIXEL_ENCODING_YCBCR444: > + return DRM_COLOR_FORMAT_YCBCR444; > + case PIXEL_ENCODING_YCBCR420: > + return DRM_COLOR_FORMAT_YCBCR420; > + default: > + break; > + } > + return 0; > +} > + > static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, > struct drm_crtc_state *crtc_state, > struct drm_connector_state *conn_state) > @@ -7436,8 +7454,10 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, > adev->mode_info.underscan_vborder_property, > 0); > > - if (!aconnector->mst_root) > + if (!aconnector->mst_root) { > drm_connector_attach_max_bpc_property(&aconnector->base, 8, 16); > + drm_connector_attach_active_color_format_property(&aconnector->base); > + } > > aconnector->base.state->max_bpc = 16; > aconnector->base.state->max_requested_bpc = aconnector->base.state->max_bpc; > @@ -8969,6 +8989,26 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) > kfree(dummy_updates); > } > > + /* Extract information from crtc to communicate it to userspace as connector properties */ > + for_each_new_connector_in_state(state, connector, new_con_state, i) { > + struct drm_crtc *crtc = new_con_state->crtc; > + struct dc_stream_state *stream; > + > + if (crtc) { > + new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc); > + dm_new_crtc_state = to_dm_crtc_state(new_crtc_state); > + stream = dm_new_crtc_state->stream; > + > + if (stream) { > + drm_connector_set_active_color_format_property(connector, > + convert_dc_pixel_encoding_into_drm_color_format( > + dm_new_crtc_state->stream->timing.pixel_encoding)); > + } > + } else { > + drm_connector_set_active_color_format_property(connector, 0); Just realized an even bigger reason why your current design doesn't work: You don't have locking here. And you cannot grab the required lock, which is drm_dev->mode_config.mutex, because that would result in deadlocks. So this really needs to use the atomic state based design I've described. A bit a tanget, but it would be really good to add a lockdep assert into drm_object_property_set_value, that at least for atomic drivers and connectors the above lock must be held for changing property values. But it will be quite a bit of audit to make sure all current users obey that rule. Cheers, Sima > + } > + } > + > /** > * Enable interrupts for CRTCs that are newly enabled or went through > * a modeset. It was intentionally deferred until after the front end > 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 11da0eebee6c4..a4d1b3ea8f81c 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 > @@ -600,6 +600,10 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, > if (connector->max_bpc_property) > drm_connector_attach_max_bpc_property(connector, 8, 16); > > + connector->active_color_format_property = master->base.active_color_format_property; > + if (connector->active_color_format_property) > + drm_connector_attach_active_color_format_property(&aconnector->base); > + > connector->vrr_capable_property = master->base.vrr_capable_property; > if (connector->vrr_capable_property) > drm_connector_attach_vrr_capable_property(connector); > -- > 2.43.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch