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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B1DF1E706F7 for ; Thu, 21 Sep 2023 09:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WIYnTMzN7aVjL1pe9q+bYaCLUgEqZDxD477d5viR2ls=; b=1GzVuAmMHqvGKV XMQ7+qM+MnRotEBuN5VkaesFAG7j2k5/BI8UlU/dwn/21KYoWXrALBSd/grB2RDS9zuKfctRVcWdx /hEvKxsIAynSiDovlkgZ5p6Q0Y6VhSnvvrBQWr8CNOoPOA5A/DjidyoUc6H/YM6SEXJ0JEkrW6IXk 1y/qLlekHglT3QaM8IeVzUvbOdYAq0Y6Z2Zh353I0vgrhHjn+cwB1wKY/dp9+HBgW0IjzvWWEpl4q 0kPRxhROfTkYBCd3gmrn0T2PssopBBoh+Mvgzyrc6mIM4GUD7B0qt51KCnHWWYQDBKiaB8V00X4h2 pxb2W7nAlM/KpDKTw1MA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qjFYi-005Xck-0w; Thu, 21 Sep 2023 09:01:16 +0000 Received: from mgamail.intel.com ([134.134.136.24]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qjFYe-005XbN-2T; Thu, 21 Sep 2023 09:01:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695286872; x=1726822872; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=ocUYw9eVkqBv2VFvJPDH0psgHV0OVSpDbQGqlku3wz4=; b=dhUodUMkXq0FgFAurvDau+1fvUo3wucz3CohQSik54YejrMjvB3sRagP 1UTYxpR5irso8KG3+RDUT0OanhkQrC2ydeAJq6m59xsyVtbELZdkyCG93 i3VZOzPQyxoLHy/fZtKJIBcbO3vWpZ7kST8x16RLQTExOM149i40iyzkT T/AvIymWrFwgBoaEL3rL3d7PzejgML1Ue33KY9zCQpnTVAaTPuJS5cbDi 8zckNP77HL4Hw6p4aIC6bPu73/w5DCG6UZYm7+7rxePVJxnLB1nNXHnmG fRCM42PGI/yas2+6kouuc8hwX42g66T95S9LTtQ9aaLx7GbAOKD+vmO8n Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10839"; a="383203451" X-IronPort-AV: E=Sophos;i="6.03,165,1694761200"; d="scan'208";a="383203451" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2023 01:56:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10839"; a="723666415" X-IronPort-AV: E=Sophos;i="6.03,165,1694761200"; d="scan'208";a="723666415" Received: from idubinov-mobl1.ccr.corp.intel.com (HELO localhost) ([10.252.52.72]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2023 01:56:11 -0700 From: Jani Nikula To: Pekka Paalanen , Maxime Ripard 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 Subject: Re: [PATCH RFC v2 05/37] drm/connector: hdmi: Add output BPC to the connector state In-Reply-To: <20230921114845.7edb1d37@eldfell> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230920-kms-hdmi-connector-state-v2-0-17932daddd7d@kernel.org> <20230920-kms-hdmi-connector-state-v2-5-17932daddd7d@kernel.org> <20230921114845.7edb1d37@eldfell> Date: Thu, 21 Sep 2023 11:56:08 +0300 Message-ID: <87zg1fq507.fsf@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230921_020112_853455_14D612EC X-CRM114-Status: GOOD ( 24.53 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On Thu, 21 Sep 2023, Pekka Paalanen wrote: > 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. >> >> 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(-) >> >> 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(struct drm_printer *p, >> drm_printf(p, "\tcolorspace=%s\n", drm_get_colorspace_name(state->colorspace)); >> >> if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || >> - connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) >> + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) { >> drm_printf(p, "\tbroadcast_rgb=%s\n", >> drm_hdmi_connector_get_broadcast_rgb_name(state->hdmi.broadcast_rgb)); >> + drm_printf(p, "\toutput_bpc=%u\n", state->hdmi.output_bpc); >> + } >> >> if (connector->connector_type == 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 *connector, >> struct drm_connector_state *new_state) >> { >> + new_state->max_bpc = 8; >> + new_state->max_requested_bpc = 8; >> + new_state->hdmi.output_bpc = 8; > > Hi, > > will this be forcing all drivers using these helpers to default to max bpc = 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 = 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 = >> drm_atomic_get_new_connector_state(state, connector); >> >> - if (old_state->hdmi.broadcast_rgb != new_state->hdmi.broadcast_rgb) { >> + if (old_state->hdmi.broadcast_rgb != new_state->hdmi.broadcast_rgb || >> + old_state->hdmi.output_bpc != new_state->hdmi.output_bpc) { >> struct drm_crtc *crtc = new_state->crtc; >> struct drm_crtc_state *crtc_state; >> >> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.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; >> >> @@ -487,6 +489,15 @@ int drmm_connector_hdmi_init(struct drm_device *dev, >> if (ret) >> return ret; >> >> + if (max_bpc) { >> + if (!(max_bpc == 8 || max_bpc == 10 || max_bpc == 12)) >> + return -EINVAL; >> + >> + drm_connector_attach_hdr_output_metadata_property(connector); >> + drm_connector_attach_max_bpc_property(connector, 8, max_bpc); >> + connector->max_bpc = 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? Or component. Or color. Or color channel. ;) But character I've never heard. BR, Jani. > >> + */ >> + unsigned int output_bpc; >> } hdmi; >> }; >> >> @@ -1700,6 +1705,11 @@ struct drm_connector { >> */ >> struct drm_property_blob *path_blob_ptr; >> >> + /** >> + * @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); >> > > Thanks, > pq -- Jani Nikula, Intel _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip