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 F3E53E706F0 for ; Thu, 21 Sep 2023 08:48:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 266EC10E589; Thu, 21 Sep 2023 08:48:53 +0000 (UTC) Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by gabe.freedesktop.org (Postfix) with ESMTPS id A3FF310E589 for ; Thu, 21 Sep 2023 08:48:50 +0000 (UTC) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-502b1bbe5c3so1206023e87.1 for ; Thu, 21 Sep 2023 01:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695286129; x=1695890929; darn=lists.freedesktop.org; h=mime-version:references:in-reply-to:message-id:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=k4kPbAvXqYWCjQtm/jTtJ1li9AEbZqWafTDz226oJdI=; b=Klqvmu4wV+daw5vCXn14AdrNeJddBLlma2xxfNJbt4uvimki5BRnTHewjjArqWLNoz RCz/H+gQM1tqr90mCsFsMQYS1Jk2OQ0lZiTTkE5PtfDlytESSlmSgNFuFmHOtNnMu+94 WMZfYAIDqnUT0t/8ejjOVUbgN6fgCXNRrYT+9lCBrxoWahrgjUFJB0F5qWA7aZVxPbAa eUNfr1+J+wQODoXUU88zmN3UJbOUjHMC1jvedCjZAB/6btZAHRU0/K+dlLlEOfxE7Mh0 bw236dztwtMek/A8OBYiwgM+g3zALHzkLyP8l7sIKSSEAJEB87aALlP6H4uMwV+OgBOm Vm1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695286129; x=1695890929; h=mime-version:references:in-reply-to:message-id:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=k4kPbAvXqYWCjQtm/jTtJ1li9AEbZqWafTDz226oJdI=; b=NZ8MTsRi1JN7BRXSIFDbKkVlpyYkaAZ30xqeFpjNVW8LF3GUzv0FIJx0/IBWV4kEzi CtGtZF9ijG7ILFLBjWkhC7cQVA3VBvkMtO3eNwnPZgojcsZhqkmB0DL00rNgFYamGdew vFeGUGbcaDjotn+zPmxlg6qRC8Y33fGaKuxberFYMVPraooj7iKZQsFHjd9i+ARiDFkc pMBLITotlu+Zo8kV8ccPlyPKbleDGXxtleEcZGSNaOpNi8mL98IjS2001NjKoCwyY0pL kM2OIY/2wfzhWHsJGOs9qQENXglKrUx8w7gSnvdnw92RHwSuS4Wt9n14ctI5qv2kailx W1ig== X-Gm-Message-State: AOJu0Yxtci3J4kDabuI+CLKnthiV5VHQUsZR8NlnhWfKp7ufkUpsw4K8 3rdw29lkFkPdkWJx8qOw3ko= X-Google-Smtp-Source: AGHT+IECgI0x8NqVEUwF8vAB/HRCbCPTukfPzQhaF2jXn5JCb5+dUTi6Rg3yqEOYh76bvzU4KraLtw== X-Received: by 2002:ac2:5224:0:b0:503:1d46:6f29 with SMTP id i4-20020ac25224000000b005031d466f29mr4160892lfl.37.1695286128519; Thu, 21 Sep 2023 01:48:48 -0700 (PDT) Received: from eldfell ([194.136.85.206]) by smtp.gmail.com with ESMTPSA id h16-20020a197010000000b004fbddb14020sm205979lfc.56.2023.09.21.01.48.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 01:48:48 -0700 (PDT) Date: Thu, 21 Sep 2023 11:48:45 +0300 From: Pekka Paalanen To: Maxime Ripard Subject: Re: [PATCH RFC v2 05/37] drm/connector: hdmi: Add output BPC to the connector state Message-ID: <20230921114845.7edb1d37@eldfell> In-Reply-To: <20230920-kms-hdmi-connector-state-v2-5-17932daddd7d@kernel.org> References: <20230920-kms-hdmi-connector-state-v2-0-17932daddd7d@kernel.org> <20230920-kms-hdmi-connector-state-v2-5-17932daddd7d@kernel.org> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/1wJwHY6yZH5_elgENzeqr8U"; protocol="application/pgp-signature"; micalg=pgp-sha256 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: Thomas Zimmermann , Emma Anholt , Jonathan Corbet , linux-kernel@vger.kernel.org, Samuel Holland , Sandy Huang , Jernej Skrabec , linux-doc@vger.kernel.org, Hans Verkuil , linux-rockchip@lists.infradead.org, Chen-Yu Tsai , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --Sig_/1wJwHY6yZH5_elgENzeqr8U Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Wed, 20 Sep 2023 16:35:20 +0200 Maxime Ripard wrote: > We'll add automatic selection of the output BPC in a following patch, > but let's add it to the HDMI connector state already. >=20 > Signed-off-by: Maxime Ripard > --- > drivers/gpu/drm/drm_atomic.c | 4 +++- > drivers/gpu/drm/drm_atomic_state_helper.c | 6 +++++- > drivers/gpu/drm/drm_connector.c | 13 ++++++++++++- > include/drm/drm_connector.h | 13 ++++++++++++- > 4 files changed, 32 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index b1b56dcaa76b..8dce0a2f2ac3 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -1143,9 +1143,11 @@ static void drm_atomic_connector_print_state(struc= t drm_printer *p, > drm_printf(p, "\tcolorspace=3D%s\n", drm_get_colorspace_name(state->col= orspace)); > =20 > if (connector->connector_type =3D=3D DRM_MODE_CONNECTOR_HDMIA || > - connector->connector_type =3D=3D DRM_MODE_CONNECTOR_HDMIB) > + connector->connector_type =3D=3D DRM_MODE_CONNECTOR_HDMIB) { > drm_printf(p, "\tbroadcast_rgb=3D%s\n", > drm_hdmi_connector_get_broadcast_rgb_name(state->hdmi.broadcast_rg= b)); > + drm_printf(p, "\toutput_bpc=3D%u\n", state->hdmi.output_bpc); > + } > =20 > if (connector->connector_type =3D=3D DRM_MODE_CONNECTOR_WRITEBACK) > if (state->writeback_job && state->writeback_job->fb) > diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/= drm_atomic_state_helper.c > index 0f7e5ba555b8..2c9b52ae1b56 100644 > --- a/drivers/gpu/drm/drm_atomic_state_helper.c > +++ b/drivers/gpu/drm/drm_atomic_state_helper.c > @@ -569,6 +569,9 @@ EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset); > void __drm_atomic_helper_connector_hdmi_reset(struct drm_connector *conn= ector, > struct drm_connector_state *new_state) > { > + new_state->max_bpc =3D 8; > + new_state->max_requested_bpc =3D 8; > + new_state->hdmi.output_bpc =3D 8; Hi, will this be forcing all drivers using these helpers to default to max bpc = =3D 8? I believe at least amdgpu would disagree. The defaults were changed in the recent years, IIRC to avoid extra modesets during boot-up when desktops prefer highest possible bpc for a mode. The 'max bpc' property itself is a manual workaround for faulty hardware that does not correctly indicate the max bpc it can handle. It should not default to be a limiting factor. > new_state->hdmi.broadcast_rgb =3D DRM_HDMI_BROADCAST_RGB_AUTO; > } > EXPORT_SYMBOL(__drm_atomic_helper_connector_hdmi_reset); > @@ -651,7 +654,8 @@ int drm_atomic_helper_connector_hdmi_check(struct drm= _connector *connector, > struct drm_connector_state *new_state =3D > drm_atomic_get_new_connector_state(state, connector); > =20 > - if (old_state->hdmi.broadcast_rgb !=3D new_state->hdmi.broadcast_rgb) { > + if (old_state->hdmi.broadcast_rgb !=3D new_state->hdmi.broadcast_rgb || > + old_state->hdmi.output_bpc !=3D new_state->hdmi.output_bpc) { > struct drm_crtc *crtc =3D new_state->crtc; > struct drm_crtc_state *crtc_state; > =20 > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connec= tor.c > index b45471d540ac..f55f5918411c 100644 > --- a/drivers/gpu/drm/drm_connector.c > +++ b/drivers/gpu/drm/drm_connector.c > @@ -459,6 +459,7 @@ EXPORT_SYMBOL(drmm_connector_init); > * @funcs: callbacks for this connector > * @connector_type: user visible type of the connector > * @ddc: optional pointer to the associated ddc adapter > + * @max_bpc: Maximum bits per char the HDMI connector supports > * > * Initialises a preallocated HDMI connector. Connectors can be > * subclassed as part of driver connector objects. > @@ -475,7 +476,8 @@ int drmm_connector_hdmi_init(struct drm_device *dev, > struct drm_connector *connector, > const struct drm_connector_funcs *funcs, > int connector_type, > - struct i2c_adapter *ddc) > + struct i2c_adapter *ddc, > + unsigned int max_bpc) > { > int ret; > =20 > @@ -487,6 +489,15 @@ int drmm_connector_hdmi_init(struct drm_device *dev, > if (ret) > return ret; > =20 > + if (max_bpc) { > + if (!(max_bpc =3D=3D 8 || max_bpc =3D=3D 10 || max_bpc =3D=3D 12)) > + return -EINVAL; > + > + drm_connector_attach_hdr_output_metadata_property(connector); > + drm_connector_attach_max_bpc_property(connector, 8, max_bpc); > + connector->max_bpc =3D max_bpc; > + } > + > return 0; > } > EXPORT_SYMBOL(drmm_connector_hdmi_init); > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index fdcf64ab91a9..d0bcb835c857 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -1056,6 +1056,11 @@ struct drm_connector_state { > * Broadcast RGB selection value. > */ > enum drm_hdmi_broadcast_rgb broadcast_rgb; > + > + /** > + * @output_bpc: Bits per character to output. Is it not bits per channel? > + */ > + unsigned int output_bpc; > } hdmi; > }; > =20 > @@ -1700,6 +1705,11 @@ struct drm_connector { > */ > struct drm_property_blob *path_blob_ptr; > =20 > + /** > + * @max_bpc: Maximum bits per character the connector supports. channel? > + */ > + unsigned int max_bpc; > + > /** > * @max_bpc_property: Default connector property for the max bpc to be > * driven out of the connector. > @@ -1939,7 +1949,8 @@ int drmm_connector_hdmi_init(struct drm_device *dev, > struct drm_connector *connector, > const struct drm_connector_funcs *funcs, > int connector_type, > - struct i2c_adapter *ddc); > + struct i2c_adapter *ddc, > + unsigned int max_bpc); > void drm_connector_attach_edid_property(struct drm_connector *connector); > int drm_connector_register(struct drm_connector *connector); > void drm_connector_unregister(struct drm_connector *connector); >=20 Thanks, pq --Sig_/1wJwHY6yZH5_elgENzeqr8U Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEJQjwWQChkWOYOIONI1/ltBGqqqcFAmUMA20ACgkQI1/ltBGq qqdaQRAAjfKbi0w7oddJriljZUDUoI1Xd4FCUc54o8hNaouY4GMPo8BjlHTUGHxT oHxATfX6EO5a4wWK3ceBWFhBpLETGmIpqn5wdcG2+84vhIVHXgPn/l1MwShFkzcD 5WQjnEnFvGqg8eZ05Cc545omaAiLZbqGKeXw2piYUd2+cZmBDZroK3BQXgZlM6JV 62/0mx3eR3juCdwGR9PlWHnoPdsVQA8REfaR62C33rF4ZP52tp0x/OiXa0D7tcxl bj7XqZ3iuK9lCArc8GGZZdSuyEK8oobA7j6SDvbY6KqNGoE4DLNkKHVp1Cm7x7X/ xvexGK/FiQ3QLSn7KUXFK3MFk5X14Zr5P83bLFnEL78MqSdz0KCgeZFhJ9Hs6PkS y3FuV7YcM8PNsPwvJIElTRnMpby7LpweEPD2mohJENK22b3bfFWU5o+sGVGotCKq Y3BRrJnjWZrXq6mkcKhFwq2YM7+oFasQrG74Afn8SFvfu9lnRfXnveYp8tpyR/Jz CIH/X57kHsgZJeZaPVD86aGmEq5UFjynjuLbwznoJYVcJrwAtvbVwNzcrTO3x4ea P8PRUxUwROJGWuLKSRKosmmoMIjpqSBIsQ2UDaWEwv0UIbKA2jivnb9vGkbBVEGZ rAzfC0oo7clq9sikn0v8UMgbIkzWSYYy5ycZVl1KQ7xxXQtbHr4= =JFuq -----END PGP SIGNATURE----- --Sig_/1wJwHY6yZH5_elgENzeqr8U--