From nobody Tue Dec 16 16:41:05 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D4DF1802F for ; Mon, 15 Jan 2024 16:06:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=yngvason.is Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=yngvason.is Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=yngvason.is header.i=@yngvason.is header.b="IBpUvbjF" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-40e800461baso4099925e9.3 for ; Mon, 15 Jan 2024 08:06:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yngvason.is; s=google; t=1705334799; x=1705939599; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KS6uEFfS17C84C/JkCgS0wU+p+hCSHHIkna0klpWICo=; b=IBpUvbjFF1VwQWOu945p9bQfwFn7nh+nz7kYiV0HQol0DcWV1O00cuZ1NWKk/gKrs/ VeRjFFZdMdC4b8qVqyykSsry/Awd15U1H0/R9V4rW2Zx9VNyiuECJ+kWrrqG+a40Wzd+ 3RuPHZwfuzmmdwBLwEEYU8hJg6D5VlZUMMh1M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705334799; x=1705939599; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KS6uEFfS17C84C/JkCgS0wU+p+hCSHHIkna0klpWICo=; b=NNFjvH+I1wjMKABjuFzm+TUg0QU1NoPPJcbSVzc3mQQOzRpaDejjjQyVMU7NLwwGrd 4okwEOtaQfIFHRvJ1SVOZuGppBLs8gdljBGutxFq41tXMmomwXABg1n7NCN75VXTrTyS uDmOWD2lRWvh9M4FT4/F4EuNbfppJ+0sNqzKO22g/3T824JZ/GSq3kQIQHd3jSwfL8TT nwYyc1+wq9j8nWIfBXP4i1j4LerGfYuiTC+MxPMgGbuCiRawE8cmghAERZpAohG0+w6u /W/UF61ZkRqA0PWgJ/5FAoVO3QbVwksM3zgVyIUrCL/EInat08Q/XeJvQYhDxzfqRKg/ 8RrQ== X-Gm-Message-State: AOJu0YxZMT7hjn5ouA6CC5xjmCOud37FIhA8bzrz0VnatOIWw0Z9TFi5 h00NDCr3d5pRuiZiDqE8fwcYG5WNk0vdWA== X-Google-Smtp-Source: AGHT+IGIFWa9QLCBbPDN6iDa6GNEG3d3p28dSrUxb7dRFIBura+H4RnbieSbhVlV5zzIcWtVLi78jg== X-Received: by 2002:a05:600c:a0e:b0:40c:34f9:6c2a with SMTP id z14-20020a05600c0a0e00b0040c34f96c2amr1712919wmp.159.1705334799361; Mon, 15 Jan 2024 08:06:39 -0800 (PST) Received: from andri-workstation.turninn.appdynamic.com ([2a01:8280:aa07:ad:7285:c2ff:fef0:4baf]) by smtp.gmail.com with ESMTPSA id l22-20020a05600c4f1600b0040d6b91efd9sm20174140wmq.44.2024.01.15.08.06.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 08:06:38 -0800 (PST) From: Andri Yngvason To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, Simon Ser , Werner Sembach , Andri Yngvason Subject: [PATCH v2 1/4] drm/amd/display: Remove unnecessary SIGNAL_TYPE_HDMI_TYPE_A check Date: Mon, 15 Jan 2024 16:05:51 +0000 Message-ID: <20240115160554.720247-2-andri@yngvason.is> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240115160554.720247-1-andri@yngvason.is> References: <20240115160554.720247-1-andri@yngvason.is> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Werner Sembach Remove unnecessary SIGNAL_TYPE_HDMI_TYPE_A check that was performed in the drm_mode_is_420_only() case, but not in the drm_mode_is_420_also() && force_yuv420_output case. Without further knowledge if YCbCr 4:2:0 is supported outside of HDMI, there is no reason to use RGB when the display reports drm_mode_is_420_only() even on a non HDMI connection. This patch also moves both checks in the same if-case. This eliminates an extra else-if-case. Signed-off-by: Werner Sembach Signed-off-by: Andri Yngvason Tested-by: Andri Yngvason --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index f6575d7dee971..cc4d1f7f97b98 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5575,11 +5575,7 @@ static void fill_stream_properties_from_drm_display_= mode( timing_out->v_border_bottom =3D 0; /* TODO: un-hardcode */ if (drm_mode_is_420_only(info, mode_in) - && stream->signal =3D=3D SIGNAL_TYPE_HDMI_TYPE_A) - timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; - else if (drm_mode_is_420_also(info, mode_in) - && aconnector - && aconnector->force_yuv420_output) + || (drm_mode_is_420_also(info, mode_in) && aconnector->force_yuv420_out= put)) timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR4= 44) && stream->signal =3D=3D SIGNAL_TYPE_HDMI_TYPE_A) --=20 2.43.0 From nobody Tue Dec 16 16:41:05 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA0D6182AA for ; Mon, 15 Jan 2024 16:06:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=yngvason.is Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=yngvason.is Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=yngvason.is header.i=@yngvason.is header.b="SZBOTWXE" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3376d424a79so6916750f8f.1 for ; Mon, 15 Jan 2024 08:06:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yngvason.is; s=google; t=1705334802; x=1705939602; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XqVmGq7cOGaTLOSCYXLFwYOFgoyzsg0JNnPbRbL+2qg=; b=SZBOTWXErqeERnQ4SiFZ/NYVGiqSqwKoVJaubKwgXbThjRtV7k+OH6QaCcQ5/ZBxLy 6t3GmtyTULM7BTbmyvTPi4xNB1dj9zdpnrjlZtsG5FK7Uyb+rBMMRfu9veUVN3uOpD6j +1rVynP0KCkJAOOeLomvFgvPqsoE7yL76IkCA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705334802; x=1705939602; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XqVmGq7cOGaTLOSCYXLFwYOFgoyzsg0JNnPbRbL+2qg=; b=rNySlX1281sDl9Sh7DtWvJWMg1rZ8o3CnqzZEuk6+TYfW7oGEZ5I0R09r778SrXLgz lHrM1m6r+ILOBKYYQ4D+heWtK8yfAHo8QcuRI0WvO4yaJH0um51pmKFKHFB+IxG7oJh1 Bsn6Sl4GZXT4M0HFdVo+ELUn60/nx+CjIw23T6Wx40luR1dQ0JLbDdEsPfg0UyDeX+F0 mQ6uWXvgV3oPGODZhIvSGDoqJp6wMLZSXzlLV+HQcg1fucPXgbTqf6W4J38nKMdE/zPD xWnQMGdQS78B01r9Vl10hhJpk1KnZ251oYrbYXmwJccg5YOeumIldqmZ00OprgkR8+1I XuJw== X-Gm-Message-State: AOJu0YzHCH05a+01Wz79R7YJr/L2ZyKGzkwzs+5JG80esvNDRc3YV/ik CdzUCZ7V815+tl+deKObzHwcuCEZQxlbol5dvLD0ZWL1EHaLgg== X-Google-Smtp-Source: AGHT+IGAiZVOAbahlK853e9lBAb8rm+DtxdE3mGCj7VryIezlI0uyO9U9FExM1kRX3pwdttjeMe10w== X-Received: by 2002:a7b:cd15:0:b0:40e:5138:a32 with SMTP id f21-20020a7bcd15000000b0040e51380a32mr3068804wmj.145.1705334801856; Mon, 15 Jan 2024 08:06:41 -0800 (PST) Received: from andri-workstation.turninn.appdynamic.com ([2a01:8280:aa07:ad:7285:c2ff:fef0:4baf]) by smtp.gmail.com with ESMTPSA id l22-20020a05600c4f1600b0040d6b91efd9sm20174140wmq.44.2024.01.15.08.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 08:06:41 -0800 (PST) From: Andri Yngvason To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, Simon Ser , Werner Sembach , Andri Yngvason Subject: [PATCH v2 2/4] drm/uAPI: Add "force color format" drm property as setting for userspace Date: Mon, 15 Jan 2024 16:05:52 +0000 Message-ID: <20240115160554.720247-3-andri@yngvason.is> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240115160554.720247-1-andri@yngvason.is> References: <20240115160554.720247-1-andri@yngvason.is> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Werner Sembach Add a new general drm property "force color format" which can be used by userspace to tell the graphics driver which color format to use. Possible options are: - auto (default/current behaviour) - rgb - ycbcr444 - ycbcr422 (supported by neither amdgpu or i915) - ycbcr420 In theory the auto option should choose the best available option for the current setup, but because of bad internal conversion some monitors look better with rgb and some with ycbcr444. Also, because of bad shielded connectors and/or cables, it might be preferable to use the less bandwidth heavy ycbcr422 and ycbcr420 formats for a signal that is less susceptible to interference. In the future, automatic color calibration for screens might also depend on this option being available. Signed-off-by: Werner Sembach Signed-off-by: Andri Yngvason Tested-by: Andri Yngvason --- Changes in v2: - Renamed to "force color format" from "preferred color format" - Removed Reported-by pointing to invalid email address --- drivers/gpu/drm/drm_atomic_helper.c | 4 +++ drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 48 +++++++++++++++++++++++++++++ include/drm/drm_connector.h | 16 ++++++++++ 4 files changed, 72 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atom= ic_helper.c index 39ef0a6addeba..1dabd164c4f09 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -707,6 +707,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, if (old_connector_state->max_requested_bpc !=3D new_connector_state->max_requested_bpc) new_crtc_state->connectors_changed =3D true; + + if (old_connector_state->force_color_format !=3D + new_connector_state->force_color_format) + new_crtc_state->connectors_changed =3D true; } =20 if (funcs->atomic_check) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic= _uapi.c index 29d4940188d49..e45949bf4615f 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -776,6 +776,8 @@ static int drm_atomic_connector_set_property(struct drm= _connector *connector, state->max_requested_bpc =3D val; } else if (property =3D=3D connector->privacy_screen_sw_state_property) { state->privacy_screen_sw_state =3D val; + } else if (property =3D=3D connector->force_color_format_property) { + state->force_color_format =3D val; } else if (connector->funcs->atomic_set_property) { return connector->funcs->atomic_set_property(connector, state, property, val); @@ -859,6 +861,8 @@ drm_atomic_connector_get_property(struct drm_connector = *connector, *val =3D state->max_requested_bpc; } else if (property =3D=3D connector->privacy_screen_sw_state_property) { *val =3D state->privacy_screen_sw_state; + } else if (property =3D=3D connector->force_color_format_property) { + *val =3D state->force_color_format; } 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_connecto= r.c index b0516505f7ae9..e0535e58b4535 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1061,6 +1061,14 @@ static const struct drm_prop_enum_list drm_dp_subcon= nector_enum_list[] =3D { { DRM_MODE_SUBCONNECTOR_Native, "Native" }, /* DP */ }; =20 +static const struct drm_prop_enum_list drm_force_color_format_enum_list[] = =3D { + { 0, "auto" }, + { DRM_COLOR_FORMAT_RGB444, "rgb" }, + { DRM_COLOR_FORMAT_YCBCR444, "ycbcr444" }, + { DRM_COLOR_FORMAT_YCBCR422, "ycbcr422" }, + { DRM_COLOR_FORMAT_YCBCR420, "ycbcr420" }, +}; + DRM_ENUM_NAME_FN(drm_get_dp_subconnector_name, drm_dp_subconnector_enum_list) =20 @@ -1396,6 +1404,15 @@ static const u32 dp_colorspaces =3D * drm_connector_attach_max_bpc_property() to create and attach the * property to the connector during initialization. * + * force color format: + * This property is used by userspace to change the used color format. When + * used the driver will use the selected format if valid for the hardware, + * sink, and current resolution and refresh rate combination. Drivers to + * use the function drm_connector_attach_force_color_format_property() + * to create and attach the property to the connector during + * initialization. Possible values are "auto", "rgb", "ycbcr444", + * "ycbcr422", and "ycbcr420". + * * Connectors also have one standardized atomic property: * * CRTC_ID: @@ -2457,6 +2474,37 @@ int drm_connector_attach_max_bpc_property(struct drm= _connector *connector, } EXPORT_SYMBOL(drm_connector_attach_max_bpc_property); =20 +/** + * drm_connector_attach_force_color_format_property - attach "force color = format" property + * @connector: connector to attach force color format property on. + * + * This is used to add support for selecting a color format on a connector. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_connector_attach_force_color_format_property(struct drm_connector = *connector) +{ + struct drm_device *dev =3D connector->dev; + struct drm_property *prop; + + if (!connector->force_color_format_property) { + prop =3D drm_property_create_enum(dev, 0, "force color format", + drm_force_color_format_enum_list, + ARRAY_SIZE(drm_force_color_format_enum_list)); + if (!prop) + return -ENOMEM; + + connector->force_color_format_property =3D prop; + } + + drm_object_attach_property(&connector->base, prop, 0); + connector->state->force_color_format =3D 0; + + return 0; +} +EXPORT_SYMBOL(drm_connector_attach_force_color_format_property); + /** * drm_connector_attach_hdr_output_metadata_property - attach "HDR_OUTPUT_= METADA" property * @connector: connector to attach the property on. diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index fe88d7fc6b8f4..9830e7c09c0ba 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1026,6 +1026,14 @@ struct drm_connector_state { */ enum drm_privacy_screen_status privacy_screen_sw_state; =20 + /** + * @force_color_format: Property set by userspace to tell the GPU + * driver which color format to use. It only gets applied if hardware, + * meaning both the computer and the monitor, and the driver support the + * given format at the current resolution and refresh rate. + */ + u32 force_color_format; + /** * @hdr_output_metadata: * DRM blob property for HDR output metadata @@ -1699,6 +1707,12 @@ struct drm_connector { */ struct drm_property *privacy_screen_hw_state_property; =20 + /** + * @force_color_format_property: Default connector property for the + * force color format to be driven out of the connector. + */ + struct drm_property *force_color_format_property; + #define DRM_CONNECTOR_POLL_HPD (1 << 0) #define DRM_CONNECTOR_POLL_CONNECT (1 << 1) #define DRM_CONNECTOR_POLL_DISCONNECT (1 << 2) @@ -2053,6 +2067,8 @@ void drm_connector_attach_privacy_screen_provider( struct drm_connector *connector, struct drm_privacy_screen *priv); void drm_connector_update_privacy_screen(const struct drm_connector_state = *connector_state); =20 +int drm_connector_attach_force_color_format_property(struct drm_connector = *connector); + /** * struct drm_tile_group - Tile group metadata * @refcount: reference count --=20 2.43.0 From nobody Tue Dec 16 16:41:05 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C222B17BB1 for ; Mon, 15 Jan 2024 16:06:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=yngvason.is Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=yngvason.is Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=yngvason.is header.i=@yngvason.is header.b="f1XqMvAM" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-40e775695c6so9636175e9.3 for ; Mon, 15 Jan 2024 08:06:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yngvason.is; s=google; t=1705334804; x=1705939604; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y7h5TOlHeh29R5MO3vqvyCpfRR+2j5wkj4KSWlgVsY0=; b=f1XqMvAM/gkiRVln52kgZRjSUI4gyps3RPmoYbpMXTFmluU4ZidTR9NkP8eTukJL8q TRSve6cFqM2/v1z9oNAM7jKdABO0kgtpVyivb0dL+MbC9U62OtYnre7GDDeUJfOMdSIi nqQOrawB3i3S9IokaJSW3W/p9GOehJZj79/tE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705334804; x=1705939604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y7h5TOlHeh29R5MO3vqvyCpfRR+2j5wkj4KSWlgVsY0=; b=vn6u2dh2+XrWEbW25rDQBZJkbxWNCWTSlZc7QI6Wurx2/w2Gq701s1FUMU4ZX6q30v /sLi8fLghGCvJU2hd8GSeNpSmL6ATFyCSpwDIlGaPnnTiIOkohk+N7o6ZTGLRg69ode4 enFK7ET6KE6PTGsVsNdV3Xibt0L6gYnrnQjKnhaweJWVJfnJTsDB1q4gXmkhMHfv2bnc 2e3VQHL4yAqo9GKdoDjW4LKTegCgoygaApZrGw0l+F4mbHDvFKUNC9jbfextllFIyZEW SqLYLk9HqH3xNK+vsDbUHzxPvhWlLpHxj1RhmzNEzXJGiaQgH5YPbpSZwEI0kkWc/hJR GVHg== X-Gm-Message-State: AOJu0Yz+DmkOxIvhSpmNvucK/I5QMYS+n15e3RX6g6O6jho7VV+cFK7g OKtOPWWBac7iFF6EgZ90fqAvhBwY1XggRA== X-Google-Smtp-Source: AGHT+IHMlicTU5ZpLWspXuG4eSFL0osighJE+s/ckHvaTE3eH7QH7NJLEqO4581S2L63mZc6rAr+vw== X-Received: by 2002:a05:600c:524c:b0:40e:397e:16e7 with SMTP id fc12-20020a05600c524c00b0040e397e16e7mr3140605wmb.3.1705334804112; Mon, 15 Jan 2024 08:06:44 -0800 (PST) Received: from andri-workstation.turninn.appdynamic.com ([2a01:8280:aa07:ad:7285:c2ff:fef0:4baf]) by smtp.gmail.com with ESMTPSA id l22-20020a05600c4f1600b0040d6b91efd9sm20174140wmq.44.2024.01.15.08.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 08:06:43 -0800 (PST) From: Andri Yngvason To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, Simon Ser , Werner Sembach , Andri Yngvason Subject: [PATCH v2 3/4] drm/amd/display: Add handling for new "force color format" property Date: Mon, 15 Jan 2024 16:05:53 +0000 Message-ID: <20240115160554.720247-4-andri@yngvason.is> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240115160554.720247-1-andri@yngvason.is> References: <20240115160554.720247-1-andri@yngvason.is> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Werner Sembach This commit implements the "force color format" drm property for the AMD GPU driver. Signed-off-by: Werner Sembach Co-Developed-by: Andri Yngvason Signed-off-by: Andri Yngvason Tested-by: Andri Yngvason --- Changes in v2: - Renamed to "force color format" from "preferred color format" - Modeset will fail if color format cannot be satisfied --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 63 ++++++++++++++++--- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++ 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index cc4d1f7f97b98..26c4260c78d7b 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5573,15 +5573,32 @@ static void fill_stream_properties_from_drm_display= _mode( timing_out->h_border_right =3D 0; timing_out->v_border_top =3D 0; timing_out->v_border_bottom =3D 0; - /* TODO: un-hardcode */ - if (drm_mode_is_420_only(info, mode_in) - || (drm_mode_is_420_also(info, mode_in) && aconnector->force_yuv420_out= put)) + + if (connector_state + && (connector_state->force_color_format =3D=3D DRM_COLOR_FORMAT_YCBCR420 + || aconnector->force_yuv420_output) && drm_mode_is_420(info, mode_in)) timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; - else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR4= 44) - && stream->signal =3D=3D SIGNAL_TYPE_HDMI_TYPE_A) + else if (connector_state + && connector_state->force_color_format =3D=3D DRM_COLOR_FORMAT_YCBCR444 + && connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR444) timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR444; - else + else if (connector_state + && connector_state->force_color_format =3D=3D DRM_COLOR_FORMAT_RGB444 + && !drm_mode_is_420_only(info, mode_in)) timing_out->pixel_encoding =3D PIXEL_ENCODING_RGB; + else + /* + * connector_state->force_color_format not possible + * || connector_state->force_color_format =3D=3D 0 (auto) + * || connector_state->force_color_format =3D=3D DRM_COLOR_FORMAT_YCBCR4= 22 + */ + if (drm_mode_is_420_only(info, mode_in)) + timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; + else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR= 444) + && stream->signal =3D=3D SIGNAL_TYPE_HDMI_TYPE_A) + timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR444; + else + timing_out->pixel_encoding =3D PIXEL_ENCODING_RGB; =20 timing_out->timing_3d_format =3D TIMING_3D_FORMAT_NONE; timing_out->display_color_depth =3D convert_color_depth_from_display_info( @@ -6685,6 +6702,33 @@ static enum dc_status dm_validate_stream_and_context= (struct dc *dc, return dc_result; } =20 +static enum dc_status +dm_validate_stream_color_format(const struct drm_connector_state *drm_stat= e, + const struct dc_stream_state *stream) +{ + if (!drm_state->force_color_format) + return DC_OK; + + enum dc_pixel_encoding encoding =3D PIXEL_ENCODING_UNDEFINED; + switch (drm_state->force_color_format) { + case DRM_COLOR_FORMAT_RGB444: + encoding =3D PIXEL_ENCODING_RGB; + break; + case DRM_COLOR_FORMAT_YCBCR444: + encoding =3D PIXEL_ENCODING_YCBCR444; + break; + case DRM_COLOR_FORMAT_YCBCR422: + encoding =3D PIXEL_ENCODING_YCBCR422; + break; + case DRM_COLOR_FORMAT_YCBCR420: + encoding =3D PIXEL_ENCODING_YCBCR420; + break; + } + + return encoding =3D=3D stream->timing.pixel_encoding ? + DC_OK : DC_UNSUPPORTED_VALUE; +} + struct dc_stream_state * create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector, const struct drm_display_mode *drm_mode, @@ -6717,6 +6761,9 @@ create_validate_stream_for_sink(struct amdgpu_dm_conn= ector *aconnector, if (dc_result =3D=3D DC_OK) dc_result =3D dm_validate_stream_and_context(adev->dm.dc, stream); =20 + if (dc_result =3D=3D DC_OK) + dc_result =3D dm_validate_stream_color_format(drm_state, stream); + if (dc_result !=3D DC_OK) { DRM_DEBUG_KMS("Mode %dx%d (clk %d) failed DC validation with error %d (= %s)\n", drm_mode->hdisplay, @@ -7512,8 +7559,10 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_d= isplay_manager *dm, adev->mode_info.underscan_vborder_property, 0); =20 - if (!aconnector->mst_root) + if (!aconnector->mst_root) { drm_connector_attach_max_bpc_property(&aconnector->base, 8, 16); + drm_connector_attach_force_color_format_property(&aconnector->base); + } =20 aconnector->base.state->max_bpc =3D 16; aconnector->base.state->max_requested_bpc =3D aconnector->base.state->max= _bpc; 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 941e96f100f4e..437d50f53eb97 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 @@ -601,6 +601,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); =20 + connector->force_color_format_property =3D master->base.force_color_forma= t_property; + if (connector->force_color_format_property) + drm_connector_attach_force_color_format_property(&aconnector->base); + connector->vrr_capable_property =3D master->base.vrr_capable_property; if (connector->vrr_capable_property) drm_connector_attach_vrr_capable_property(connector); --=20 2.43.0 From nobody Tue Dec 16 16:41:05 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C8BC182DA for ; Mon, 15 Jan 2024 16:06:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=yngvason.is Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=yngvason.is Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=yngvason.is header.i=@yngvason.is header.b="jN3vEsw5" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-40e60e137aaso42326575e9.0 for ; Mon, 15 Jan 2024 08:06:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yngvason.is; s=google; t=1705334806; x=1705939606; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GdtBBD/PsT+CMOt03gpuRaURCK/Kf9ifF8Qmw3C9ypA=; b=jN3vEsw5AZNY+J7UfD1CR7cIQbor/W4m3Po0xllVZ3sV1fJCIDQgNSzsQM9wHR1GPS weWICbXBUELHySxj0/SY6qFOXWJnsUpQX+0Vq8IJL1Lucd2hVzmo8knnxanuEKRv8gTZ ElRTlBbxsTx7UXWUF3vAXYTcVK+ETYQdA8BFE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705334806; x=1705939606; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GdtBBD/PsT+CMOt03gpuRaURCK/Kf9ifF8Qmw3C9ypA=; b=jto3jFUx4jpVLGBHSW7Duljf6Kr7bQ55gUVI+hfpnA71TJzbWL0mwlBqSyGtN54cZ5 e2Rjn7rauqWqzU44FcwvEujarH16TPA+wrQ+yXk0aIblge7LRef7n8hIUtlWLEtt6TTy 59feFHZB1shXLwT+TAAVedTgcEbUlHj2haQSv9OfF4gR32IBEqXhxoHqu6QsRpQzD6XV W5i2khEzIH0nvRucXI8BzcllV9QPqWnktgJeIqguEnCdUhSxUV+sh1O334hYHh6r4j8f SsWHXG9z0q1VCGrIawezpH2M34A1zAYTBWdAvtQuIvNPpTZJBo0VSDCQThEiNok0D8z7 MLmA== X-Gm-Message-State: AOJu0YxRp/RxPQ8n7nrJ72JDHn0DraEOvhnVVteXiArZfMQjWwBTaHAc LlH0LRgVd3MKQdm86mQARNKyNBdFpuB1XQ== X-Google-Smtp-Source: AGHT+IHpqJt7PYL/T1kUb/MG4+ntZ8TRnDliR4DSwYmn+/sZY/n2Xxy8iGjJp3XSHJ9WOx+vBUYUwg== X-Received: by 2002:a05:600c:4f90:b0:40d:5f45:5094 with SMTP id n16-20020a05600c4f9000b0040d5f455094mr2778999wmq.104.1705334806635; Mon, 15 Jan 2024 08:06:46 -0800 (PST) Received: from andri-workstation.turninn.appdynamic.com ([2a01:8280:aa07:ad:7285:c2ff:fef0:4baf]) by smtp.gmail.com with ESMTPSA id l22-20020a05600c4f1600b0040d6b91efd9sm20174140wmq.44.2024.01.15.08.06.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 08:06:46 -0800 (PST) From: Andri Yngvason To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, Simon Ser , Werner Sembach , Andri Yngvason Subject: [PATCH v2 4/4] drm/i915/display: Add handling for new "force color format" property Date: Mon, 15 Jan 2024 16:05:54 +0000 Message-ID: <20240115160554.720247-5-andri@yngvason.is> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240115160554.720247-1-andri@yngvason.is> References: <20240115160554.720247-1-andri@yngvason.is> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Werner Sembach This commit implements the "force color format" drm property for the Intel GPU driver. Signed-off-by: Werner Sembach Co-Developed-by: Andri Yngvason Signed-off-by: Andri Yngvason Tested-by: Andri Yngvason --- Changes in v2: - Renamed to "force color format" from "preferred color format" - Modeset will fail if color format cannot be satisfied --- drivers/gpu/drm/i915/display/intel_dp.c | 35 ++++++++++++++++----- drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +++ drivers/gpu/drm/i915/display/intel_hdmi.c | 29 ++++++++++++++--- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915= /display/intel_dp.c index 7d2b8ce48fda1..71e822483572e 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -2799,6 +2799,16 @@ static bool intel_dp_has_audio(struct intel_encoder = *encoder, return intel_conn_state->force_audio =3D=3D HDMI_AUDIO_ON; } =20 +static u32 intel_output_format_to_drm_color_format(enum intel_output_forma= t input) +{ + switch (input) { + case INTEL_OUTPUT_FORMAT_RGB: return DRM_COLOR_FORMAT_RGB444; + case INTEL_OUTPUT_FORMAT_YCBCR444: return DRM_COLOR_FORMAT_YCBCR444; + case INTEL_OUTPUT_FORMAT_YCBCR420: return DRM_COLOR_FORMAT_YCBCR420; + } + return 0; +} + static int intel_dp_compute_output_format(struct intel_encoder *encoder, struct intel_crtc_state *crtc_state, @@ -2810,17 +2820,20 @@ intel_dp_compute_output_format(struct intel_encoder= *encoder, struct intel_connector *connector =3D intel_dp->attached_connector; const struct drm_display_info *info =3D &connector->base.display_info; const struct drm_display_mode *adjusted_mode =3D &crtc_state->hw.adjusted= _mode; - bool ycbcr_420_only; + bool ycbcr_420_output; int ret; =20 - ycbcr_420_only =3D drm_mode_is_420_only(info, adjusted_mode); + ycbcr_420_output =3D drm_mode_is_420_only(info, adjusted_mode) || + (conn_state->force_color_format =3D=3D DRM_COLOR_FORMAT_YCBCR420 && + drm_mode_is_420_also(&connector->base.display_info, adjusted_mode)); =20 - if (ycbcr_420_only && !connector->base.ycbcr_420_allowed) { + crtc_state->sink_format =3D ycbcr_420_output ? INTEL_OUTPUT_FORMAT_YCBCR4= 20 : + INTEL_OUTPUT_FORMAT_RGB; + + if (ycbcr_420_output && !connector->base.ycbcr_420_allowed) { drm_dbg_kms(&i915->drm, "YCbCr 4:2:0 mode but YCbCr 4:2:0 output not possible. Falling back= to RGB.\n"); crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_RGB; - } else { - crtc_state->sink_format =3D intel_dp_sink_format(connector, adjusted_mod= e); } =20 crtc_state->output_format =3D intel_dp_output_format(connector, crtc_stat= e->sink_format); @@ -2840,6 +2853,11 @@ intel_dp_compute_output_format(struct intel_encoder = *encoder, respect_downstream_limits); } =20 + if (conn_state->force_color_format && conn_state->force_color_format !=3D + intel_output_format_to_drm_color_format(crtc_state->sink_format)) { + ret =3D -EINVAL; + } + return ret; } =20 @@ -6179,10 +6197,13 @@ intel_dp_add_properties(struct intel_dp *intel_dp, = struct drm_connector *connect intel_attach_force_audio_property(connector); =20 intel_attach_broadcast_rgb_property(connector); - if (HAS_GMCH(dev_priv)) + if (HAS_GMCH(dev_priv)) { drm_connector_attach_max_bpc_property(connector, 6, 10); - else if (DISPLAY_VER(dev_priv) >=3D 5) + drm_connector_attach_force_color_format_property(connector); + } else if (DISPLAY_VER(dev_priv) >=3D 5) { drm_connector_attach_max_bpc_property(connector, 6, 12); + drm_connector_attach_force_color_format_property(connector); + } =20 /* Register HDMI colorspace for case of lspcon */ if (intel_bios_encoder_is_lspcon(dp_to_dig_port(intel_dp)->base.devdata))= { diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/= i915/display/intel_dp_mst.c index 8a94323350303..dcb3abcc6d83e 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -1572,6 +1572,11 @@ static struct drm_connector *intel_dp_add_mst_connec= tor(struct drm_dp_mst_topolo drm_dbg_kms(&dev_priv->drm, "[%s:%d] HDCP MST init failed, skipping.\n", connector->name, connector->base.id); =20 + connector->force_color_format_property =3D + intel_dp->attached_connector->base.force_color_format_property; + if (connector->force_color_format_property) + drm_connector_attach_force_color_format_property(connector); + return connector; =20 err: diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i9= 15/display/intel_hdmi.c index 39e4f5f7c8171..a612173411b26 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2205,6 +2205,16 @@ intel_hdmi_output_format(const struct intel_crtc_sta= te *crtc_state) return crtc_state->sink_format; } =20 +static u32 intel_output_format_to_drm_color_format(enum intel_output_forma= t input) +{ + switch (input) { + case INTEL_OUTPUT_FORMAT_RGB: return DRM_COLOR_FORMAT_RGB444; + case INTEL_OUTPUT_FORMAT_YCBCR444: return DRM_COLOR_FORMAT_YCBCR444; + case INTEL_OUTPUT_FORMAT_YCBCR420: return DRM_COLOR_FORMAT_YCBCR420; + } + return 0; +} + static int intel_hdmi_compute_output_format(struct intel_encoder *encoder, struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state, @@ -2214,13 +2224,17 @@ static int intel_hdmi_compute_output_format(struct = intel_encoder *encoder, const struct drm_display_mode *adjusted_mode =3D &crtc_state->hw.adjusted= _mode; const struct drm_display_info *info =3D &connector->base.display_info; struct drm_i915_private *i915 =3D to_i915(connector->base.dev); - bool ycbcr_420_only =3D drm_mode_is_420_only(info, adjusted_mode); + bool ycbcr_420_output; int ret; =20 + ycbcr_420_output =3D drm_mode_is_420_only(info, adjusted_mode) || + (conn_state->force_color_format =3D=3D DRM_COLOR_FORMAT_YCBCR420 && + drm_mode_is_420_also(&connector->base.display_info, adjusted_mode)); + crtc_state->sink_format =3D - intel_hdmi_sink_format(crtc_state, connector, ycbcr_420_only); + intel_hdmi_sink_format(crtc_state, connector, ycbcr_420_output); =20 - if (ycbcr_420_only && crtc_state->sink_format !=3D INTEL_OUTPUT_FORMAT_YC= BCR420) { + if (ycbcr_420_output && crtc_state->sink_format !=3D INTEL_OUTPUT_FORMAT_= YCBCR420) { drm_dbg_kms(&i915->drm, "YCbCr 4:2:0 mode but YCbCr 4:2:0 output not possible. Falling back= to RGB.\n"); crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_RGB; @@ -2240,6 +2254,11 @@ static int intel_hdmi_compute_output_format(struct i= ntel_encoder *encoder, ret =3D intel_hdmi_compute_clock(encoder, crtc_state, respect_downstream= _limits); } =20 + if (conn_state->force_color_format && conn_state->force_color_format !=3D + intel_output_format_to_drm_color_format(crtc_state->output_format)) { + ret =3D -EINVAL; + } + return ret; } =20 @@ -2611,8 +2630,10 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_h= dmi, struct drm_connector *c if (DISPLAY_VER(dev_priv) >=3D 10) drm_connector_attach_hdr_output_metadata_property(connector); =20 - if (!HAS_GMCH(dev_priv)) + if (!HAS_GMCH(dev_priv)) { drm_connector_attach_max_bpc_property(connector, 8, 12); + drm_connector_attach_force_color_format_property(connector); + } } =20 /* --=20 2.43.0