From nobody Wed Oct 1 22:14:42 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 E669B2BEC3F for ; Sun, 28 Sep 2025 08:25:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759047924; cv=none; b=HZYQBh9KIxVKjJTWVocULz5Pl3Uycp+05Av1sDbmb8AOGcp6J4kOImY9SIpTozM5394Y9E8mRMRt/zjduuTb1LbEX2Bt7FSOVtFw9LdGbSBs5jsTHLsFtDtQWuskLPjWovh0X41CvM3JeXMEhFaB7LGtIm9QCG4AzjWUhJcSHsQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759047924; c=relaxed/simple; bh=L5F+9hmws1ws8sHBg3j3OZgk+hUi3reLwHH9RQ7UEnU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QP0zKwJ6ptLS6QWltrXmgHv4BbRANfNncvHqv7nprsxsHRcyahy2rkBZcioSKBcD/q4/qz9kpy8dwAQYQGcmFpmuJU2b7/wvKsCWA8u4t0Gt+aVJUVwZYSBKA3gP1D3AOV3pMW/uTTLn5TOvcmo3VEcxqnmKgpGNPOSOIYBzbjg= 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=CQwlpWSP; arc=none smtp.client-ip=205.220.180.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="CQwlpWSP" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 58S002Rp014181 for ; Sun, 28 Sep 2025 08:25:22 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= pDGCMgEwnjTnK4X9AKh+cUPiYlJXGC7VErq2j1leXiI=; b=CQwlpWSPQTUYPWV9 T++W2n23NdFXAGo1Oz5z8OuzR4V3TeLUenpqXGIpk6WYUxPrjn49tZT0hSwqL55g J5Xt+JQu5RonBzt814SibeYMkhy+zbJZZjccY4PQJ594iadgVRvoihEd+7fZNr7r jaqGQqHzycvMp1fdvVD3NTjQXQHTPU7+KhjxYZSKu5yOctkUnqfRvpMI1gY9t3/I /kzRaY/Rr/vhFjLdw8XekRdt6WOqYUc0aV5TRNu5KmkaEF4+OFrUsAAYq02hvrKj Zrp/WG2XXIb8D5RIo9Mw0GlfIN0a/GOto/OqkHMWqsE9piZYG1kBl8Me8sGetgjn XX6KrA== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 49e6x5jfsb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sun, 28 Sep 2025 08:25:21 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-4e002f413e4so5278621cf.2 for ; Sun, 28 Sep 2025 01:25:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759047921; x=1759652721; 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=pDGCMgEwnjTnK4X9AKh+cUPiYlJXGC7VErq2j1leXiI=; b=uC7zjLRRLeMLGK5CusbXbebwwbkcJxkuWVDDY7xxq0pXpg+EDi7OfCtvRQP09TosMZ vZkuBzKX0mYx4kgcdkhgV2sDkzS52CsSFeBXRHRnuwqe+IV55q0CeNlB1YbmN0RmOmDj fcDMlONXz8GIYaAX2m88AzybP5QZ4sNGDXYwToJbOfMXeTrCueM/Rpwnk2FqlZztCWws gCbaMfRky99fhRaWGZW15MC0iFyX/oqoVU4RmWw5Wd9PrNbExWc5Ctwr+LLJXrh5hT7e ttKIo3yunQKV1oyv9xMsWxuj+uawj5aW1qYMxXfw5hEgiz+QQRtImN7C1Nlp5JCnf2Ki 6Dag== X-Forwarded-Encrypted: i=1; AJvYcCWvrx0z23oEcX/AxYRzRLh60C2qpxKohv5OdjMyZZuigWqHZQB2LdSAPUtpHn83mhTVuw0XXfeTfiBOSY4=@vger.kernel.org X-Gm-Message-State: AOJu0YxS6+b3LTJIt4GYfJnhmYzhMJddnSM/wieSIDaY7o0utQv8YMEO dHeM9QNlqQc97rOVzhNikJ3mCmFrUp81H4E97iv/25oaLekQuXqg+7+U5cLNbtTP9R7hA8TEXyA u7J+yBlH9NdlsJ7fHwG+b50IBaJVMipo4ffTxatCAZL3rsw/WiFq1rRavZ24D/UZjeUs= X-Gm-Gg: ASbGnct+6U7X9URhnnAOZAx7VBq1yRWHHW6mK9VEjHO9KhxflcCGxqqaB+XqWZzE9vL hr5QNMXaIcRAzMP1IbfEx3W3jnzCSelsXCOKDjNiART7KVSJu1bJ/SvtXCZ2VUYeWhs8E+g9WK2 mitZocfJpLUSmIOwujJVNZ7XtOn0MznmytnzOVTDhc3lfesJKOKl3bhqjxj7P/q/J0JE+T/HVAD pYqb+7luHQhT3AxFmLOPMJnSzTSP9C86HqR8z/fJT+8+zcTzZitIBvo9OBK1tLMNhNhA8zYJvpN 4BKEyu9tb6XdS9JCfgD/nv4uuAgJYNboiid2pk11RS0FeSgM99B+GpTOa26ehb0Wfrp+/ve7AxK PEm1Y8/PG3unIkRzdjMVITmChFRsW626NSEi+YTaJlu0ADc7QOxe0 X-Received: by 2002:ac8:7d8e:0:b0:4cf:6b60:8814 with SMTP id d75a77b69052e-4da4c39d551mr157223541cf.70.1759047920641; Sun, 28 Sep 2025 01:25:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEs63wvjlOp3xMxlD61SlugRb128ix3vSdkzbHU2oqtBagfbingC8Ut4nFepJQEg0y1xF3nfQ== X-Received: by 2002:ac8:7d8e:0:b0:4cf:6b60:8814 with SMTP id d75a77b69052e-4da4c39d551mr157223271cf.70.1759047920172; Sun, 28 Sep 2025 01:25:20 -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-583166561c0sm3244298e87.81.2025.09.28.01.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Sep 2025 01:25:18 -0700 (PDT) From: Dmitry Baryshkov Date: Sun, 28 Sep 2025 11:24:53 +0300 Subject: [PATCH v2 8/9] drm/rockchip: inno-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: <20250928-limit-infoframes-2-v2-8-6f8f5fd04214@oss.qualcomm.com> References: <20250928-limit-infoframes-2-v2-0-6f8f5fd04214@oss.qualcomm.com> In-Reply-To: <20250928-limit-infoframes-2-v2-0-6f8f5fd04214@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 , 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=3208; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=L5F+9hmws1ws8sHBg3j3OZgk+hUi3reLwHH9RQ7UEnU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBo2PDU9uR0Y3DH7A3+x8geiLghZLN7tPC7B3SOj e6zCefBhf6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaNjw1AAKCRCLPIo+Aiko 1Ru6B/9PE+eUbg3q9YXlFXZd6EPBBkP5lZgICQEKOE0FuYIcvp6aqj8KRAYaSBf3nOEsYkh6Cmv izDSG7gqnOYbJtZa1DBmYqSXwcIYU9x3PqJtOca9yASpRyYkvVH8b9c8vz/LfL2SFkM0iWK3/HE oPq0/r5tSjjrJ9u5/+s1evNujBe86ROuzIpMMbVVTj5U9sJ0LQhBHpdBVmwkbN9cfVxuaUmhUo4 +hHRrX+QqJ0qvxolviQQVzyaLLE7VuP4ZbG/H5NauVJRDGd6YUABlNx7xw9adhsUxwugFv2UAs5 CL2oRovfS/3sNkx1Xb25MSdesvX4wPFuG9Dy5chHmg0qOIxr X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: hJ8VoHRqmv5HAof4g2k4hxtLkv-TA7ud X-Proofpoint-ORIG-GUID: hJ8VoHRqmv5HAof4g2k4hxtLkv-TA7ud X-Authority-Analysis: v=2.4 cv=ZtPg6t7G c=1 sm=1 tr=0 ts=68d8f0f1 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=EUspDBNiAAAA:8 a=Uj443JZPoyhSIAxeSSAA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTI3MDAxOCBTYWx0ZWRfXwzsi+9veNWxB uRzobJ6py7rbmXtD4QNiZTWAs4FBuCLrsxubJMEd9tURFzxvpv+UhK7LfWg2mXZm09kzhCyKeiS jsJMI42hk8XmU7OLspBF/npHY3iyjjhRmnSAqjZxlcyEJL2+OtfZW03TjE+teyW77YKKZIsN1JR x7jijplDTRB0Z20ppqcBNTi62WIoTF/XHmtX7z9MiEmKm1wnMu4j/u35vXqP/NV3kStUF7yubeJ GfHJswJjen+C5wPnp8cf/q1luzqn2wYZUqCqSz+go3Rk7GTnhaTm63Kml8dD2O8cXdoMdfk1oqt iLgV5R/lfSpm1ftBVtIUAM+wHw22lphdRjW5XroP3qKb/euvG01mW091Ow+DeUNdvWjaQsEzM+M nrdtWLPUa1YtiYnK8F7h0nFtVemMkQ== 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-28_04,2025-09-26_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2509150000 definitions=main-2509270018 Make write_hdmi_infoframe() and 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/inno_hdmi.c | 47 +++++++++++++++++++++++++++-----= ---- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index f24827dc1421cf5e0c1be63a80da23d645cf3f24..733294c6807da4663285ebd4821= 81589c37f960a 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -641,13 +641,11 @@ static int inno_hdmi_disable_frame(struct drm_connect= or *connector, { struct inno_hdmi *hdmi =3D connector_to_inno_hdmi(connector); =20 - if (type !=3D HDMI_INFOFRAME_TYPE_AVI) { - drm_err(connector->dev, - "Unsupported infoframe type: %u\n", type); - return 0; - } + if (type !=3D HDMI_INFOFRAME_TYPE_AVI) + return -EOPNOTSUPP; =20 hdmi_writeb(hdmi, HDMI_CONTROL_PACKET_BUF_INDEX, INFOFRAME_AVI); + // XXX: this doesn't seem to actually disable the infoframe. =20 return 0; } @@ -659,11 +657,8 @@ static int inno_hdmi_upload_frame(struct drm_connector= *connector, struct inno_hdmi *hdmi =3D connector_to_inno_hdmi(connector); ssize_t i; =20 - if (type !=3D HDMI_INFOFRAME_TYPE_AVI) { - drm_err(connector->dev, - "Unsupported infoframe type: %u\n", type); - return 0; - } + if (type !=3D HDMI_INFOFRAME_TYPE_AVI) + return -EOPNOTSUPP; =20 inno_hdmi_disable_frame(connector, type); =20 @@ -673,6 +668,36 @@ static int inno_hdmi_upload_frame(struct drm_connector= *connector, return 0; } =20 +static int inno_hdmi_connector_atomic_check(struct drm_connector *connecto= r, + struct drm_atomic_state *state) +{ + struct drm_connector_state *conn_state =3D + drm_atomic_get_new_connector_state(state, connector); + int ret; + + ret =3D drm_atomic_helper_connector_hdmi_check(connector, state); + if (ret) + return ret; + + /* 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, audio support not enabled */ + if (drm_WARN_ON_ONCE(connector->dev, + connector->hdmi.infoframes.audio.set)) + return -EOPNOTSUPP; + + /* should not happen, HDR support not enabled */ + if (drm_WARN_ON_ONCE(connector->dev, + conn_state->hdmi.infoframes.hdr_drm.set)) + return -EOPNOTSUPP; + + return 0; +} + static const struct drm_connector_hdmi_funcs inno_hdmi_hdmi_connector_func= s =3D { .clear_infoframe =3D inno_hdmi_disable_frame, .write_infoframe =3D inno_hdmi_upload_frame, @@ -1029,7 +1054,7 @@ static const struct drm_connector_funcs inno_hdmi_con= nector_funcs =3D { }; =20 static struct drm_connector_helper_funcs inno_hdmi_connector_helper_funcs = =3D { - .atomic_check =3D drm_atomic_helper_connector_hdmi_check, + .atomic_check =3D inno_hdmi_connector_atomic_check, .get_modes =3D inno_hdmi_connector_get_modes, .mode_valid =3D inno_hdmi_connector_mode_valid, }; --=20 2.47.3