From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 BFC3A2EA749 for ; Sat, 8 Aug 2026 09:58:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786183104; cv=none; b=dYsP1kaDBmdq73BQSAcR2HznhNg5DfKt5hG7NF0OBOH3fAUTXaevOE3IwRV+x91TC//OlP/wRfmuzUssi2PwuqrGyf8F/X4UvTw/T7ETWtXMFYqpUsFnIxKp5Oh1qK9CX0vHFjN7yfjJVqkDrWIgnyeyey3qXOhlKHom85APKqc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786183104; c=relaxed/simple; bh=OptPU5YH44L4OSi5W34FeHPSEeQJS89xpSwp6Or23yg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c+hCzCp9rQzIbnp9M/tkSRnPkTDVKyOAogvoPgT1OTAhOYsHCOERvfUkVQcQlC8fqBGzd78qhf256AEkxTy1dWUcVMIXtxLUv6Su4sKkxum0l9Sqx/xZ8/ZCu8MuhVKpMuloy+Ml8FtAp8WXv53aiFrGRsoVozzTbnhfI765hz4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BryR4MZl; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BryR4MZl" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-49967f24eedso6475e9.0 for ; Sat, 08 Aug 2026 02:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786183101; x=1786787901; 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:content-type; bh=g22IUbt8ZLLCFwaMoIL3xYIHr/pNgXlbdNwWp0/GjnE=; b=BryR4MZlNGG4GWriBeIWOTesFyX6XnRzrlgfjWH4neEKcLS7HQf7EyupXlwHVKOHfa C1izmz/gnFd1anhsnrtNTmbOeLFNK6BQryugxV5+3aUkZ+b0ygEMbDzhlJttt4C9/JDf 77jVRs96fi9OU2vfdQ4LgiSpZNFve3f6UZ4yLsEYW/Pr50m6f35hMeV/WosZDS0HXTV5 wBVBOLQdb6OaBAwzu8y2tCiLl2q8BtDM2DhVlMyDLi5NvK0mg/UsF4bRIxVLQ6iWh4OL GhSXySQ+RnhRXnO3hObmPyeMDdgYJlAexYPwSot1uR+xP52fR8MfcbGsQ7jqVR9OggYB foog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786183101; x=1786787901; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=g22IUbt8ZLLCFwaMoIL3xYIHr/pNgXlbdNwWp0/GjnE=; b=ZzfmI9fipgN/JZSG1rmh6WiqxtBqshi/mS3Lrb7hdGE8lMBcV9NZxYycvIBlPOBOhd 3jGmPSqKtY6YA6xZsKMauPjWV6TvR+5rPRuC7TILGe3MxL36fuHBV8OU1Vin7pjrS3EP r+sOPdpRFOnGqzPgeBWjkAJUimVBJf+M7F+Dt54Gk25SFWBO1s1tJml/C0Zt9uzdhxft LbrcW2n3rVo5txNdzBFFal5URPEitZeqPihb50xvh6ZSfZuBMJuWlPw+pICjoQ30buOy j0giZslmpgac49Kt2YoYJCtxfQVQWDup1FYpipGiJHXZkKp9+gM1l9tQSj6+63aSWvV4 xJDw== X-Forwarded-Encrypted: i=1; AHgh+RpGHyg20Z48h+xE1rWtwQoI91x/fdKx6+ONrXhjqCC4tICRVXJdNlQvwpKVzfk9KcF3Kl8D4EBRGfKNAW0=@vger.kernel.org X-Gm-Message-State: AOJu0YzB3x2RQVnBdNYf67AGpBx6j6Hw2wBXB1UTmpLhKSoGJ3nsGYx8 qREqt35vw+yuI8nElIxCPa4M7CJlw7vuTF1lMEHiOQ/nWc21tGxyvrGSkgzIJsPh X-Gm-Gg: AR+sD12Ybazr+PhGMJ7XnVzNKtvmWeyQTLXMiOtflbXCzC7Q6h9jcsDjjuBO+mbZ1pV sOCfLY6k5JbYNKrp7pXwhssFnCA2hQCEyPG69iv5buuDFOinN8LWHgzoPAVjfC8HMnDqvfS5/af 8vOR8X+S+sTpEqHwSHAFhzo7Nq8J21Yjp+/kPdpeXYAqJsz9eqIgu+sIccvsojQ4JeW9oUDhnV3 nlHOP3adrt+Ss6AF7BqRyx2n3tYr7zpd3l/vQ6nsbYwPKUoDM3EIcm2jOhoIbs50ZBpDVV+tZZn 2DK3gS5SnZzIEzZ7ZuMhwMFtCAWwlRbQ+DxcCqnqwo/rcMdhnxSJ5re/2Ow/tMHf/15XMgCRXqc MOQaHU3KKGm0X1mLAUU5n7p81NgYu14tjXzT6Cis3bIphFHMWkXiyVwPVqu6KfggH5X2j8f3tuw YJ1ubuMDMRr3NLM10CQ2CXV0ByAO26Oc2zQJxRXJGutiCuZDmD3OwjOvksIs3/EOYbUN3qtJJLl vhfvmwbZe4yDttWYxZOsClwXOcdVck5Y9qtp780NEbL/8gdpuzC3BinggLv73z/Qxpfow== X-Received: by 2002:a05:600c:4514:b0:493:f42e:1b3f with SMTP id 5b1f17b1804b1-4994e7c7360mr190359775e9.3.1786183101054; Sat, 08 Aug 2026 02:58:21 -0700 (PDT) Received: from OrangePi5-Plus.BB-HOME (20014C4E1B8E20009911270F4BEC2300.dsl.pool.telekom.hu. [2001:4c4e:1b8e:2000:9911:270f:4bec:2300]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-480020be8f3sm13255725f8f.0.2026.08.08.02.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Aug 2026 02:58:20 -0700 (PDT) From: Igor Paunovic To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sebastian Reichel , Cristian Ciocaltea , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dmitry Baryshkov , Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Imre Deak , Ankit Nautiyal , Igor Paunovic Subject: [PATCH 2/5] drm/display: bridge-connector: Preserve max bpc across connector reset Date: Sat, 8 Aug 2026 11:57:21 +0200 Message-ID: <20260808095749.9428-3-royalnet026@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260808095749.9428-1-royalnet026@gmail.com> References: <20260808095749.9428-1-royalnet026@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit drm_connector_attach_max_bpc_property() initializes max_requested_bpc and max_bpc in the connector state, but nothing restores them when the connector state is later thrown away and re-created: drm_bridge_connector_create_state() returns a zeroed state for non-HDMI bridge connectors, and drm_mode_config_reset() installs such a fresh state on every connector that implements &drm_connector_funcs.atomic_create_state instead of a .reset hook. This matters because drivers can attach the property before drm_mode_config_reset() runs. Rockchip, for example, binds its component drivers (which create connectors and attach properties) before calling drm_mode_config_reset(). After that reset, max_requested_bpc is 0, so drm_atomic_connector_check() computes max_bpc = min(info->bpc ?: 8, 0) = 0. Any driver that filters output formats on conn_state->max_bpc then rejects every format, and clients that never set the "max bpc" property - fbcon in particular - end up with a black screen. meson already attaches the property on a drm_bridge_connector before drm_mode_config_reset() and so already boots with max_requested_bpc = 0 today. dw-hdmi's format negotiation does consume the value there, but meson attaches the property with a maximum of 8 and the 8-bit fallback formats are not gated on it, so negotiation yields the same result for 0 and 8 - the change is a no-op for meson. HDMI bridge connectors are immune: drm_bridge_connector_create_state() calls __drm_atomic_helper_connector_hdmi_state_init(), which initializes both fields from connector->max_bpc. amdgpu likewise re-initializes max_requested_bpc in its own .reset implementation. Non-HDMI bridge connectors have no equivalent. Mirror the HDMI helper on the non-HDMI path: record the upper attach limit in connector->max_bpc (drmm_connector_hdmi_init() already stores the same value there) and restore max_requested_bpc and max_bpc from it in drm_bridge_connector_create_state() whenever the "max bpc" property is attached. Connectors without the property behave exactly as before. Signed-off-by: Igor Paunovic --- drivers/gpu/drm/display/drm_bridge_connector.c | 6 +++++- drivers/gpu/drm/drm_connector.c | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c index 632cc3ae3b54..d33c4fc42fbf 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -282,9 +282,13 @@ drm_bridge_connector_create_state(struct drm_connector *connector) if (IS_ERR(conn_state)) return conn_state; - if (bridge_connector->bridge_hdmi) + if (bridge_connector->bridge_hdmi) { __drm_atomic_helper_connector_hdmi_state_init(connector, conn_state); + } else if (connector->max_bpc_property) { + conn_state->max_requested_bpc = connector->max_bpc; + conn_state->max_bpc = connector->max_bpc; + } return conn_state; } diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 8b4baed060f3..0400a6a92e2b 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -2866,6 +2866,10 @@ EXPORT_SYMBOL(drm_connector_set_link_status_property); * @max: The maximum bit depth supported by the connector. * * This is used to add support for limiting the bit depth on a connector. + * @max is also recorded in &drm_connector.max_bpc, so that + * &drm_connector_funcs.atomic_create_state and &drm_connector_funcs.reset + * implementations can restore the property default when re-creating the + * connector state. * * Returns: * Zero on success, negative errno on failure. @@ -2888,6 +2892,7 @@ int drm_connector_attach_max_bpc_property(struct drm_connector *connector, drm_object_attach_property(&connector->base, prop, max); connector->state->max_requested_bpc = max; connector->state->max_bpc = max; + connector->max_bpc = max; return 0; } -- 2.43.0