From patchwork Sat Sep 27 01:04:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 937 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 BBDDA1FF1A1 for ; Sat, 27 Sep 2025 01:04:48 +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=1758935090; cv=none; b=noy3Vr5Dnm5Y3FSN/Qvu6Ss0H5SyUehjKKV8TzSQIplMHNc0piOszPNtsfsA6bDiYnwfcbc7nD5cPrPcLKQvYQ8pmm9Pm32Ud9jYG485tL1Yys0d+m3P6B51U8E1rbE2VGqL1QROz+DY4j/xxtFu6pyOEfA1Ba9pTIi01x8vJP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758935090; c=relaxed/simple; bh=GDJs9stizfNvb2WVbvQCEr8SONIYHFgwY7yHLMQGSzY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=u/0nvalrnQgRA6qaid1JJ1kB2zao6BTo9UclRM2+r57ulVyRCF4RCBJ98UI79Ukiaueydm/wAuDNnBBnc4DlcauKdC+XFCzv9K1S5t8SlseAbOj/LHZqGc1epqfZkwFdaWgtaKoztP7xW3oyh4AyepbfHRQSuOGoBECKNJn8qUQ= 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=iB0NPyKz; 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="iB0NPyKz" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 58QEX0iw012763 for ; Sat, 27 Sep 2025 01:04:48 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= KHBvbs6wVCtvxZAx2wHIzn0cwgfPtQSReWo4Noc9O+4=; b=iB0NPyKzQp9RO4/b NiUXUNjL95SnD6VCYC2k7DHEXwm+tErDbCYYEpxZk1PGBnrfOt59d7H6g7nRmYoL BmNhvjHiVdK5EQ7VMkDkLu1MFx3iMTtnUVcyOjXHy1S1KceI/8/zJim9fzkkXSxz 9Heb2J2vhyGp3HaFE35jg+nhzBles9TZ809gOX4xZ62XfO5nweoxK6mZfHlQTqiS /8Lk0vJn/Ovja2ENhnXLkTeWkzfbe1jQpc93dZ4Q9ZYgM5WfpYG2XXPGl8/pHH7Q Lf/dfoi9jcixGh95tqcKkkTLSvfxoF/n/ARMhqiz3JCqI2kGNEAlPKuBWewgPWAf miLiaA== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 49db0q4gpn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 27 Sep 2025 01:04:47 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-4de53348322so35845621cf.0 for ; Fri, 26 Sep 2025 18:04:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758935085; x=1759539885; 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=KHBvbs6wVCtvxZAx2wHIzn0cwgfPtQSReWo4Noc9O+4=; b=ouJ9VIdHxblXO58Hlg5VX3/zjPQXwNBeH7NssFTVrqItJ7mravhL7mt3NwmmcNBLyk JqhmdXq6v7mhTK14UH+TtR9VG2f5tXG4s5aHQmm0jrd47R9z4abr7KdD0rj04xd5DCuF n2Ik5ysqNCmhejZt5jwDysjXxnePHli51p2IUvMPWmmI0Iac24j97ivDcWQQIFxDjAyA eY871edPFDD48HGHamNpL75lbwtzE4OruVNnw9qmd8ilDFl/hpo3cc8agik+Ecki/vFH tvmCAttCi9jxx0YMlBDMc1HxQJ9qOBwEl5orBe/tS1MdVd2ti/JtRVJ3E/LYJujApSJS +eoQ== X-Forwarded-Encrypted: i=1; AJvYcCU5rUAaaBjMJB53QSKn90r08bpF+ysRChOE+f7iyuByRiAkfbDLtMmqYMlvFs85iFIqLSVOsLSW/X8onA==@lists.linux.dev X-Gm-Message-State: AOJu0YwbNhDXaLtaPZ8KhohX11iAa5SMNEK7xmRty5odR7IMfvgzhuVl w6eU8TcT5JQ4WqNvYY+RgYlmmQAd5VtyiAtIJRGgLn8EdJ/diP45hmnqysNQf5cHkzuVU1F9ZDp tWkVyxIZihKjdo8y9ywm1eeO6sW3xLF6r2L+e63Vo/2bq1bZBGzFqG7ZP0nMlVAMwKw== X-Gm-Gg: ASbGncvClR/cq0W1jekQTX/8nq2+bp2ZWbLwXumzasz/zwgTEmVPTtrpp5VJIFpHVZi ZymZCPohZmy/o0j99Fbh6Fb17Hxab6avAG4hlD+zcHuYJQiNBpQjqpRYtOD2PWqHvP0uEG6TTnN bMjD22Lkw7Vkch/gMiBHOu+JC9THs95Tu7dcgzPXP+BFve0ZnMOBus/UduKEFZvXPpbzhcziY6N FYDhWuLl5i81RErrR00NUT/BfDfTAGri0LLu7sA+GoLF9cIJWGNyJnGIHeRwQxLCfYHP/+SAZs/ hmnvZZjyCcSCaJGPzWjknC5tlBowIufeqtYdnOvvYR9PaDKIm/ut5d4WnWZRy2dGcQsUFqo+zL2 /LkSTJ4Hl9wQKDdjVBCXOXMbS/EtQyeaUCEhwhTcGA6lKl6OwGmxj X-Received: by 2002:a05:622a:1f09:b0:4b7:9f68:52cb with SMTP id d75a77b69052e-4da4bbe54e6mr141708311cf.54.1758935085187; Fri, 26 Sep 2025 18:04:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGDgxekAFYTmTTqmCZefeEPl+nSUzBiwY3LbANe6dbEILxpaj8AQRwYb+0/9qkitC+FpZtBTQ== X-Received: by 2002:a05:622a:1f09:b0:4b7:9f68:52cb with SMTP id d75a77b69052e-4da4bbe54e6mr141708011cf.54.1758935084695; Fri, 26 Sep 2025 18:04:44 -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.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Sep 2025 18:04:42 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 27 Sep 2025 04:04:31 +0300 Subject: [PATCH 2/9] drm/bridge: adv7511: handle unsupported InfoFrames Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250927-limit-infoframes-2-v1-2-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=2270; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=GDJs9stizfNvb2WVbvQCEr8SONIYHFgwY7yHLMQGSzY=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ8Z1C4WwP9P/BahfUM7J/q38y+eoSdQLBoWi9c1+S95+v sn2RUOjk9GYhYGRi0FWTJHFp6Blasym5LAPO6bWwwxiZQKZwsDFKQAT4f3B/k9v8b97bhIf9U8U rWn0L+vfdMc+z9ONLZFtWkd73NlfAtP52OZ9fr5zUayhl/rpazf/lhyvCPNVZLlvN2eaaEvRF7t M/RtdPk8PKW1gqT8RmhWS+fDiynlZNom/N/mnfeTKCb/hO+Ovzualbg1512M7InnKQ/p+9Qde6G vR8O0/s95ngpGb24U5mc0Vz67N2jhbrCcgpqDGsn7ZwbCKYleeUzyFj/lDhBTmSYZ5q75Wjt3Kf Vk1o2NBbWNF/IerWYqvNVZvzdWLWtXKv+is/+R5LVFN5o8X7kjexSmg+/brZ5PqSs5HffbavMEZ q1zs5186cY/dRH661Msb39SCc6bVOgZ0nkowVN1rOv0iAA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTI1MDE3MSBTYWx0ZWRfX0iNIMQjH3O0q 9Byz4wHEwjHWfXFqwNAf8FUcpXVp994kGTom1SecqQJMBwlWXDNSW/T+7q+1YWeoh/DLf5LQXff StEoj9PWKaDJFycBccTxw9pUVpxWRhRwfAEGa6pTI9p9AZt2qREa6Dek2OFqcgtgT0q/Wf376P9 U1BRkOHN67/zhQ4rNRh1rqwQXH7G6+C8kJLCtPDKLV2qSPdT4W5B+3mobQdQE0zEW8t/Rh20+ZP q8MiNRok68UMM+mIrxUJUb2H+HahWR51l90WEeaHZx9ID6S8ICVjAw6btFyhyOS1pGHfywWiAhG rYU2twxdEUxqdvr3ozlWuMAtzFWItY5y2Cxe8LPrJpJbWOGcW+KmeAy+j8C3AFMV5UI+uN8plIs //dJtMX+Ejj2W42PuNd23S4ppaFSBg== X-Proofpoint-GUID: uWuR7GygMqFM6LGiaJfa4ge2mFSUwIfJ X-Proofpoint-ORIG-GUID: uWuR7GygMqFM6LGiaJfa4ge2mFSUwIfJ X-Authority-Analysis: v=2.4 cv=JsX8bc4C c=1 sm=1 tr=0 ts=68d7382f cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=EUspDBNiAAAA:8 a=XNEcMcDYeHr5uxMbIEwA:9 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 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 suspectscore=0 adultscore=0 priorityscore=1501 spamscore=0 malwarescore=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 phishscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2509150000 definitions=main-2509250171 Status: O 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/bridge/adv7511/adv7511_drv.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index b9be8654130758e69ac7ccbc73a82cc25d731a5c..452265c2d81269e158c83850279a3a58302faf03 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -906,8 +906,7 @@ static int adv7511_bridge_hdmi_clear_infoframe(struct drm_bridge *bridge, adv7511_packet_disable(adv7511, ADV7511_PACKET_ENABLE_SPARE1); break; default: - drm_dbg_driver(adv7511->bridge.dev, "Unsupported HDMI InfoFrame %x\n", type); - break; + return -EOPNOTSUPP; } return 0; @@ -966,19 +965,32 @@ static int adv7511_bridge_hdmi_write_infoframe(struct drm_bridge *bridge, adv7511_packet_enable(adv7511, ADV7511_PACKET_ENABLE_SPARE1); break; default: - drm_dbg_driver(adv7511->bridge.dev, "Unsupported HDMI InfoFrame %x\n", type); - break; + return -EOPNOTSUPP; } return 0; } +static int adv7511_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) +{ + /* should not happen, HDR support not enabled */ + if (drm_WARN_ON_ONCE(bridge->encoder->dev, + conn_state->connector->hdmi.infoframes.audio.set)) + return -EOPNOTSUPP; + + return 0; +} + static const struct drm_bridge_funcs adv7511_bridge_funcs = { .mode_valid = adv7511_bridge_mode_valid, .attach = adv7511_bridge_attach, .detect = adv7511_bridge_detect, .edid_read = adv7511_bridge_edid_read, + .atomic_check = adv7511_bridge_atomic_check, .atomic_enable = adv7511_bridge_atomic_enable, .atomic_disable = adv7511_bridge_atomic_disable, .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,