From nobody Wed Oct 1 23:35:02 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B85D5221F29 for ; Sat, 27 Sep 2025 01:05:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758935108; cv=none; b=uGExHl/KCZ70IQ8d1a4B6xbd+djI0VeBTU1EB5jaD+l4IMgQ4rWDjQL8dd12+3fyTG3syLInqTI/IRG4hD4gG/4eCNZ9HUYgVSFxjsMyuKaYctNCbRIlw/D/x6x6msJAo9JRUxjtGuzqLIIb1w6doaubIdMgUTeRvCanlL4OBs0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758935108; c=relaxed/simple; bh=SRdsHNR0LO/SljNP2tmHd0np6D3Jw2olFDYhbWhBuVw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pYx6h4BAHRp68wZfXWST4tA8/wtAL2QcFq/+WdCocovvfi6q7gQKMGsmxL24TkAc9ZODgB37cT/pa58SHzHH7tFuYmEHYul6uYar2WUieGtPXIEgPIJ5V6kt7g8LlrPeTjNr2eOyGtVGkcPXaVwJi/DwtP+k4/oGi53qqhrMNKk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=QDi2iJBm; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="QDi2iJBm" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 58R0QoM1027886 for ; Sat, 27 Sep 2025 01:05:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= l1ReRpPqrVzS8dYBiuFlXpsNAUSjSC7vdxG38yy4lOA=; b=QDi2iJBmOAe289bu ESavkYGg/aib9Lmi4hEjsKBuz55srjSA/nH+EQWD/o0RpTB4LmHnG+WlT2dECr2c 7e3Q+8YlCBiZV8X8OFeXh9WeAB8nSENYypTIHGecs/5uNAYH+wJktkJuNz0cAiZ3 uxtn8HfWJ4d13s8O/1/qw0X2IkKnFpu5ip0PgspkD8Q4wkAjrupE2l4jmk2QeAkE 7xz3t4E8QQ+8nPaProcefTjG37VaYQSO1Yr4yoiytjvECdW7ztDMm/SO5IrAi74X JJbTzGOaBYsbyG7D0YuiqahtW3ZRIkwsyPJdTlQq1p0jUSVJcvIjQeX7HZXOi1Yv J6zJ5Q== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 49db0rmh9x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 27 Sep 2025 01:05:05 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-4d6fc3d74a2so79268621cf.2 for ; Fri, 26 Sep 2025 18:05:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758935104; x=1759539904; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l1ReRpPqrVzS8dYBiuFlXpsNAUSjSC7vdxG38yy4lOA=; b=F0GEkWmGd+6khb1efjmfu70M5zBASi5Hhc5EmEwKDA+2bor5OgI7oVSbCZV3DYQPxU YTbNT6cTVGBVPqzfpKzpxdwLeLdelR/VDy6ZNnpag6WoJXCvFl+4KvBKNkAkAv5B+ND4 qAGzd1iDQeXBac/ts+Z7QqdFG7bN56nWNl9fQBP1tKDofffxErN1ulo2W1BXrZW417TE RdGpepigwcUhgEBXQ7iWPVe8Z0cT9gUb2k1BFob7mDQMg62HrB3NkTyZlAIK0HUlVOMe 2ew0jaYtQglOIxnzsi580wykfllotArjauCwv+L3AU5m6N37/iVzxaTpNuhgmTXPYK3p rM4A== X-Forwarded-Encrypted: i=1; AJvYcCW6vvYP58gyHX6PHYOC0y3Ex9u7/azjYXZJkwoYYzjHSydK/CO1lCRZxARQPx4SJL/M51FqFQN6M1OtuvA=@vger.kernel.org X-Gm-Message-State: AOJu0YzMC+1ZIJ5BoW9DTUgciMmUHT26MCwD/NvFKc4av7Zir17E4yl7 MwrHSBdFVUjCllVF3jQPhRYj1MBKprR5x2J1Wx2CyZUAz94IjSULxsxQl99WsnLn+iKE37W9Ear 0+ZEkaEiQIRWrOU355hV7nYC+JFcBSNTJkpZiQKM7XFCMS6c5TKmZx97+MbkDDHDObF0= X-Gm-Gg: ASbGnctecqhtMxk6G3cuYWwRNw/zlZYuMVzQN2g8oTe8qHpGB03kNJt5TSX/zmZQS/3 YENDXVCNGYu2Vh+84XHtwsbAvvycUwpjRPz8/bpGLUw6xpHTYEN5rB+VPI69y5W8mPie7mYUZ9F ms0VkI/a3wTqqn8uXyyVOouPRba9C+zyUlY/v+BRYQObxO4/rM03OhdrxwBGWMMuUHaxbuv6zOc kToQ5z2WFAeqltzjmeJc5f41OQxXTAb6c22neiCYp8ksPKCUsyw3M3c8EdxomUzSZvJ1OgqzjL3 P9gw+Eu2ucIyrrG94sNc1KFJxCp+HvqvJl5qe3fBNSZFwJIhrof5/PrjyaXE9YBwUNyzlsDOD/D lmXRmz2nyX0LbWTx2TIxAoauQWq1nZjYI2wvBBPGpspTLorajT1MX X-Received: by 2002:ac8:5852:0:b0:4b7:9743:6da6 with SMTP id d75a77b69052e-4da4d02b61bmr114903791cf.70.1758935104406; Fri, 26 Sep 2025 18:05:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwTmhqnyjZFBwp/HsFiMEBnuWPK9YLUS4DPznVcdyQv+I6YogfCDp6AQn+3SRx+7bfeXBXfA== X-Received: by 2002:ac8:5852:0:b0:4b7:9743:6da6 with SMTP id d75a77b69052e-4da4d02b61bmr114903571cf.70.1758935103968; Fri, 26 Sep 2025 18:05:03 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-583139f99c1sm2156143e87.35.2025.09.26.18.05.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Sep 2025 18:05:01 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 27 Sep 2025 04:04:36 +0300 Subject: [PATCH 7/9] drm/rockchip: rk3066_hdmi: handle unsupported InfoFrames Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250927-limit-infoframes-2-v1-7-697511bd050b@oss.qualcomm.com> References: <20250927-limit-infoframes-2-v1-0-697511bd050b@oss.qualcomm.com> In-Reply-To: <20250927-limit-infoframes-2-v1-0-697511bd050b@oss.qualcomm.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Liu Ying , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Chen-Yu Tsai , Samuel Holland Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2953; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=SRdsHNR0LO/SljNP2tmHd0np6D3Jw2olFDYhbWhBuVw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBo1zgg5I6HgovfGNCnJrr9DZzOmlvr89IG2N7Im J1IzAHqkSqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaNc4IAAKCRCLPIo+Aiko 1QseB/91TXFBZi0pEpfz77geu/ZrsROvcW7gOnMXI7ySzBuNlQ0kbfHKfrR1hUQKrPiz+7O3Jyt NG+3ogi0SSqQIhJWGu8FsrNLkhtixlNgVerOl1ZDM2aZ+xSH870nIvmmE1uPJey1/Za9yRjxka1 kIELmhbciVh07+E4ejIJiDgMU/A1ybNMwnRww/7ZFXo5VNDJ4bE6RrOn9IdGr79W/444T+7Whog LSCWgGHlVq4g2bQ9RmPH0uGaOYeFpNQu57k5KoEvnqJv1jFMj7p/dAs8EyfS3UCh6z6w+UvR3Lc oq2InUo+uryQ5zZYarcxA8FBAO5BnW4QIvwhKBX0jSUfxpty X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=dP+rWeZb c=1 sm=1 tr=0 ts=68d73841 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=EUspDBNiAAAA:8 a=XNEcMcDYeHr5uxMbIEwA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-ORIG-GUID: i_UkpJ-h41lNkCUYhq6AcdM1B_nQ7XxM X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTI1MDE3MSBTYWx0ZWRfXwIEJ7NdTsY84 By+jHUd2b7+gz4mrSWiUqDofN8+sk4FGNwl3WdRfw0NNcymy7V9yc7eghOJxfn2PwcWjD44zDhW BE1NRbfnzHemaKGJ75dxLlSWuNC/F0ZEwDqPRCpRktKB8u5hZ7FWswss2/s/EWHLrdzQQbHdpWB CjFAXxOZeuzdiLKIJ9Klz6sMBsYC6djYvEDFbYxj+T11ZCBvaq0XB/HaQ93HbZ+gWCoIAVESJkS n/zWyTwXhQo13y8bp2xpk2Ojt0ftmDhACyjKOwEmW261xrNrmppXAr0caN04Sf3jKUXF7maiNj9 bokcmdRhaKRxpcpQ6V7viYgwrF/I2xJjWw4/lmnYqFjYzeuv7LDpAPdhaj2sNc+9Suvsb2gwr3Y siWE3Zs5Vt+ybSyXrjt6fSfMwtmwgA== X-Proofpoint-GUID: i_UkpJ-h41lNkCUYhq6AcdM1B_nQ7XxM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-26_08,2025-09-26_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 phishscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 suspectscore=0 adultscore=0 bulkscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2509150000 definitions=main-2509250171 Make hdmi_write_hdmi_infoframe() and hdmi_clear_infoframe() callbacks return -EOPNOTSUPP for unsupported InfoFrames and make sure that atomic_check() callback doesn't allow unsupported InfoFrames to be enabled. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 38 +++++++++++++++++++++++++++---= ---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockc= hip/rk3066_hdmi.c index ae4a5ac2299a93a49f87df7604752f6b651c839c..cbae27e2443798d62bd83acc8b9= 79cfc34df3544 100644 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c @@ -162,10 +162,8 @@ static int rk3066_hdmi_bridge_clear_infoframe(struct d= rm_bridge *bridge, { struct rk3066_hdmi *hdmi =3D bridge_to_rk3066_hdmi(bridge); =20 - if (type !=3D HDMI_INFOFRAME_TYPE_AVI) { - drm_err(bridge->dev, "Unsupported infoframe type: %u\n", type); - return 0; - } + if (type !=3D HDMI_INFOFRAME_TYPE_AVI) + return -EOPNOTSUPP; =20 hdmi_writeb(hdmi, HDMI_CP_BUF_INDEX, HDMI_INFOFRAME_AVI); =20 @@ -180,10 +178,8 @@ rk3066_hdmi_bridge_write_infoframe(struct drm_bridge *= bridge, struct rk3066_hdmi *hdmi =3D bridge_to_rk3066_hdmi(bridge); ssize_t i; =20 - if (type !=3D HDMI_INFOFRAME_TYPE_AVI) { - drm_err(bridge->dev, "Unsupported infoframe type: %u\n", type); - return 0; - } + if (type !=3D HDMI_INFOFRAME_TYPE_AVI) + return -EOPNOTSUPP; =20 rk3066_hdmi_bridge_clear_infoframe(bridge, type); =20 @@ -193,6 +189,31 @@ rk3066_hdmi_bridge_write_infoframe(struct drm_bridge *= bridge, return 0; } =20 +static int +rk3066_hdmi_bridge_atomic_check(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + /* not supported by the driver */ + conn_state->hdmi.infoframes.spd.set =3D false; + + /* FIXME: not supported by the driver */ + conn_state->hdmi.infoframes.hdmi.set =3D false; + + /* should not happen, HDR support not enabled */ + if (drm_WARN_ON_ONCE(bridge->encoder->dev, + conn_state->connector->hdmi.infoframes.audio.set)) + return -EOPNOTSUPP; + + /* should not happen, audio support not enabled */ + if (drm_WARN_ON_ONCE(bridge->encoder->dev, + conn_state->hdmi.infoframes.hdr_drm.set)) + return -EOPNOTSUPP; + + return 0; +} + static int rk3066_hdmi_config_video_timing(struct rk3066_hdmi *hdmi, struct drm_display_mode *mode) { @@ -485,6 +506,7 @@ rk3066_hdmi_bridge_mode_valid(struct drm_bridge *bridge, } =20 static const struct drm_bridge_funcs rk3066_hdmi_bridge_funcs =3D { + .atomic_check =3D rk3066_hdmi_bridge_atomic_check, .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, .atomic_reset =3D drm_atomic_helper_bridge_reset, --=20 2.47.3