From nobody Tue Apr 7 19:50:36 2026 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 63B4D38D6B6 for ; Wed, 11 Mar 2026 20:17:39 +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=1773260260; cv=none; b=T1jRQAutuzc5MFYkXb+7baJLyXHpEtJ1JIRxEmQ9aAoAjS2qRHImMMqfH5LnElxukMvgBlm6dIJWVsNguUaoNXpz5Lg6IrV3mpoy026hhtocNWSzy8hh7iDTC2QqRUx9v5TiFCP6m/xLFwy3gFJZU+ou43/8EVt3ppOz9+Fry2I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773260260; c=relaxed/simple; bh=SuIG30M1F+1ELAgyd3DfPWYTVsyJfh1hmHgcFeXxAaI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UneEkzs5mGut4zglDXEMkASfMNEG67q22ura26hn8YGyEMrcBkZJAtesIqOKIGwdYPujBhlkpq+YpFYRqG5NQyrgMawpGrqfGEnt+CkJuzW5T1FM9HEHNZEARKREBIbATckg8h2f2LxMCcv7SyD6LuUeJX2milz5+0StTEm48Qw= 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=TRG7rJ5r; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=g/+3FaRf; 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="TRG7rJ5r"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="g/+3FaRf" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62BGF2YH294248 for ; Wed, 11 Mar 2026 20:17:38 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= mb9TySrdLQeg4V7+6CbzFDqF2iSwdySFtwsh9Sd8kL8=; b=TRG7rJ5r28nbWiLn ihCWjTY9RUJtvjX9m4N6T+DAnwSRiX+49opCFnphhJgjHcjlBmI6rC7ZgWEpCjGE 1D/RAiCqe+ae7YWzVh9RLG4R0oGNcHc9ixHXXIykkVVdhkRUDi7gaFArCYFSc/aJ UCPU9pdQkP53hpgZnNeghpzgZowPmYgqvEdjUPxSXd9PGGd4SHUcobwnnaXUXPdd GZif4Qm6HuY9xKBrnTiOnPRwkdnPEqaei0pxVkFqHyLfnGExj1y+k1t2jZcATYWw MlTaxCGmiCxXg4PTh2I7SS8/PJGZ2GGpw/2Gzffc9wh2XhBYa4ZOkW0pdLvEaHJo 9wv3ug== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cu6bba4sc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 20:17:38 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cd722c1a69so132478785a.0 for ; Wed, 11 Mar 2026 13:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773260258; x=1773865058; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mb9TySrdLQeg4V7+6CbzFDqF2iSwdySFtwsh9Sd8kL8=; b=g/+3FaRf7LSO/SNBHgIlxkG2RK+vqYEzqwE89e616mVbdd239YGUlVB5H2SRmZ9GJl I8yWl/lcb/IYHPsSnzmch2InxyI2oAD2PjrSJaZ+DQfe0NseqGRTsA1EEV0enFhBiDC3 qEbo2IyuM8jA4a5uTybTpjMHvDmnUuPA+cQvuBqZX5SSYqZaaFNx+zA+upn8kkhMgKxu 38szcugcej7d3+1HM1mSBuUKVc+rxS4qBNB4obgM48C6nsAAaTPBb9+a4fh5BemdGtEl AIwRhW2BfFg8x7mbIC7Gv8mBbyMIEyk7gFeKNeSDIOyIejlKLDx/Rsx6io49lurly+OS rLPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773260258; x=1773865058; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=mb9TySrdLQeg4V7+6CbzFDqF2iSwdySFtwsh9Sd8kL8=; b=K2mQyKa7p/NVOFO+Yk9N/sqOl0Tmi67SE4xCH9hlfBuFldf2HvETIM4LFG8EKFVqTq mfoxMEHDlM5NA37BoyE44PN3Qjjs7WPjMTJSpHvl2Uy0aHxPDspYudkDbqAbEdxB+Wyh /k8fxwEIlPxDjfBkyzZnhRllczuAEHiuB51ixZnH7zFhVEfoAcrFmfnVr3gzGsHjyYhJ 7BpKJN4o3yJJN0WfYBSII+vC+5fR8ALr7L3z8DNs9/PDeFXvAslVj1XT7LSO4FC1rrGA 8kvJbVi7qn0LScBMsE23svVHVmCWFQ5xRkQ1b0GjBAAdw3ane0lbLxRjPiueXfl37a9a 998w== X-Forwarded-Encrypted: i=1; AJvYcCXJGZVURq2hz1gRyRldaWhHL5VHvLubo6LaQ8u8ug1quvTebkM1UzFmUO36oY1WXht0nM6KCSfofen8xds=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0yRBtcB5Rf9RxlaYWi5Gka/WsS2HleytuqHRsDaRYP1+ppmwI kk7ZLZ+Vfw1bxssofFu0f06qgs1ZZgT8nIHe23lzmxKdHcfpMuhsfoWOLmLQ2CNxi2/kQ9wjBSV +rP/x8Sd5JKHLZEQ+8ciBPrdGxQ+1WJZ7ddQzCiMTZLSlk4dQ5QLaOCAnrpu+tksjLWA= X-Gm-Gg: ATEYQzzcxQLILAQBcbHidgqteed3015v5vJ2uJiS32HVbipoQ8Ty6zn9U0yflUgDZkZ LIW4Xf1vew6wl23DErk/ne2eAP9Qrab7nODbiyAAjeOR5i1b6FTcyZyzKTI3iuMVrr1p4ECvwl8 opoy6DC2ovE4mt4pb/Yx3nIsE3xF6mawA3vzYb9UqgBzw8bifI+n2sqLeVvUcnm2IMHsRzQbeaH lEX8A+xwFBg7n+5eOGCCYd9yh35KzrklAESbnyb1zBSGmOYNLJr6D8MhcjZYsNlllAS0t6/t5rK 3l/RpH/SqpwGKteHq9Uwey/dnmVBGYNsJXqcDQ3rewocuOx9nh89hqt+03tbFvE9s1WH+JSedBk arPr3TNpFSpMEpat+/EjmHJw8pUQ5pBXu1/Rq6P+QEfYH X-Received: by 2002:a05:620a:31a8:b0:8cd:91b4:8225 with SMTP id af79cd13be357-8cda1aa47c8mr569400185a.40.1773260257744; Wed, 11 Mar 2026 13:17:37 -0700 (PDT) X-Received: by 2002:a05:620a:31a8:b0:8cd:91b4:8225 with SMTP id af79cd13be357-8cda1aa47c8mr569397485a.40.1773260257361; Wed, 11 Mar 2026 13:17:37 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b65fd3dsm79257255e9.10.2026.03.11.13.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 13:17:36 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 11 Mar 2026 21:17:25 +0100 Subject: [PATCH 1/7] drm/msm/hdmi: Simplify with dev_of_node() 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: <20260311-drm-msm-hdmi-cleanup-v1-1-c5535245f6de@oss.qualcomm.com> References: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> In-Reply-To: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1248; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=SuIG30M1F+1ELAgyd3DfPWYTVsyJfh1hmHgcFeXxAaI=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpsc3XesVhtgT5ZKH68ke+cEZ1kNtjE9iAbqLpP 8CQbzxyVHOJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCabHN1wAKCRDBN2bmhouD 10r8D/4iaIi1RnpPmRnl6o0Bhqlb3a9HonKYDrne8s5gvD2jT16wX0d5s5lDy+59NA1Qko0WSYg TWOpPDJUTWFeopNuSWo0kwPRdWZGIMOSflf2CCShlr9Lna0XFRQJABSvjn9qxe6QdU/2WHAfkgl B4vueIUd7A3Dhyb+9lxaR5ubm3tfNDQ3atZZ0T2XjAUen9ffZr+cRIQo9Dmugz+9ZSIK3q81IeX 95pnn7UXwmKYjJYX12Fg7yRjs+2D8FYitMpnjFGYiskP1FhzJUtZZg3UAti/tySibOYyvJaNut1 aNgR0PIskwWjlJp4YV3BqGY/LP3yN1ipxnhrHG5uHLGjnP0B6VePIDFA5sTkUy2+6ddw3XVF3w5 mcU/xntnTd9jBlRPSIFymv43qcJw3fmV7nkO0ObztsxMc1rZvaLKJfvkuPJ61UA+ao3/8pO6soK ssBa20oTVlIkk88d6wBlHBU9oJ1Dm+hY9WilAbwp16j5121ebazeYHuzJ/5WIY+7A2mTxuE8TXb d/2RphSczfQGkq2BkRjEjfFTL/duZkmv1KvNukyyzRli+9eiJ9eLpaXitJ54f9jbbvktvnDBcic 7y1SMkDOMeC7GrLiCgaTtE0obBF05rmbElUWb7CV1yO/PmdZvy4Hz9pVeFcP9xR3sch/gECdzjj a7A4n2Te0UT8i8g== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Proofpoint-ORIG-GUID: XKcIH3AdT2W85YfWBdG-kCQM4vAvclsG X-Proofpoint-GUID: XKcIH3AdT2W85YfWBdG-kCQM4vAvclsG X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDE3MiBTYWx0ZWRfX/tGMeYjXJEvL SS5oVEzBUPH9UPawcS4sTfExHC5xb7ziJUrFVPOvkIIYfNvyfTUX5C6ISvSt/rsxUTjVZTXAuxo Y/qjf44eHcGJaHRofQIrLnZCpNG5vMHqEUOziM4/4ntH6k4Vtx2/88cO7Bllt+JlZi28025vLXv wBPjJ/rwbC1TNMnKWSIS4aLjyNAT/eByIyM3Jt4r6oYLLksjgffM/1YUGktsYfGze246YRW28b2 YGIQXxyf71SHeJMKjm/ZQPt1VHk09xwXfa4xRLy9v83Ces/ZXf8Q9VfYWpxNzq79r9AJngjvZKR 9X9hS416Z1kXkcOvEQl2qqyXD2cPYKHuFj9g4vATUxJg8LKIzacihTxN46OkxVChZ0q9LsrIcdD Zh7oz+roa4ImCZKlCc56s5cRSMp6iQ6eq2VzFDtVBtLRXw5R4lm8yxslVPY72FaNjhKadBtF8pT p9XAmm7cdkEaXxc2Mqw== X-Authority-Analysis: v=2.4 cv=CKwnnBrD c=1 sm=1 tr=0 ts=69b1cde2 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=gOEeR9iKwsj33Yj5oN/cWg==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=a3u9cgIM1-qt9aQBqfUA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-11_02,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 phishscore=0 impostorscore=0 spamscore=0 adultscore=0 clxscore=1015 malwarescore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110172 Simplify chain of pointer dereferences with dev_of_node() which also checks if 'dev' argument is non-NULL. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/hdmi/hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdm= i.c index 5afac09c0d33..b1db1b597901 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -91,7 +91,7 @@ static int msm_hdmi_get_phy(struct hdmi *hdmi) struct platform_device *phy_pdev; struct device_node *phy_node; =20 - phy_node =3D of_parse_phandle(pdev->dev.of_node, "phys", 0); + phy_node =3D of_parse_phandle(dev_of_node(&pdev->dev), "phys", 0); if (!phy_node) { DRM_DEV_ERROR(&pdev->dev, "cannot find phy device\n"); return -ENXIO; @@ -287,7 +287,7 @@ static int msm_hdmi_dev_probe(struct platform_device *p= dev) spin_lock_init(&hdmi->reg_lock); mutex_init(&hdmi->state_mutex); =20 - ret =3D drm_of_find_panel_or_bridge(pdev->dev.of_node, 1, 0, NULL, &hdmi-= >next_bridge); + ret =3D drm_of_find_panel_or_bridge(dev_of_node(dev), 1, 0, NULL, &hdmi->= next_bridge); if (ret && ret !=3D -ENODEV) return ret; =20 --=20 2.51.0 From nobody Tue Apr 7 19:50:36 2026 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 96FDE38F92B for ; Wed, 11 Mar 2026 20:17:41 +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=1773260262; cv=none; b=A9awhUh8Y6HtdcGQeHDRcLcDRyiNPkVdeZzYgFm+LxYJX12Ws8Rth8UkqlLONh1cR6oJi/w5bQGOsW6RsjT8Ke5bjEd4iLZtEgaGAyG4P1loUuFwQuHKHW3LEdbBUY8HzWgJkEKYFxBgGLHEW7BFlk1NuEnTmDJZJV9WQWFEWKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773260262; c=relaxed/simple; bh=cKeuUxvKam9PYjthYzvdvrZ0HPds02yhZieULog6qvg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U+Vd28V/qt5XsfY48+Sfa0BJI/SfDZBcFSamX8B5Tb7Sv3d4qgXhxVC86Dqmdm4gE1LN/W/e7Jp3P517cxtf7xkoYycEVOfk9s5gpT13ZS7Ij3z4fHFXLo0Qn825WWgXGcOqD2xRmInGf7RCogWQcHlK3/z2q73mnst0jdnnGw4= 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=KCWqWiOE; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=D3GKGq75; 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="KCWqWiOE"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="D3GKGq75" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62BK27cx4032609 for ; Wed, 11 Mar 2026 20:17:41 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= IctiJKzFga8uaoriJYS2d7YQbSXoOC3YlhoWAOwIcBE=; b=KCWqWiOEJeY3hadC wS62c8gJ0nsvyWJ6BVuAEso34vcsVKmHkW899r2bacf6o0gkZrlAfXG1sYvXbAyW ZlxDW4ewUlMDDQz/NJUuKrT1OCxxLXziQju1Am3z0o9Ib3/+kcnVtOhCRmhtmjjn luuuV8V8Iqi4sn+NwBHiU2sA6H9ZLYWwNdsB+XtpBWZJ6iv528dmXTGJdt745pgI eo12qkxEKQwRvlbuKzIpzox29y7GE2dQDjR/dTgqaoT8b7yipGVfqSlgfxIrnA1g HuG9J+pmwBhRI7nTY+NYwmoqRib0CisbN7LoEIc+d1Fjy/2ZWDvpOWaKrULBtyHr 0rtbSQ== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cu90t9j56-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 20:17:40 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cb706313beso44090085a.3 for ; Wed, 11 Mar 2026 13:17:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773260260; x=1773865060; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=IctiJKzFga8uaoriJYS2d7YQbSXoOC3YlhoWAOwIcBE=; b=D3GKGq75eEz2mvL8yKxyhkQ3jELiVKT4pMTMZhuYy0+6vVv/zTaMsHIPNHz5poBul8 cAK5fgtzz2AvIKeI3PUkZk5ngkitFsVClc8Id0FyD4/ZRlMOs9i4YtflXJGeU6Fusoc2 v0VZTIQqfHRQXyCPAidJOrEPPpIq2n6YEdO757vc3sw2/CJwlJubGsuuQK2QBeEqlUfq re11zYsnEfxpQThxmkCnXagJrg73c536qCaFzjGphJEn3vk67T6thVO/ZVf/uZxM7TuP 9eCUk/E+RueiXBE9oLSF0dHXP5AacRA3SacyX0NO5+TcB6F5umPP15BCkRs15mLXK43N +7zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773260260; x=1773865060; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=IctiJKzFga8uaoriJYS2d7YQbSXoOC3YlhoWAOwIcBE=; b=Ly4cwMsXBx/cXdgdbQQxaGp4toenvTi8KadzvzDlLprw35/XNzKVbz212ffgResIUt EZUo1MOeKKAu3A4uh1droD5dhBF7kGBLghs8VJBDfOS00zUiKnp8iNlXejOQ3bLoQrH+ R8nBettfyOskqJOqJs++iFgrdCU57H+k1LovbmW+K9Zp1u70wtttuZJXI8W/vjvI3XE9 C4B22a4eCC7KjyRzKEgugNste2fRhaWA+I5ko3gFSYvuVNqm76o9LxktotN3yrY/HEAD Lh/s0cd5L7quKB2sb94M3vD0cgyalK2jmwcbIOieErE1/P+DMU5mH1ary0wjMRINw3bp CymQ== X-Forwarded-Encrypted: i=1; AJvYcCVH2Tq9RwXYpd3g/fzUJZfe49nDXsyas2JKadFjNHGOBQYXFC0V/8oWkUQ9hwzUE0/uNOh1nUhiThEZ1ao=@vger.kernel.org X-Gm-Message-State: AOJu0YxPTUKEQyKTURkN/QIiVhNzO3RL35TaIpALD9s9dheFnONgSR2t d9HRIhBy/cYcofUA43+vwFxd69Bqx7k/WCgiyokXghRLlLHmZG64qI6PI2chWbHxx3+ey8vrmoe McVzDTBpLu4KgqpWzMkmMD+8ZdXHEIcjkCJGTX1RlAhZ07fHsHmc4IoL06sEM/so0s4w= X-Gm-Gg: ATEYQzyV4D7fdXIUgEznWZ/3O2+cIwoieEwSxgsbNnhhyNr5PcFwEwfnjB+lJlp7/L6 tvCOeRQDf+0aaAd7B4Vlng4NoxMdMXVJuktorujfjBrc883fphQAovi3O6Yg94Gkibe4F+b6njm Ug1AVU51VBy6nnoIjWPMpIkfO2p1VC/4XONwz4QtAuS1dmni1yTe5WQ7kYh1bFsFkyyIc+TxKei EDtjIMoFqbc6pDUo2k3LLxegMC1TW8M3p3pBXL3v19rSWiQL6wqtV7jC6DVJpbkyQ4+OX0kVxEK um9R42xK42EKe9czazIxoSwGTa0LEaoe70Re6sNXD0z65mC0JaolEqcoU7hn066Q+jCuqcM+beJ 77D4QPXz3jMAbh3sbZ3noJn4Sg/0SuCBOQlHvTudc+poY X-Received: by 2002:a05:620a:4608:b0:80e:3af7:7a0c with SMTP id af79cd13be357-8cda1a2d86dmr478179285a.43.1773260259846; Wed, 11 Mar 2026 13:17:39 -0700 (PDT) X-Received: by 2002:a05:620a:4608:b0:80e:3af7:7a0c with SMTP id af79cd13be357-8cda1a2d86dmr478176585a.43.1773260259393; Wed, 11 Mar 2026 13:17:39 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b65fd3dsm79257255e9.10.2026.03.11.13.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 13:17:38 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 11 Mar 2026 21:17:26 +0100 Subject: [PATCH 2/7] drm/msm/hdmi: Avoid double error print on msm_hdmi_get_phy() failure 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: <20260311-drm-msm-hdmi-cleanup-v1-2-c5535245f6de@oss.qualcomm.com> References: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> In-Reply-To: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=914; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=cKeuUxvKam9PYjthYzvdvrZ0HPds02yhZieULog6qvg=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpsc3XvpzTqDQBfvwACXsB3YLTwN5yo9Pd14XvD ywA1VAQbtyJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCabHN1wAKCRDBN2bmhouD 109ZD/4se3ojRQZtYZkaaQQDlKwDOo3S92l9zAVqZ0fXP2et9tbZltOtUyDphgaQ1tGglCwn0pA vkOn3KAMfUPGYoS0dx9YGttBI0GRE2PsAEawERzZp01fH/i4CKhICGVhCYdKs7jAMAq1uqTZ8cJ ZjF/JUf7yVQNIZFMLn660vp7GRDrlYG/1wik0SA2VmeBxw0dKWHZcBelbHRhbBwmKn62LYqj9XQ axg65JTZ14ab0y12qTGqOhWop5SlPFd//siYUhl6qFqE3wy2D3Ih0gUKH3JLUgVREfrYdURxqj3 6Gg56FETRpRnNX583bO7z9raBzHcqlCFqFJDZvOBvSnN00ROGo5/j3tGB5uHwRc6LOAf0prZ4nK Cx/Tq93mOcY538UehUbLughNs41PO+EtddMzmEkvi/j27IGTTCohT96fqoFkmNQd1YdGdPQuV6S RUYF2plnkzjtXFjnMoQtO8bMcimTFwDiVpBYjYVrTduiSDMJvB2Z5/f9YntDJ6kFKSMEZRW7Fw9 lj+FwYnsMSIuXEkzA/bmobBEQUtr1YtuTmHKQVYCG56KsGkgbZaNTvZNgOnoirNL1p4HUQrAnc6 zfd8tYD3sfpFRGB5hW1L9iG4E9oXMw/2CUDJ8hXHdYLMKesRsq2xj2QzszqqKauU+J6E98k2Hkh KoK0MUzqzV9vK+w== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Proofpoint-ORIG-GUID: rlRr9QRN-iv0c8y-B6uJLOsP4yCFgQhW X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDE3MiBTYWx0ZWRfXzxxwHYbm6uBf YpbIJlLzu08KgHeQ0SXnvtRnGvRc4F/Or7XRoEdhE+U67OP1h1cvG2Rh+r2vU5w/R895/w98g8h 7nViUU5pafcBcv7UBOhgzXCu8AdEviRMaXCJmRQCf2Kjn0OmhZbHlQRlL7/wUQgjF4a5AeEaMIU UJOq3YUuXIKqAkfKCbCCdWw+Y9lohHxRsGBIGyXIKTNyOHL/rxpyzM7Gdq5wuYtJl9z1JDJGm7K Lr9CGj4aSqYfy4mwYAlkWqDwxUN7CEiOebGX2e8OHLuNlcCp9fkUI4ibCESdYcRFR5rwzPiivq0 FxJhw3YzjlCykoUH1pRYmB+DA5IRsWt+vbX/dzw6LNDN/8SwE/cG0Ec0pMUmo9pMxWcxxrC1hcL prhXWj3xgmv/g/mdwqjOhl7blzevray326ShzfEsb5qUymlr2vuMF5m0ATckJZ+FvGLx3Hp59rF QYwrMntzyaOW2bxF37Q== X-Authority-Analysis: v=2.4 cv=DfEaa/tW c=1 sm=1 tr=0 ts=69b1cde4 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=gOEeR9iKwsj33Yj5oN/cWg==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=kDavz4lrka8aSrD8mlAA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-GUID: rlRr9QRN-iv0c8y-B6uJLOsP4yCFgQhW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-11_02,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 impostorscore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110172 msm_hdmi_get_phy() already prints error messages on each error path using dev_err_probe(), so final DRM_DEV_ERROR() would duplicate it and possibly flood the dmesg on probe deferrals. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/hdmi/hdmi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdm= i.c index b1db1b597901..02a87bccab77 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -358,10 +358,8 @@ static int msm_hdmi_dev_probe(struct platform_device *= pdev) gpiod_set_consumer_name(hdmi->hpd_gpiod, "HDMI_HPD"); =20 ret =3D msm_hdmi_get_phy(hdmi); - if (ret) { - DRM_DEV_ERROR(&pdev->dev, "failed to get phy\n"); + if (ret) return ret; - } =20 ret =3D devm_pm_runtime_enable(&pdev->dev); if (ret) --=20 2.51.0 From nobody Tue Apr 7 19:50:36 2026 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 97DA03909B3 for ; Wed, 11 Mar 2026 20:17:43 +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=1773260264; cv=none; b=ZsIrX0OLk5uvtyPFyOxQAov8zxFtZU+s8LqUwumZR4KbmpRqwCiB/Tf++91fgVSFcGujwAu108Z3moSG36UFhquJAXhsAot3f4o7po7S4gzyk7o8hr1c1RLV/ofvRLdSbkwe0fRUttBNtdIAvy5ZjBwWHxCCm6Kyb6+7GrHfI9Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773260264; c=relaxed/simple; bh=RQohQzLIQf3hMORNlnLcz8kcaLrfjYXvfR01RWX3LTw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ibM8GdgYVq90tNnd3vOBeSlK7TzmXI02S7QMeIF+j50umsgExIozYQsZ4osiBP4MCgctCLXtTRdyRUr+HjWKi7SPS/5+FdD8LW4FMyqY29+8ZR7MH7GZDvNYjP0OlEeHR96wUvzYELnKCRdKZgrR638eLmugnmV+P8xDJRCs8lc= 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=TmytrwWj; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=QJdSj1Ss; 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="TmytrwWj"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="QJdSj1Ss" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62BFp74n3171973 for ; Wed, 11 Mar 2026 20:17:42 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= PmOhKe3gw//gTAh1/BLAwiMCIzc+UqKCl9Set3+LH0c=; b=TmytrwWjyv5Z2BvL P/9nk8lDH1JQQn7Yy5z+5LuW7EjUyD1CGgTeT5bZ2yOLwNaXg/P+UEhe9tNX4pKd AmjeGGxgXSf/OWuG/t34qll/Jo6ORphgxHY147jCV2Qck+S1RJdM1DACSk1lLjtD RUYw21Th3vfFhw84WH9jkXxlwCUM6baIC525FfGW7wfUSbHbDiJyg0mu/Hjwq2/H yUO0+06hfQFgh4ob4gBHxB0vsSHtJ0+3z1hJwQANu7t/O2ViyCYF/oxse3++8rgL qRe//GMxtHK3ipB1608A5MOEIeHhw0pcH1zE6AUaVWDPUzL3onsGLnVrNR1FUX/m +xbqTA== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cubd8rvfk-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 20:17:42 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cd7774be64so142841385a.0 for ; Wed, 11 Mar 2026 13:17:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773260262; x=1773865062; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PmOhKe3gw//gTAh1/BLAwiMCIzc+UqKCl9Set3+LH0c=; b=QJdSj1SswgHMKSKsgtvOSw0VBlM9p4TD6jNovZXW82f8tisMXV5vLUB/LOOFsmgKvP 0mE9Yasn09g8Z4lo2LoickvY+fL2diGJO3wY0XV4rurpExNcRxxknFk6YewyJ75hxIT/ O8JVquZsqTardwwXFRUJthrXxAQJewgbet07+TXHdqZ9k+7gtFlW3kO6WjSRP1fiY5vw tIbdoMsza/JgeWcFjy8WRi/9o30ZELz1tPGoDYlxqUulKQkK7rZLdRgEAcOAwKwrmnHu v1T1jV1ICjVyM9Nt9L+4DIHoXSo705FiHf36KbN8wqPGgoGPmAqGbSHsf0LLDCMgyftX 6FxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773260262; x=1773865062; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=PmOhKe3gw//gTAh1/BLAwiMCIzc+UqKCl9Set3+LH0c=; b=pMWnoD5meMslF29gPRHwPAGnA0dXv2T/weJnHmHqVd2+LC6Td+s+aAjGvzsjayciOF U2PhFzBuBI44KgNmD7t08819ml/6Sp+jEpMfTnqDSQRuyekYxvghrww0WzIiNsN+tyeE wiPngHuS7syG6a9LaBjpCjJT7nI2vhx3zFce1xTMlSrU8xwMaSVSSOYXN6SawodjACiK EjuOD3D7aGQ5n8RPrGFn5nHXtsXtYqwO/PJj98ISIHsIroh/OtYsJwnofymBAovTuDVX G195uLLn/MDH4f0NYssNrNzOirAQObG1Ze5pZ0jQK428Na3Lyl1kj39CG8O4YM72N+Er hV0w== X-Forwarded-Encrypted: i=1; AJvYcCVD8JJzkDdl+Ilq/YIJBSQNU8sg1Tyfq1jTk7KG7q/bIX2nmk7VORx4BUOM6v+13u9yts/KCJYZr8NDIT0=@vger.kernel.org X-Gm-Message-State: AOJu0Yz1Cb9Cncdo5iNBJz2jhhPNKaW/bxoo7zwLZuv3ujW8Cj2lcYP+ opmD4tmUuQFwIvMLUpZwtCHIJug/PKUpSpVcDdWZEI8jFZwAecg/JZD/evNRRH33Wn/2RyxPnUc Gv6fVicCALFsw/GTxmZOrx7+Wu4Mh2Ym45hkD6iElrAZ/KLBec92HV4X+uZglBvBlZUM= X-Gm-Gg: ATEYQzy1WJ6gFfNsK3/oKyIlgOkxzM1NtGXK8Tcw8q5yULY1KqCjLs1/xpi6SqNPSBF giGylu4sVZqp6Rv2cUXZY3NUU8ybOgcai30/8y6YmNlJ97eU2uNVScH6Ogr0SacvIxFi4ZMmaoK Bmx9kfsLmL6UHw7aAZU86IWUs0zgX96HRhvEDsOaHQ2V2TCBe92PcKxbsfFdieEnzBkEJlJPthY S09claAYzHny0LmFV8gTMCREaTfR7qynvBqTisixwCk1jNQGqI6pyL72JAf/TKl8FOODnB+J+RU 9q7pVf8QI1tsvCPXnudaZohRJigrtIvUygTgz4BivFl+V6MEV963Mohr5KuVCZhiXv8sdG0jIPB OOupE4iBI+XJVc05dFCh9c6aVs6JVuDPbRkGy4EKUgvTm X-Received: by 2002:a05:620a:4551:b0:8cd:9707:6315 with SMTP id af79cd13be357-8cda19ba6a7mr469639885a.9.1773260261770; Wed, 11 Mar 2026 13:17:41 -0700 (PDT) X-Received: by 2002:a05:620a:4551:b0:8cd:9707:6315 with SMTP id af79cd13be357-8cda19ba6a7mr469635985a.9.1773260261325; Wed, 11 Mar 2026 13:17:41 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b65fd3dsm79257255e9.10.2026.03.11.13.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 13:17:40 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 11 Mar 2026 21:17:27 +0100 Subject: [PATCH 3/7] drm/msm/hdmi: Simplify with local 'dev' variable 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: <20260311-drm-msm-hdmi-cleanup-v1-3-c5535245f6de@oss.qualcomm.com> References: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> In-Reply-To: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3444; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=RQohQzLIQf3hMORNlnLcz8kcaLrfjYXvfR01RWX3LTw=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpsc3Yqd+dsT3DIQ78iz24qnrZhhO/+ftSvRWOQ HRQNVRH8PaJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCabHN2AAKCRDBN2bmhouD 1304D/9qVRxNtpbj1sx/tzTfek3tgBKdMTq2Rd9dY7xQthxc7+l1w0aOLM3kn485m3HbmKQFf0c ZKD5cywiRDL0qiR/AVyx3rY/60hJsq8fBv79AFUP/UzAx2teDyOML4f4JLo/kb9dz6+CE5yV3UG JttKc8rYlWBkhnPIaJacRH4I+boerfgSbMzRkJ8Mx/jM2jbYSGI7ufW757n048YGaWlcOyVeGTb E6CvbuLM/aav4NSueabeYSey2QNel/DFMNwPFQL5NQ515HAtqJA1MmPGNvRpjMCaeQ3Vaa3nUVT ncXPjGluz9K+dVxBjwvYgAQmIu1Qk6bBRdKkYW4zo7Uqop4NxH9dVe8K81laegNGBzJJ+KLdMae kHqAp9iginpThurWsPVU55XXLYhn0IsIyd8ha6ZjF+kmAp/qenpHAjwS7jBm8c3gRz2DzL5x7H1 xe+iEjm4FMAlGoht4MqiyeMEjwyeHR2BTmRpTSSeVLOyxg0H+gH1fjRHUJ4nRZO61Nhidh9Vqmh FCFIJ0WLS7AQUU0aQf8n5ayEuhbYPUHSEwDcd3u9a3oqD8AvknXZJ6n/4qvE2HmDjeDbNdzmtTL 9+iuVKr8v7YQAxLKZfP76UyIpqMlc0QzpBFZuFnIyFmAanYaRmElEZ9bpYq5L0q5Z50zMZx1Uvv c3X3/tiRd2ZvpjA== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Proofpoint-ORIG-GUID: 7SDYI0aUbjTyt2UGqQhbey_cYMLaSvY_ X-Authority-Analysis: v=2.4 cv=eqHSD4pX c=1 sm=1 tr=0 ts=69b1cde6 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=gOEeR9iKwsj33Yj5oN/cWg==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=Gs1e6ZCtzmPehomhPS4A:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-GUID: 7SDYI0aUbjTyt2UGqQhbey_cYMLaSvY_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDE3MSBTYWx0ZWRfX5jxzXN36vgzv nk6lDkNIfAO0zNvWyayV2E9adsiUjv2AZ9vlQLn9c2c/fTRd5h9zEErznYCer3rRG59q7D2mAIu Bpe8uEyLu0zuE0TiN0XEMb1ezHP8U/9mHcwW/SVZ053smiYDoE/XegjN0zYzU3I5W45MgxBrRDw 3BJLhufTSYbE1q5Bxg276PiQL6rZCCti32GZN7P6EoBUk2mBuzeOJOhPRwhiA7+fQjvmK713FeC IxrRvRtxwF3ss5F9ZviafPZvQ+g8EoJBeD9NcWzi7AgeyXM0ZCj9Gco0Pv20//zJZf1j05iBTun uI+raw1uUcodZRri5LKcrZ1InUUjl1PXYOsTmUUp4mA1Je/Ea4HWP7PoWdJaN9lNwCh9bFAkf1k FSIKEDj+rvHqzYwtLKC9pn5p/iKsQ5YWqBGOezJEbhaEzaOqlsTVaSMYKpln2pmABDSppuZx83R X5R6wOF9GlXEqjlRp+Q== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-11_02,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 clxscore=1015 bulkscore=0 impostorscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 malwarescore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110171 msm_hdmi_dev_probe() function already stores pdev->dev in local variable, so use it directly to make code simpler. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/hdmi/hdmi.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdm= i.c index 02a87bccab77..03aa29dbb2f5 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -278,7 +278,7 @@ static int msm_hdmi_dev_probe(struct platform_device *p= dev) if (!config) return -EINVAL; =20 - hdmi =3D devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL); + hdmi =3D devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL); if (!hdmi) return -ENOMEM; =20 @@ -304,7 +304,7 @@ static int msm_hdmi_dev_probe(struct platform_device *p= dev) =20 hdmi->qfprom_mmio =3D msm_ioremap(pdev, "qfprom_physical"); if (IS_ERR(hdmi->qfprom_mmio)) { - DRM_DEV_INFO(&pdev->dev, "can't find qfprom resource\n"); + DRM_DEV_INFO(dev, "can't find qfprom resource\n"); hdmi->qfprom_mmio =3D NULL; } =20 @@ -312,8 +312,7 @@ static int msm_hdmi_dev_probe(struct platform_device *p= dev) if (hdmi->irq < 0) return hdmi->irq; =20 - hdmi->pwr_regs =3D devm_kcalloc(&pdev->dev, - config->pwr_reg_cnt, + hdmi->pwr_regs =3D devm_kcalloc(dev, config->pwr_reg_cnt, sizeof(hdmi->pwr_regs[0]), GFP_KERNEL); if (!hdmi->pwr_regs) @@ -322,12 +321,11 @@ static int msm_hdmi_dev_probe(struct platform_device = *pdev) for (i =3D 0; i < config->pwr_reg_cnt; i++) hdmi->pwr_regs[i].supply =3D config->pwr_reg_names[i]; =20 - ret =3D devm_regulator_bulk_get(&pdev->dev, config->pwr_reg_cnt, hdmi->pw= r_regs); + ret =3D devm_regulator_bulk_get(dev, config->pwr_reg_cnt, hdmi->pwr_regs); if (ret) return dev_err_probe(dev, ret, "failed to get pwr regulators\n"); =20 - hdmi->pwr_clks =3D devm_kcalloc(&pdev->dev, - config->pwr_clk_cnt, + hdmi->pwr_clks =3D devm_kcalloc(dev, config->pwr_clk_cnt, sizeof(hdmi->pwr_clks[0]), GFP_KERNEL); if (!hdmi->pwr_clks) @@ -336,16 +334,16 @@ static int msm_hdmi_dev_probe(struct platform_device = *pdev) for (i =3D 0; i < config->pwr_clk_cnt; i++) hdmi->pwr_clks[i].id =3D config->pwr_clk_names[i]; =20 - ret =3D devm_clk_bulk_get(&pdev->dev, config->pwr_clk_cnt, hdmi->pwr_clks= ); + ret =3D devm_clk_bulk_get(dev, config->pwr_clk_cnt, hdmi->pwr_clks); if (ret) return ret; =20 - hdmi->extp_clk =3D devm_clk_get_optional(&pdev->dev, "extp"); + hdmi->extp_clk =3D devm_clk_get_optional(dev, "extp"); if (IS_ERR(hdmi->extp_clk)) return dev_err_probe(dev, PTR_ERR(hdmi->extp_clk), "failed to get extp clock\n"); =20 - hdmi->hpd_gpiod =3D devm_gpiod_get_optional(&pdev->dev, "hpd", GPIOD_IN); + hdmi->hpd_gpiod =3D devm_gpiod_get_optional(dev, "hpd", GPIOD_IN); /* This will catch e.g. -EPROBE_DEFER */ if (IS_ERR(hdmi->hpd_gpiod)) return dev_err_probe(dev, PTR_ERR(hdmi->hpd_gpiod), @@ -361,13 +359,13 @@ static int msm_hdmi_dev_probe(struct platform_device = *pdev) if (ret) return ret; =20 - ret =3D devm_pm_runtime_enable(&pdev->dev); + ret =3D devm_pm_runtime_enable(dev); if (ret) goto err_put_phy; =20 platform_set_drvdata(pdev, hdmi); =20 - ret =3D component_add(&pdev->dev, &msm_hdmi_ops); + ret =3D component_add(dev, &msm_hdmi_ops); if (ret) goto err_put_phy; =20 --=20 2.51.0 From nobody Tue Apr 7 19:50:36 2026 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 E58F73914E0 for ; Wed, 11 Mar 2026 20:17:46 +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=1773260268; cv=none; b=RXNahq9LQTJiHiLZIpf0579JPjntnp8X5z52SyhA2eK+jcNSKMnPLJkKpxnUT9228zIyPtqEVZQNecKMxymLLf9zzB0nQCu4hNpnuH5gGO+OAHnh6idVhF+SBT4ZqlTANYdxbjHT6jBTw0/GJSLwH25DRc4/PgxSDaSUGZhOfr8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773260268; c=relaxed/simple; bh=7SE5vZDOstE9Xf57n1Jrye22q6OMfp45ac26O+8OlYc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kH49wQ5arBOvV67GMkNdMywA9QA6OVbsOZMSk2il1c9Q7/ztnhrkwawFn/PHlWDeD4Yj0GgO4RvwzOn8LXlq5vCUFcZ4HnPBvMZmXaDtW1PT8x5iuaSddOhL47jKV4rwFOXZ3Yok7LNEV7KU5nMZf6E3M4To8zA7YTEJsAWgkaA= 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=crT6w6Cm; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=HcJ4SV5j; 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="crT6w6Cm"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="HcJ4SV5j" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62BGUZOU2038134 for ; Wed, 11 Mar 2026 20:17:46 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= s0pCDmC7QmjeiaXxXJ9e3qn6IfxRNTNI1GwlSoTLmF4=; b=crT6w6CmF8tFIeiA ins5WhSAOkjqc74M0EOdIAuyJbzpCIkiiGFOla6tbdW4cVN14pdgg5XrfOWd8Gjj CYtn41LAfyHikRk78WlWOCXLWwWofHJk7Ew7k/wH4Vo5NmRiz2QJqgEba3Doasu7 +8CaQkHx5LtISvMaW+Yfjq1UQkhH+nduathbJ269y0UJygIVtDXj36Msg3657tpM mOAVqjOk9tNptD0oLBKc0eAfxQUSIE/KKA9wxQfzIqoWVPQ/986iosAm9twHN15k OQGplZ4IcwuoGAqGhEVmh1fyn7yLeTX4Aqh8miFUCTlr+mJwf8NJtPHTDNRbv4UL si+Odg== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cu6a5j584-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 20:17:45 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cd767c51efso38011785a.2 for ; Wed, 11 Mar 2026 13:17:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773260264; x=1773865064; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=s0pCDmC7QmjeiaXxXJ9e3qn6IfxRNTNI1GwlSoTLmF4=; b=HcJ4SV5j8wRIQ30WuFJ1kyIBp+VLUx9DLiG8XA0Dcl9AI17pgKcXFd+erhwMV+gncc Ive+On2W7TIDOz/PpCSEGPgP7NqOrq196AIq1oCZHkeYSrmit63iHVyBe47ASMRIg0mC yldex3q86CUwk+LuE5GeZkOChfsixy81kjkxC+xwVGhbgEe8xICAgNgkyDtQMEqItQ+R KT5fUpu8er4tN6zTqlw5tr593wociLnghGCZnKv881nCM525/G5NHmQ8lHayEEyYRj3z MvSwfCuykR2PlXskKCaGBvQqZgU6zB+vds8k18UuNjwsQ2nkOP2q31VLo21s6P0MbLmV zFGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773260264; x=1773865064; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=s0pCDmC7QmjeiaXxXJ9e3qn6IfxRNTNI1GwlSoTLmF4=; b=IJ14yjniJEnhpHXyYdoR6gWUfuX3AiRK6QLIqxMQtWfP26Hvw8JuHiucfEIMqLGOVP pNAx8OxbcslQ4LhIZhPlJUeEykd3jbWHp6If4FbEZ6SzRtPCdvv0qVaiPTZTnI3UlCV6 JO6jbqH3Udt36LuvMPY/8PgT2HoDJMLIMtKhcsSkkU0qL/hPBW4RVo/RzLQWmNVwOb14 /8wHrfWt+ETYeaGpcpG+6BN7qG4Wo43tIX+HJyYMw4yCEvaZOTz+MG+u2d1Ku38zx2N4 w/6SHMWY6eGruyRnFd8SV5CxJ3E3fSaNY3lOX52ctmpURjOgU9xyovbbXeKdUuHnxZ9I 2oYg== X-Forwarded-Encrypted: i=1; AJvYcCVnNwAJCCf8/zHAhPi11B/gKTzbOiLZGcngjU/2H7Vq/pz+TyZmiNGh41lV5idBcJzkGjNj818smG8z3N4=@vger.kernel.org X-Gm-Message-State: AOJu0YyoTGEk5AwlxWCyArA60aMDUQL8I8WrWdFYgEYUuS5E82rXeHCQ 0lpPwmJUc+2tSEsS8OC9L/nE4pc5mIr0xVX8+0E7ulf3AfCGXtfGcARSTqByLmtvtWfwKb7q0Xj 82bQfzR6FwtFRXvRlMid8QXjnQrb5sqBA6Z8mBR40J6/PNp7TI46FWS603I1CdnPf9AE= X-Gm-Gg: ATEYQzxaxgYWbVclK/7yWE51wpl3BAOYUM/6NKvWJoxxwQgwgSOAKHj/gfRDQhdj2K9 TrKKvhLiZYSipjGjCFbSpm+yIMbFxTPFslOz2cXWf1PrIOd5RoFau9gZQAIF+Ct0E30mc8lyiCS AcuV5We628gd2RoIqyVW6fKheCVjMuDlI+0r8/x1pgvB0jz4jzvook8EyEaIiqFk6NojgLY8f7o 0WLf7ahx+3mPCMb8166m7ldssB8IKg6cyIpoFYm2Tj3pKneMpCnOvrs/KAAJktAkX9GcaKblplt RDvVB8niG0tEcKcY/QjhNO/BW5wxykD2CVy0sb+dZLHq3yjRalkyZQ8awkNgEOEdNz+AqyO+Bnb pOBehEb2EHYsYOWG4IljOwQgE5EYQPF13hVELuUlxnxiP X-Received: by 2002:a05:620a:4009:b0:8c7:a53:4d17 with SMTP id af79cd13be357-8cda1955188mr518427785a.21.1773260263949; Wed, 11 Mar 2026 13:17:43 -0700 (PDT) X-Received: by 2002:a05:620a:4009:b0:8c7:a53:4d17 with SMTP id af79cd13be357-8cda1955188mr518424985a.21.1773260263444; Wed, 11 Mar 2026 13:17:43 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b65fd3dsm79257255e9.10.2026.03.11.13.17.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 13:17:42 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 11 Mar 2026 21:17:28 +0100 Subject: [PATCH 4/7] drm/msm/hdmi: Consistently use u32 instead of uint32_t 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: <20260311-drm-msm-hdmi-cleanup-v1-4-c5535245f6de@oss.qualcomm.com> References: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> In-Reply-To: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5244; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=7SE5vZDOstE9Xf57n1Jrye22q6OMfp45ac26O+8OlYc=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpsc3ZlABg923DtFNon4w7UtYzxE++UxZpN1mdD yYuM/d9b9aJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCabHN2QAKCRDBN2bmhouD 14BwEACOMpajqkKm0bcmSBekvIusi9wH5gcwyc8sWh/klCtx2IY0PKfVTCt/W9zcuY9KHBRglJQ E+5YNfhuImlHKXwBZjN3LLAt07y02QiuuVTe7bSpPpJyPhN5/Yvkx4IEd53BMDiq6RXzpD1PtF5 //gPF8qo8XhGHrDmvHki5m2mjDNLNJu/vXpecnAoxZ+1KcM4IveElIZQ4rZpspt2RD8UrSSUrER L49DTobbLz5iqdMhfz8gGTdUjaNmcq8xOmoDeILoQbnCHcO+wG4LKxdZHwC4s9aHShJchhA5hjg ccX1xFRzdV9mkcvOfVYHAHaZh1JB04iYrbm2/TJAWFKV3fCevw7aOq3eLJ6z+Q8zzOi1c758dda Y/XBS1QOHKI+DZKOk2ICy9KBPnZzWk0qUzT6UelQaSsP/01fLOYTEPjyawXCBSC3V7bbHC0NzHZ u3kVVgB8155HW9CIx8mQBHQzA7UxR74j+d8UlfWqDJPdL2KX0UVAxVf0NftlPnkbBS7td77mL+z C5l2lCZ/95TPoKkDBb3pn9aueF+4mtZRt9ooFXjSbHml0LBDOfVY530cWhAw1DvVvjDr2aw5emA 5/Nh9/03wXoOoFlAlwZzBzU4eEBCyjGzyIYh4ThZ6SfuxqcyUs4s5EoEYkLBbvL8tVQTmNkmLgl y5KnMXGp4XTQzfg== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Proofpoint-GUID: Bgj_XAhIKnxX2bsm4tLEhUdUBWllIgqa X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDE3MSBTYWx0ZWRfXw4p+OyvCncSc hYlGcBX4WjqftAm/he3Iyx7EHrZxZjyKARStR1bqJAk1Dxr7qVsAF+OXtI+VkuGVhMvU7+5jKtk aBi6CbipexB/fc6+Y3OaeV6aZsuJG6F0CkE3DyzG0trFUFB+IeX6Iq3tHZfVV5/0mf2TWYtyK6/ +uXWXhHnM/XKSK1U9bux7SEG9XrO9jBthGsPGFk+1g/pQg326vdA5OBuw0mn3CAqSmqCThYCzvZ YvFfMk2yZS+zT3BtYTZF+K2ZeoaQ62sw8aIRSkYoeVVLprDwrz7s6RuZB+6SQEGT8W8ORDq2fIM NNHyniyJwoTsytyHehWXZDF+Y8B2Hqry5VGGVTOjpib9/KvzBuLMepIAyMhoJxIJhNjSDZhzCnK hzd3VLan7FPNr6tlgi/CVP3vXpHXuXN1/83V4+kQ81WAH9ey3s0t0xSC/yWKjpNKd9Bs2uPoQmt NtMmg5IF1DFCNfVbYFQ== X-Proofpoint-ORIG-GUID: Bgj_XAhIKnxX2bsm4tLEhUdUBWllIgqa X-Authority-Analysis: v=2.4 cv=TtLrRTXh c=1 sm=1 tr=0 ts=69b1cde9 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=gOEeR9iKwsj33Yj5oN/cWg==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=-BdNwxT8-gaB3-AsIdYA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-11_02,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 bulkscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 suspectscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110171 Linux coding style asks to use kernel types like u32 instead of uint32_t and code already has it in other places, so unify the remaining pieces. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 5 ++--- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 4 ++-- drivers/gpu/drm/msm/hdmi/hdmi_hpd.c | 4 ++-- drivers/gpu/drm/msm/hdmi/hdmi_i2c.c | 12 ++++++------ 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdm= i.c index 03aa29dbb2f5..06cb0247eb7e 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -20,7 +20,7 @@ =20 void msm_hdmi_set_mode(struct hdmi *hdmi, bool power_on) { - uint32_t ctrl =3D 0; + u32 ctrl =3D 0; unsigned long flags; =20 spin_lock_irqsave(&hdmi->reg_lock, flags); diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_audio.c b/drivers/gpu/drm/msm/hd= mi/hdmi_audio.c index d9a8dc9dae8f..249c167ab04d 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_audio.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_audio.c @@ -17,8 +17,7 @@ int msm_hdmi_audio_update(struct hdmi *hdmi) { struct hdmi_audio *audio =3D &hdmi->audio; bool enabled =3D audio->enabled; - uint32_t acr_pkt_ctrl, vbi_pkt_ctrl, aud_pkt_ctrl; - uint32_t audio_config; + u32 acr_pkt_ctrl, vbi_pkt_ctrl, aud_pkt_ctrl, audio_config; =20 if (!hdmi->connector->display_info.is_hdmi) return -EINVAL; @@ -43,7 +42,7 @@ int msm_hdmi_audio_update(struct hdmi *hdmi) acr_pkt_ctrl &=3D ~HDMI_ACR_PKT_CTRL_SELECT__MASK; =20 if (enabled) { - uint32_t n, cts, multiplier; + u32 n, cts, multiplier; enum hdmi_acr_cts select; =20 drm_hdmi_acr_get_n_cts(hdmi->pixclock, audio->rate, &n, &cts); diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/h= dmi/hdmi_bridge.c index 9b7012692ece..a9eb6489c520 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c @@ -356,7 +356,7 @@ static void msm_hdmi_set_timings(struct hdmi *hdmi, const struct drm_display_mode *mode) { int hstart, hend, vstart, vend; - uint32_t frame_ctrl; + u32 frame_ctrl; =20 hstart =3D mode->htotal - mode->hsync_start; hend =3D mode->htotal - mode->hsync_start + mode->hdisplay; @@ -409,7 +409,7 @@ static const struct drm_edid *msm_hdmi_bridge_edid_read= (struct drm_bridge *bridg struct hdmi_bridge *hdmi_bridge =3D to_hdmi_bridge(bridge); struct hdmi *hdmi =3D hdmi_bridge->hdmi; const struct drm_edid *drm_edid; - uint32_t hdmi_ctrl; + u32 hdmi_ctrl; =20 hdmi_ctrl =3D hdmi_read(hdmi, REG_HDMI_CTRL); hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl | HDMI_CTRL_ENABLE); diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c b/drivers/gpu/drm/msm/hdmi= /hdmi_hpd.c index 114b0d507700..2cccd9062584 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_hpd.c @@ -65,7 +65,7 @@ void msm_hdmi_hpd_enable(struct drm_bridge *bridge) struct hdmi_bridge *hdmi_bridge =3D to_hdmi_bridge(bridge); struct hdmi *hdmi =3D hdmi_bridge->hdmi; struct device *dev =3D &hdmi->pdev->dev; - uint32_t hpd_ctrl; + u32 hpd_ctrl; int ret; unsigned long flags; =20 @@ -125,7 +125,7 @@ void msm_hdmi_hpd_irq(struct drm_bridge *bridge) { struct hdmi_bridge *hdmi_bridge =3D to_hdmi_bridge(bridge); struct hdmi *hdmi =3D hdmi_bridge->hdmi; - uint32_t hpd_int_status, hpd_int_ctrl; + u32 hpd_int_status, hpd_int_ctrl; =20 /* Process HPD: */ hpd_int_status =3D hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS); diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_i2c.c b/drivers/gpu/drm/msm/hdmi= /hdmi_i2c.c index 6b9265159195..4a4a2cf90234 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_i2c.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_i2c.c @@ -40,8 +40,8 @@ static int ddc_clear_irq(struct hdmi_i2c_adapter *hdmi_i2= c) { struct hdmi *hdmi =3D hdmi_i2c->hdmi; struct drm_device *dev =3D hdmi->dev; - uint32_t retry =3D 0xffff; - uint32_t ddc_int_ctrl; + u32 retry =3D 0xffff; + u32 ddc_int_ctrl; =20 do { --retry; @@ -71,7 +71,7 @@ static bool sw_done(struct hdmi_i2c_adapter *hdmi_i2c) struct hdmi *hdmi =3D hdmi_i2c->hdmi; =20 if (!hdmi_i2c->sw_done) { - uint32_t ddc_int_ctrl; + u32 ddc_int_ctrl; =20 ddc_int_ctrl =3D hdmi_read(hdmi, REG_HDMI_DDC_INT_CTRL); =20 @@ -92,13 +92,13 @@ static int msm_hdmi_i2c_xfer(struct i2c_adapter *i2c, struct hdmi_i2c_adapter *hdmi_i2c =3D to_hdmi_i2c_adapter(i2c); struct hdmi *hdmi =3D hdmi_i2c->hdmi; struct drm_device *dev =3D hdmi->dev; - static const uint32_t nack[] =3D { + static const u32 nack[] =3D { HDMI_DDC_SW_STATUS_NACK0, HDMI_DDC_SW_STATUS_NACK1, HDMI_DDC_SW_STATUS_NACK2, HDMI_DDC_SW_STATUS_NACK3, }; int indices[MAX_TRANSACTIONS]; int ret, i, j, index =3D 0; - uint32_t ddc_status, ddc_data, i2c_trans; + u32 ddc_status, ddc_data, i2c_trans; =20 num =3D min(num, MAX_TRANSACTIONS); =20 @@ -119,7 +119,7 @@ static int msm_hdmi_i2c_xfer(struct i2c_adapter *i2c, =20 for (i =3D 0; i < num; i++) { struct i2c_msg *p =3D &msgs[i]; - uint32_t raw_addr =3D p->addr << 1; + u32 raw_addr =3D p->addr << 1; =20 if (p->flags & I2C_M_RD) raw_addr |=3D 1; --=20 2.51.0 From nobody Tue Apr 7 19:50:36 2026 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 55579391851 for ; Wed, 11 Mar 2026 20:17: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=1773260269; cv=none; b=g/WdfJZEF1aOvfiHJkn+uG4OMwub9hSrYwTPWu1wV7yc/0cutoxSUiQqZGG25UFMhnKoUzcOkrReSLy2mV8WB2TIz3ztEbrnhn6ODHG/9IMm30W5vT441Pp0aX1KLV3MWuhgSnvRa1wh9Y1EIAEc9xMHiBvibjR4ZAiV8fKkclg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773260269; c=relaxed/simple; bh=YOc37GFpIDuzzD9xXRHR6ElanP5yUXGTsuM7FbmpFSI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QrMqIuV/TgaffVnOEp23WbyNin8+4/iP8GlBaJRsgKCJ847+BEfzstMFgvs92OqMHac5LVFzID6xSvdmusOBwoeeCb5ECMbUGNechJCLle77LBentcgrEwnvfh/B9aTgJPl/FI8MybGpXmVZIn7Fhq8rItzLdYWtSHN+liELq+E= 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=UJmQc3ss; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=iQRPosyA; 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="UJmQc3ss"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="iQRPosyA" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62BI3vjN2579525 for ; Wed, 11 Mar 2026 20:17:47 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= USEdJZD4t49t/lSSKGJNdAbpficI/EvChZFc8qNnldA=; b=UJmQc3ssJnNlZMma MiSamt3oI/v46g61OhfWBM1bHsEOXYTv65o8CP6eBGqlNkltQgXQnDGNy/v2HfEU yUGsxmkssAgKtPc/PAh4DPHdp3JsSEyfBASXAOZI4r4KgVm+qIQhtv0kUcZq5EnH bg/HHI7jf5jii4jzwnN4qBJXiQUoSQdgXmtazfUTGVHQmsZ7UhzxrN9KOCUDw9Hd 9/iQFj/wUVo233WiApalFayJESI5oSqIqVqe2+evPhtKB9Jj4hQE4XiO1F2g/UbK KJBnYkQyELHoFLo0IciGcMrCAy46XurMwYR/uAmwsQ7BiVR/jxn06q9dOOqHDSy5 4Ijsog== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cudbjrc6t-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 20:17:47 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cd80c4965aso221445985a.1 for ; Wed, 11 Mar 2026 13:17:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773260266; x=1773865066; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=USEdJZD4t49t/lSSKGJNdAbpficI/EvChZFc8qNnldA=; b=iQRPosyAGLcQcH+lJYfPdiYvama3U/uEBdn+FReU7x1/t5IY2nl+7s8bi4HccYftGL ny0IY0bjYyyD1ZZXxeT5qqAlP158Jb2iUcutKQHwqg6/b4PRBt63dqkt+z2LWBSX0UX6 zXsP3ux05JQyAX7fWNIXpsacR1/y07LwFuoj6Jy280uv96IeKhrkF7VPzG1A1qrWCdiA NRAANQ+8pKhs2T1VUOMaDOtYctQa0W23RHq2dtYdlNIi5zSrBquQXxvLOmKMi16ijLOO feYrYAJh2/1mJOt6CrOG5XnlUUEX+EWrtSfxQT5WW4OcALoE9WO2ZjhPMvX1Cc0RjhRB QhuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773260266; x=1773865066; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=USEdJZD4t49t/lSSKGJNdAbpficI/EvChZFc8qNnldA=; b=vjXrqojsduQsTzRInTrakYQSW97R1u6z+DRtz5aBDBZe5WrauACcCpKBetluL/meRe eF5DFOOMAM3e94d7HmPs4YU2pC2/IttkbctJO4MwJjLqFp7HFAxViqp2GL9VfMPmKHNi 6pC/RCDoHK+UaEtk+pMbvtdwf6v47zGsxcU39PtGAPjUgTMNeJ5pU2d9Tf/DpTFzWhYU KcLLabFQti1kX6nd7dC0LXYm01WuztazLMO9r9BO3IMmMLYbg55bWceO+gmNLg/yDB6k xI0OU6ZgNX9CKNgeJMb5SVYbL7YoItrWuspCCLLjSok1eYLXUl02t4X0bn+JDQzw2Xz3 U7iw== X-Forwarded-Encrypted: i=1; AJvYcCU2/HZZveAPXtSBYBuDj8Pyyb38OR4OykFMwJZFgwwVebGJkq05MhGEp7zlQUDnjl0zBidD72R3nwLcT+s=@vger.kernel.org X-Gm-Message-State: AOJu0YyX5YcXDg42yacuaJIojesRJAh4oDmN4uTk5OkLApGkWlVVaDdk I3BXPrnUhz1SxHfgFhfylt/R/pKLSf9xh3pfAuYlvS1rOPJr+nEu09Hw+gymyYjraADXW5gWcY2 fMS04zgRIpt5gmef3kqcQs9+dEbmkmOurjrI+WWM4r24WlTBbUtjvv1xETLNMAdINqK0X4uqFQN c= X-Gm-Gg: ATEYQzzMx+4QKjgtlUMcjAvoNXjdElcEjeLh5BLCQ1V8aYDIjceDM+/eA7JDUGlxUPe x9cSFrbn6wdcmiRYXHmLz/Ox7ej6fOQp5FgMq6a43ASOqCTlaRsiT76tPehoS7M4aDTsbztiQ6i vmdA0ENBGpwreD45XgBlUuCrkboOF8XNJGd3NTNnwjl7axIUna8jKNFTlwbJmUTP2zelP8OF47j xgEAGuk54+8uBYQYtt7ICEwuwlOQsN7SzE5MAImW1KIj+EjKeACXdjXN+3hdebNaqE5eu00oYx4 MxBwMAhHD89/m8Z0ur31Tj/Rc3Lfpxx3VTasFeoH5dxT5ecX4MDi1s+oVcsjh9YwiM5wA6W9UoR aBkrBg/YV5RA5igUiaP8751z9iizpIMVjph4VIOV2bFaM X-Received: by 2002:a05:620a:4041:b0:8c7:3ff0:d472 with SMTP id af79cd13be357-8cdaa7b6b03mr133547485a.15.1773260265909; Wed, 11 Mar 2026 13:17:45 -0700 (PDT) X-Received: by 2002:a05:620a:4041:b0:8c7:3ff0:d472 with SMTP id af79cd13be357-8cdaa7b6b03mr133544385a.15.1773260265467; Wed, 11 Mar 2026 13:17:45 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b65fd3dsm79257255e9.10.2026.03.11.13.17.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 13:17:44 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 11 Mar 2026 21:17:29 +0100 Subject: [PATCH 5/7] drm/msm/hdmi: Drop redundant 'int' for longs 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: <20260311-drm-msm-hdmi-cleanup-v1-5-c5535245f6de@oss.qualcomm.com> References: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> In-Reply-To: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3732; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=YOc37GFpIDuzzD9xXRHR6ElanP5yUXGTsuM7FbmpFSI=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpsc3axZZhUXT1CW6a6vbfC5K0dFoSFq+gi44wv b1XFk04VE6JAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCabHN2gAKCRDBN2bmhouD 17KOD/wOE6KN4qlo/MJUS2BggnfIaG7hgp7xG6+JTtyPfv8NTQi7ymQcDztDa5IT2RJv5VGbeN+ 3Qcu12APxMC8IP8XkBBD6/1WbB63sfxnvPEkLJIvxJgrbASFo8CRDmqIn9QHNKrVtLJz8ne4oDX kSpF+JGEQJgo7reGELB0nu2IH+pg3CwRsflmi0mQwDMz4LNJu/kKuIUEKzu79xRnXL9DPGsD1xe HJ6k/KnCr+OIHdUKs9F5x6gCx+DjQIpZzSo4Z0Jx/xYHaJG3FCe8I9m0o/iYSc+8UFCtvp+Orrx F1JP/clmn2bXNAbxgZf8saxRJ8cQ5ZC6BW56ghPSdx7tcYVnibshHroYpUCXjEguTOswG7SxDO7 Mekrz/KL+WG3zRRfNnN2RJ/UQB5K1TTborjHlHaYQA62IXuYA7oyNrshbMMkGsTKMm9zx8DdECm TknYMG7a0B2Na3kckkj9aHtagxiqWaS9WYbYYHhDeVTtJfUKoycZSxMIyFPidH5NxLrg5k6TtW7 I4oTQNK7TOM3Ra5+RjwwyeNbyjPzT23NWI4RZ44ayqXQpLHUySvTE12sKBKejt0dRwqaZaJKsHH j44AprlpPOyvS86kyAycEt+XHpn4toeX57AQw4urC4Re7mdo3C0UfnYuA0kVWo7s9SGIM0PUbaL +PNtLV2k8ss2vLw== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Authority-Analysis: v=2.4 cv=IfmKmGqa c=1 sm=1 tr=0 ts=69b1cdeb cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=gOEeR9iKwsj33Yj5oN/cWg==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=ls0epF-H7U94aXreF4MA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDE3MSBTYWx0ZWRfX3SaRQ0NV7EzZ L+CTBdz9OJmCYiX0x6VT0S416lwpw7WDn0R4SrnJ7OHRIF5tIqL+0Z5aZkWQQe+KbqKBKEuXA7m eMMLmHePkavcGj2gB74qnq+nUS2g2BoxVI+g8Qi6cJmb/1p6AatT3pGMu8DzVmT6QgRh/1g4Juo 3Ciov8/+ny2ZXl98GLxYl52VLowMD6hhx0AbafvCzoHp0ikkBbKLD3q0RvkeTEi1BigxsiMjEEc F9aBF2DzTfKmoUkAu9GiAwRPdnsYYxxAf9TNuZvaq9Vhk+c0FrWoW2NWuCBcw602WUd5SdH4V55 A72vfT6eFqnnzUSTQEy07xt0MO7fNJrd84pSQGq5gsgd6+YsUSj2Tb23josgKLyCFHuFm5kPz29 p5MRV5SwvCCPEctNLhQApPQr5zhjkT88FM47F8wT//Nksktj3IPK93mZFaa7m9lsk3r2fhRYMeQ tzIZLJKMcJSPj8PfRfg== X-Proofpoint-GUID: 37TUiOlQQBb_Yo7Ofrt_e6eHLAanLW2q X-Proofpoint-ORIG-GUID: 37TUiOlQQBb_Yo7Ofrt_e6eHLAanLW2q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-11_02,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 spamscore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110171 'long' type is already an integer, so 'int' is redundant. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/hdmi/hdmi.h | 6 +++--- drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 2 +- drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 2 +- drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 2 +- drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdm= i.h index 02cfd46df594..49433f7727c3 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -43,7 +43,7 @@ struct hdmi { bool power_on; bool hpd_enabled; struct mutex state_mutex; /* protects two booleans */ - unsigned long int pixclock; + unsigned long pixclock; =20 void __iomem *mmio; void __iomem *qfprom_mmio; @@ -132,7 +132,7 @@ enum hdmi_phy_type { =20 struct hdmi_phy_cfg { enum hdmi_phy_type type; - void (*powerup)(struct hdmi_phy *phy, unsigned long int pixclock); + void (*powerup)(struct hdmi_phy *phy, unsigned long pixclock); void (*powerdown)(struct hdmi_phy *phy); const char * const *reg_names; int num_regs; @@ -167,7 +167,7 @@ static inline u32 hdmi_phy_read(struct hdmi_phy *phy, u= 32 reg) =20 int msm_hdmi_phy_resource_enable(struct hdmi_phy *phy); void msm_hdmi_phy_resource_disable(struct hdmi_phy *phy); -void msm_hdmi_phy_powerup(struct hdmi_phy *phy, unsigned long int pixclock= ); +void msm_hdmi_phy_powerup(struct hdmi_phy *phy, unsigned long pixclock); void msm_hdmi_phy_powerdown(struct hdmi_phy *phy); void __init msm_hdmi_phy_driver_register(void); void __exit msm_hdmi_phy_driver_unregister(void); diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy.c b/drivers/gpu/drm/msm/hdmi= /hdmi_phy.c index 667573f1db7c..73fd5a47022d 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_phy.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy.c @@ -94,7 +94,7 @@ void msm_hdmi_phy_resource_disable(struct hdmi_phy *phy) pm_runtime_put_sync(dev); } =20 -void msm_hdmi_phy_powerup(struct hdmi_phy *phy, unsigned long int pixclock) +void msm_hdmi_phy_powerup(struct hdmi_phy *phy, unsigned long pixclock) { if (!phy || !phy->cfg->powerup) return; diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c b/drivers/gpu/drm/msm= /hdmi/hdmi_phy_8960.c index cf90a0c1f822..cfa8fc494199 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c @@ -7,7 +7,7 @@ #include "hdmi.h" =20 static void hdmi_phy_8960_powerup(struct hdmi_phy *phy, - unsigned long int pixclock) + unsigned long pixclock) { DBG("pixclock: %lu", pixclock); =20 diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c b/drivers/gpu/drm/msm= /hdmi/hdmi_phy_8x60.c index 1d97640d8c24..10ee91818364 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c @@ -9,7 +9,7 @@ #include "hdmi.h" =20 static void hdmi_phy_8x60_powerup(struct hdmi_phy *phy, - unsigned long int pixclock) + unsigned long pixclock) { /* De-serializer delay D/C for non-lbk mode: */ hdmi_phy_write(phy, REG_HDMI_8x60_PHY_REG0, diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c b/drivers/gpu/drm/msm= /hdmi/hdmi_phy_8x74.c index a2a6940e195a..6f40820d9071 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c @@ -7,7 +7,7 @@ #include "hdmi.h" =20 static void hdmi_phy_8x74_powerup(struct hdmi_phy *phy, - unsigned long int pixclock) + unsigned long pixclock) { hdmi_phy_write(phy, REG_HDMI_8x74_ANA_CFG0, 0x1b); hdmi_phy_write(phy, REG_HDMI_8x74_ANA_CFG1, 0xf2); --=20 2.51.0 From nobody Tue Apr 7 19:50:36 2026 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 F2838391E48 for ; Wed, 11 Mar 2026 20:17:49 +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=1773260271; cv=none; b=pqo+oyeRGA5dh0UkgehMkSJPPb6TBm0x0lWb6K2jgIrsLT4+Ut+dYnztdANdLjwf2FyYnWT1maFiwH7xnodGKOQXbiqrrJnLiDNQqo3opd61FO0Qu472MQLBj1RkYuwTNIELa/hs8Hekj1ZrMlg4i8OxAwt4hurG5yj4UdvFYqw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773260271; c=relaxed/simple; bh=HFld0pGzK+gfRaGsz97iqpHu891+p4M8R3L5EByimK0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Zw2D19tDKemz+jP2E1AWJbIqZWJpuDDZpx15ZteG4g/s1k0bDHVR/ufWmZ9UkSKYQ/wApzfaVq46fo2q2kglWr4/ioOqWFlyyMfMczT2o59PTaUdDZhBXd1MyXkPMk4VX9mQOz5WsFnn57LUVsMq52jtC7oYPfW/WF6YUcu94r4= 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=OcPc29Xo; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=FT+2Unnh; 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="OcPc29Xo"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="FT+2Unnh" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62BJBQWN1439628 for ; Wed, 11 Mar 2026 20:17:49 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= 5D1PWw6dwGUNePclrhAZ7JX6Zeom3TPhlQscH1nfVp0=; b=OcPc29XoF0CKBW9N tAYcb4AJrSY79XBPol9uxjyZfSRbplljRV1nJ03Eh2pC7DrbR2dHIupukozZW5vR sOU3zF+/7KCY2tMk0ZqH2peYxchg+qbBfnUz/giM5Sdt8szufY+a70FPoX1E6WvQ G8z6/pgFCBx+cWc01/vsOlBsyArn4YBMbYFy6uUiViH9tCuTJM0s8ecwoaQQhEir w4ZLEadlQrErS0ZWpEiMVW65O+W8TNeBBxje8phw5/7ux5VWSnP5q7pLmV/wYRRQ u/2GwH8QqeYv9G4R9fsDynX2G3EoD6OadepZLqsxem6iGxsMRjsaFVCs+yZqatIz JDgHMA== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cu38yjwjv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 20:17:48 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cd77bc8186so220933885a.0 for ; Wed, 11 Mar 2026 13:17:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773260268; x=1773865068; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5D1PWw6dwGUNePclrhAZ7JX6Zeom3TPhlQscH1nfVp0=; b=FT+2Unnhf4y7nQ3ojkOQbMM1K+BgZ5TXC1PeRPfPEs9uizpe0ZtbnwcxCvegKyhAMx luAYwH9M9x0RNJBGq9nc6uQoHOnf+FOk7lRla31ZetTBj3ggfABpMXzV4yx84gTXvicf jz9EhMHvRlvFi+FdXZ5a0umpIXmHckFv0DjMrgtXEydMagat01na2oOAl0XZEdkmmqEC J5DBgmF8KFurmUqwS997cfxhEw9rCn/Cenbfg0A29jeSoD2xQi334wqILknsuF+qNKb0 ZXE1YybXQFA+PCFvDJb2EtPP2sh4U39aab0Vx6anoJnDqr2Uqxsxg2RXThwGIQj1nNSV 67VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773260268; x=1773865068; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=5D1PWw6dwGUNePclrhAZ7JX6Zeom3TPhlQscH1nfVp0=; b=VvkpSsknVAr0F2uBz79coyZ6HH6auaXkEIlzKXmYTHsnjTU7dkIAvXagfuzRPLH3ln A2+hWzOUTOAcc9PILEd7tS/NODdBFpchGJUbi3uiaSBhMFSiCUHaOhoK+Vp5w1p/L30w bjKXbVUkW3uVdqod6NWXLJX0kwm7bkXgkVorXJlyInCu3ksBWyApdNCGEFgn9CoW1A1q wJryAlBnVhhMXQCQ1n+8b63OlW2T4NTj1ttGVPwNNAHe9swZlJwofbokOAbn6Yo2tGj4 Tqeot3NMmN/CD5Hc+SzKTYaoFzkN3FcqWCxI0uwcUoZOYuAATmdpv+C5dFDsuQ/1hfvX Hleg== X-Forwarded-Encrypted: i=1; AJvYcCWp2BFwQmIhlVVSiQ29APHNSJt2QCF4XhyuMryyfEihMlTSYxl7QVuPEXuTI/9WcI1+xId4ekvtVTa8COY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+CSJTjBNeYwXL0p9Ttf5wcXXl14t/8PamE9J3gF+VYDm0b8+k iWHX2+g+p9f6FWEjCX2tlsWsO5cZnKLc98YtGTe6ybeXTP4tgdljcQiZnpzmo9qIwBmpT6PrCUM Kf/CATS8c/Iss98BLtClDdLxXw58MeXKZpqmTq3ZlId56NUKjOgcBjMyRP14AayPWEJg= X-Gm-Gg: ATEYQzxDaGwsPBA760lfhrpNC23Zi1srlQ9Ukb5/jmqdrC4w1Vn/uM/bob9vlmgoN2g WYjNVg0XrcOzKveoTIGD8i3aPOU7Zrq8TsrMvfyP4QsE/khBLLcc5tYxi98F1kieiB4KA9e1/r4 g1NOSogeZ4E31uOvYCRBlMoORStNSLv2HqmOEVhiHV2mkF9/SRijLmXrKW0rn9+ec5mCsTVl4OY jfoR4XB4hQOvhkAjpwNXL2iM1xeTr/TlhvANWTvthQCbWAQU0m/ghoVo60MN2Q4F0EEZljHLI4r eZ3Js+yhaC8dh7HxbQUlTcyYgIuWOJ/Boxru8yH4S0S3sxyMbfOj+SAorumSHxVoC32O8+EwVAU IxMwC8ns+yOu9ZAZm9EOrieLi5W3Q2J6yqvRdSyhPX6B0 X-Received: by 2002:a05:620a:448b:b0:8cd:8a55:5118 with SMTP id af79cd13be357-8cda1a3171emr523156485a.43.1773260268048; Wed, 11 Mar 2026 13:17:48 -0700 (PDT) X-Received: by 2002:a05:620a:448b:b0:8cd:8a55:5118 with SMTP id af79cd13be357-8cda1a3171emr523152485a.43.1773260267614; Wed, 11 Mar 2026 13:17:47 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b65fd3dsm79257255e9.10.2026.03.11.13.17.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 13:17:46 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 11 Mar 2026 21:17:30 +0100 Subject: [PATCH 6/7] drm/msm/hdmi_bridge: Simplify register bit updates 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: <20260311-drm-msm-hdmi-cleanup-v1-6-c5535245f6de@oss.qualcomm.com> References: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> In-Reply-To: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=8132; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=HFld0pGzK+gfRaGsz97iqpHu891+p4M8R3L5EByimK0=; b=kA0DAAoBwTdm5oaLg9cByyZiAGmxzdui7HiIP9Vggsu0TMdxFdLFK2khXiuGgxNyOMroUlZ6S IkCMwQAAQoAHRYhBN3SYig9ERsjO264qME3ZuaGi4PXBQJpsc3bAAoJEME3ZuaGi4PXsAoP/iyF 1luTYLf7jLW+y9QDBWpy73TGPrtBKFqExUlgmBbL99PjWr2CB4b3GSS+NryZv7+A15KbIW+MG4Z sz5VXzhXfUPaYlE1s8RBYhj0A4Ci4MaxLGcZKTcz6f6Q/05OuNbIo5HSoKjUPRTsD/xjwmBJVXm +HwEwWdyGdW05uRObvHEWywOpBNUxp8CacqYdAivujq3xeJ9DtN6gbxnQft2P0bFetbBxVSejZO jIZyKZV4KUkwY0ArhJyacGRNlMuZrjh2srm1IPbeG+9m96c5PP6z+NYMjVItHA18MbV3DNKHPxW btgJvugnIWGEPu1fbPc1JVSq7KC3GhuXGEOMksEGWwPI9AuWsHSm/dmBgKqRZCBtgUdxPKO5CeF 4BF948n9OYSLWi/RBEN1VLTQgZ83tpVhOv+ArYVYHpGAwVgm7kFH8fMV4UzZg+S8dX31uoxmNPn 5/QEyAFUP8SQydzGlCId/r13yaoD6JpCYv56db9+cVY7La28vs+rTyqMflcb0taVHaCKG6MkwLN Y8k4I1K3nPLv76EiSUy3jnCg73UXSjdvgeqX3KOY01/s8n+k4U4IcqNA6nhc20x5pcaMomqOUp/ fsB75aYVKHh8a05yuWyD9d9xP0WEy5ByopKcbRHLqak8TEApdjK+XX9A+iO6Ef7t/fN+eUQMGPM sX5VK X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDE3MiBTYWx0ZWRfX5S4NoYCaXwbL YlaG2MBLe1KLH4kU7VoNrr1HmFw07ziDznfo5jcLBdUM5XvfL0DGqyYV/hor1tYs5Yz8IqN2qjd oC7VF1iu21DcpDXkQgeK4uCOzVNHF795IUHN6LQo6C/GbvqQO/u8F/eaP8JuXpYobfKkEmKvdWK 44flujvCShT2A7mqVRO3kyg5tU6AtTg4f8rSno8LZwCEq6RJD/t9fC0fj+2VCa7y05aBXrjInMO XreLtfjw5Tx3XeQRQxXn1VzaB2ic8mf7RkNhGg6rnSXDJnnDeOySHCflAPA74PkvNGRLZIjNdLa bXFSybOJfYUvLqpTYFFC2B+rqStPEFTshVDupRyOdNXvRb512O2WpMFVnERQWGMGZ2JEbE0t6sU GHjhrahqXYC25ms0h9f5Kmq+8NiOqUzwyiBdIrpZcQdnZozPeqKfJl6PgvT5w7KEyFz8WJdV8cq TGWAx1frdaFeprU5v1g== X-Proofpoint-GUID: GddFFmWRakArsYG5ifSJg0TLLLHtx72m X-Proofpoint-ORIG-GUID: GddFFmWRakArsYG5ifSJg0TLLLHtx72m X-Authority-Analysis: v=2.4 cv=Cq+ys34D c=1 sm=1 tr=0 ts=69b1cdec cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=gOEeR9iKwsj33Yj5oN/cWg==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=aOjUM9GFJvKfr9THBUUA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-11_02,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110172 Simplify reister updates (read, apply mask, write) with a wrapper to make code more obvious and avoid possible errors of reading and writing to different registers. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/hdmi/hdmi.h | 19 +++++++ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 98 ++++++++++++++----------------= ---- 2 files changed, 60 insertions(+), 57 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdm= i.h index 49433f7727c3..436d4f9fe346 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -112,6 +112,25 @@ static inline u32 hdmi_read(struct hdmi *hdmi, u32 reg) return readl(hdmi->mmio + reg); } =20 +static inline void hdmi_clear_bits(struct hdmi *hdmi, u32 reg, u32 mask) +{ + u32 val; + + val =3D hdmi_read(hdmi, reg); + val &=3D ~mask; + hdmi_write(hdmi, reg, val); +} + +static inline void hdmi_update_bits(struct hdmi *hdmi, u32 reg, u32 mask, = u32 data) +{ + u32 val; + + val =3D hdmi_read(hdmi, reg); + val &=3D ~mask; + val |=3D data & mask; + hdmi_write(hdmi, reg, val); +} + static inline u32 hdmi_qfprom_read(struct hdmi *hdmi, u32 reg) { return readl(hdmi->qfprom_mmio + reg); diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/h= dmi/hdmi_bridge.c index a9eb6489c520..b6ca334fb9fe 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c @@ -58,16 +58,13 @@ static int msm_hdmi_bridge_clear_avi_infoframe(struct d= rm_bridge *bridge) { struct hdmi_bridge *hdmi_bridge =3D to_hdmi_bridge(bridge); struct hdmi *hdmi =3D hdmi_bridge->hdmi; - u32 val; =20 - val =3D hdmi_read(hdmi, REG_HDMI_INFOFRAME_CTRL0); - val &=3D ~(HDMI_INFOFRAME_CTRL0_AVI_SEND | - HDMI_INFOFRAME_CTRL0_AVI_CONT); - hdmi_write(hdmi, REG_HDMI_INFOFRAME_CTRL0, val); + hdmi_clear_bits(hdmi, REG_HDMI_INFOFRAME_CTRL0, + HDMI_INFOFRAME_CTRL0_AVI_SEND | + HDMI_INFOFRAME_CTRL0_AVI_CONT); =20 - val =3D hdmi_read(hdmi, REG_HDMI_INFOFRAME_CTRL1); - val &=3D ~HDMI_INFOFRAME_CTRL1_AVI_INFO_LINE__MASK; - hdmi_write(hdmi, REG_HDMI_INFOFRAME_CTRL1, val); + hdmi_clear_bits(hdmi, REG_HDMI_INFOFRAME_CTRL1, + HDMI_INFOFRAME_CTRL1_AVI_INFO_LINE__MASK); =20 return 0; } @@ -76,18 +73,15 @@ static int msm_hdmi_bridge_clear_audio_infoframe(struct= drm_bridge *bridge) { struct hdmi_bridge *hdmi_bridge =3D to_hdmi_bridge(bridge); struct hdmi *hdmi =3D hdmi_bridge->hdmi; - u32 val; =20 - val =3D hdmi_read(hdmi, REG_HDMI_INFOFRAME_CTRL0); - val &=3D ~(HDMI_INFOFRAME_CTRL0_AUDIO_INFO_SEND | - HDMI_INFOFRAME_CTRL0_AUDIO_INFO_CONT | - HDMI_INFOFRAME_CTRL0_AUDIO_INFO_SOURCE | - HDMI_INFOFRAME_CTRL0_AUDIO_INFO_UPDATE); - hdmi_write(hdmi, REG_HDMI_INFOFRAME_CTRL0, val); + hdmi_clear_bits(hdmi, REG_HDMI_INFOFRAME_CTRL0, + HDMI_INFOFRAME_CTRL0_AUDIO_INFO_SEND | + HDMI_INFOFRAME_CTRL0_AUDIO_INFO_CONT | + HDMI_INFOFRAME_CTRL0_AUDIO_INFO_SOURCE | + HDMI_INFOFRAME_CTRL0_AUDIO_INFO_UPDATE); =20 - val =3D hdmi_read(hdmi, REG_HDMI_INFOFRAME_CTRL1); - val &=3D ~HDMI_INFOFRAME_CTRL1_AUDIO_INFO_LINE__MASK; - hdmi_write(hdmi, REG_HDMI_INFOFRAME_CTRL1, val); + hdmi_clear_bits(hdmi, REG_HDMI_INFOFRAME_CTRL1, + HDMI_INFOFRAME_CTRL1_AUDIO_INFO_LINE__MASK); =20 return 0; } @@ -96,13 +90,11 @@ static int msm_hdmi_bridge_clear_spd_infoframe(struct d= rm_bridge *bridge) { struct hdmi_bridge *hdmi_bridge =3D to_hdmi_bridge(bridge); struct hdmi *hdmi =3D hdmi_bridge->hdmi; - u32 val; =20 - val =3D hdmi_read(hdmi, REG_HDMI_GEN_PKT_CTRL); - val &=3D ~(HDMI_GEN_PKT_CTRL_GENERIC1_SEND | - HDMI_GEN_PKT_CTRL_GENERIC1_CONT | - HDMI_GEN_PKT_CTRL_GENERIC1_LINE__MASK); - hdmi_write(hdmi, REG_HDMI_GEN_PKT_CTRL, val); + hdmi_clear_bits(hdmi, REG_HDMI_GEN_PKT_CTRL, + HDMI_GEN_PKT_CTRL_GENERIC1_SEND | + HDMI_GEN_PKT_CTRL_GENERIC1_CONT | + HDMI_GEN_PKT_CTRL_GENERIC1_LINE__MASK); =20 return 0; } @@ -111,14 +103,12 @@ static int msm_hdmi_bridge_clear_hdmi_infoframe(struc= t drm_bridge *bridge) { struct hdmi_bridge *hdmi_bridge =3D to_hdmi_bridge(bridge); struct hdmi *hdmi =3D hdmi_bridge->hdmi; - u32 val; =20 - val =3D hdmi_read(hdmi, REG_HDMI_GEN_PKT_CTRL); - val &=3D ~(HDMI_GEN_PKT_CTRL_GENERIC0_SEND | - HDMI_GEN_PKT_CTRL_GENERIC0_CONT | - HDMI_GEN_PKT_CTRL_GENERIC0_UPDATE | - HDMI_GEN_PKT_CTRL_GENERIC0_LINE__MASK); - hdmi_write(hdmi, REG_HDMI_GEN_PKT_CTRL, val); + hdmi_clear_bits(hdmi, REG_HDMI_GEN_PKT_CTRL, + HDMI_GEN_PKT_CTRL_GENERIC0_SEND | + HDMI_GEN_PKT_CTRL_GENERIC0_CONT | + HDMI_GEN_PKT_CTRL_GENERIC0_UPDATE | + HDMI_GEN_PKT_CTRL_GENERIC0_LINE__MASK); =20 return 0; } @@ -129,7 +119,6 @@ static int msm_hdmi_bridge_write_avi_infoframe(struct d= rm_bridge *bridge, struct hdmi_bridge *hdmi_bridge =3D to_hdmi_bridge(bridge); struct hdmi *hdmi =3D hdmi_bridge->hdmi; u32 buf[4] =3D {}; - u32 val; int i; =20 if (len !=3D HDMI_INFOFRAME_SIZE(AVI) || len - 3 > sizeof(buf)) { @@ -153,15 +142,13 @@ static int msm_hdmi_bridge_write_avi_infoframe(struct= drm_bridge *bridge, for (i =3D 0; i < ARRAY_SIZE(buf); i++) hdmi_write(hdmi, REG_HDMI_AVI_INFO(i), buf[i]); =20 - val =3D hdmi_read(hdmi, REG_HDMI_INFOFRAME_CTRL0); - val |=3D HDMI_INFOFRAME_CTRL0_AVI_SEND | - HDMI_INFOFRAME_CTRL0_AVI_CONT; - hdmi_write(hdmi, REG_HDMI_INFOFRAME_CTRL0, val); + hdmi_update_bits(hdmi, REG_HDMI_INFOFRAME_CTRL0, + HDMI_INFOFRAME_CTRL0_AVI_SEND | HDMI_INFOFRAME_CTRL0_AVI_CONT, + HDMI_INFOFRAME_CTRL0_AVI_SEND | HDMI_INFOFRAME_CTRL0_AVI_CONT); =20 - val =3D hdmi_read(hdmi, REG_HDMI_INFOFRAME_CTRL1); - val &=3D ~HDMI_INFOFRAME_CTRL1_AVI_INFO_LINE__MASK; - val |=3D HDMI_INFOFRAME_CTRL1_AVI_INFO_LINE(AVI_IFRAME_LINE_NUMBER); - hdmi_write(hdmi, REG_HDMI_INFOFRAME_CTRL1, val); + hdmi_update_bits(hdmi, REG_HDMI_INFOFRAME_CTRL1, + HDMI_INFOFRAME_CTRL1_AVI_INFO_LINE__MASK, + HDMI_INFOFRAME_CTRL1_AVI_INFO_LINE(AVI_IFRAME_LINE_NUMBER)); =20 return 0; } @@ -193,12 +180,11 @@ static int msm_hdmi_bridge_write_audio_infoframe(stru= ct drm_bridge *bridge, buffer[9] << 16 | buffer[10] << 24); =20 - val =3D hdmi_read(hdmi, REG_HDMI_INFOFRAME_CTRL0); - val |=3D HDMI_INFOFRAME_CTRL0_AUDIO_INFO_SEND | - HDMI_INFOFRAME_CTRL0_AUDIO_INFO_CONT | - HDMI_INFOFRAME_CTRL0_AUDIO_INFO_SOURCE | - HDMI_INFOFRAME_CTRL0_AUDIO_INFO_UPDATE; - hdmi_write(hdmi, REG_HDMI_INFOFRAME_CTRL0, val); + val =3D HDMI_INFOFRAME_CTRL0_AUDIO_INFO_SEND | + HDMI_INFOFRAME_CTRL0_AUDIO_INFO_CONT | + HDMI_INFOFRAME_CTRL0_AUDIO_INFO_SOURCE | + HDMI_INFOFRAME_CTRL0_AUDIO_INFO_UPDATE; + hdmi_update_bits(hdmi, REG_HDMI_INFOFRAME_CTRL0, val, val); =20 return 0; } @@ -231,11 +217,10 @@ static int msm_hdmi_bridge_write_spd_infoframe(struct= drm_bridge *bridge, for (i =3D 0; i < ARRAY_SIZE(buf); i++) hdmi_write(hdmi, REG_HDMI_GENERIC1(i), buf[i]); =20 - val =3D hdmi_read(hdmi, REG_HDMI_GEN_PKT_CTRL); - val |=3D HDMI_GEN_PKT_CTRL_GENERIC1_SEND | - HDMI_GEN_PKT_CTRL_GENERIC1_CONT | - HDMI_GEN_PKT_CTRL_GENERIC1_LINE(SPD_IFRAME_LINE_NUMBER); - hdmi_write(hdmi, REG_HDMI_GEN_PKT_CTRL, val); + val =3D HDMI_GEN_PKT_CTRL_GENERIC1_SEND | + HDMI_GEN_PKT_CTRL_GENERIC1_CONT | + HDMI_GEN_PKT_CTRL_GENERIC1_LINE(SPD_IFRAME_LINE_NUMBER); + hdmi_update_bits(hdmi, REG_HDMI_GEN_PKT_CTRL, val, val); =20 return 0; } @@ -269,12 +254,11 @@ static int msm_hdmi_bridge_write_hdmi_infoframe(struc= t drm_bridge *bridge, for (i =3D 0; i < ARRAY_SIZE(buf); i++) hdmi_write(hdmi, REG_HDMI_GENERIC0(i), buf[i]); =20 - val =3D hdmi_read(hdmi, REG_HDMI_GEN_PKT_CTRL); - val |=3D HDMI_GEN_PKT_CTRL_GENERIC0_SEND | - HDMI_GEN_PKT_CTRL_GENERIC0_CONT | - HDMI_GEN_PKT_CTRL_GENERIC0_UPDATE | - HDMI_GEN_PKT_CTRL_GENERIC0_LINE(VENSPEC_IFRAME_LINE_NUMBER); - hdmi_write(hdmi, REG_HDMI_GEN_PKT_CTRL, val); + val =3D HDMI_GEN_PKT_CTRL_GENERIC0_SEND | + HDMI_GEN_PKT_CTRL_GENERIC0_CONT | + HDMI_GEN_PKT_CTRL_GENERIC0_UPDATE | + HDMI_GEN_PKT_CTRL_GENERIC0_LINE(VENSPEC_IFRAME_LINE_NUMBER); + hdmi_update_bits(hdmi, REG_HDMI_GEN_PKT_CTRL, val, val); =20 return 0; } --=20 2.51.0 From nobody Tue Apr 7 19:50:36 2026 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 D7A9838F620 for ; Wed, 11 Mar 2026 20:17:51 +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=1773260273; cv=none; b=N75jLxq0jkR8xQt3j1cZeFVjwKqQD/PUueW7RM0XArWkSlUG1T6OuJOHDgrmMpBD5Mdu6ygO7o/r00sHta9ToE5YG7IuNtZhSh/zNN0ubh61AscyshFKWs5SRrv2PeRpA4UyIE8qUYH4+YAJh+BSofAFlAd3uM7UteZiQ3WWSEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773260273; c=relaxed/simple; bh=8XMa4wsTUcexijaN95Xa/+lE5OvRgvIaBdz6gmBRNU8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NggY9BA2G6tprd/KeTmQNiLMw+aTwOVNp8h5M8qVxIuhM0lwSnab56oeU1JOecIcLbWmXMTm+uOIrn0OvkjWTn58NRw8PMXUg5hz301WfUJ/PB+OyQbpksp/tOAUVFiadg097nMxkj4pQO8aoFCst3lP26/VUUhSGN291Yh+bB4= 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=kMgiB8P0; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=RGBq4k4B; 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="kMgiB8P0"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="RGBq4k4B" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62BFpLF8351034 for ; Wed, 11 Mar 2026 20:17:51 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= WUfDsXE2bewsJbQrNcPdTtiQ5aMigLmKp8tPDJLp/a0=; b=kMgiB8P0H8w3+zT3 FcgU+Aq5DunS/yH6Yl/Hn5mt3MbzvC9njX2Xf4BTEM0IYc2fZ4A0plMQKX5/y4NU Ah2BwRpgWoXgFFiKmuqNpBKXmtamNMqBR99YhgLzS8TvvNi42qcQzz/+bmv2YuQw sqTMLqQ+E5wKrwhL0LK9A5TZ0u7IZPJc/3aF4ejtTXpZGV1vO+CYNFVZy7JGdwt4 2fqUtV82qd7H+UN6nuUV8OI/S46E/Zr5LfGJb6t5Xsg1gu1vSpkMx/eh+A/3QB1I TTMZ+aDBk5XtjiN1B5tcCfGp+bgTsnUeLSEpRE4ZkoO82bP4TPmr9hNQDZSn94Sf AW1RiQ== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cubd6gvum-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 20:17:50 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cd77bc8186so220960385a.0 for ; Wed, 11 Mar 2026 13:17:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773260270; x=1773865070; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WUfDsXE2bewsJbQrNcPdTtiQ5aMigLmKp8tPDJLp/a0=; b=RGBq4k4BtH77auG0FGeufFqTN15Ck0TexIdsi6Ou9pn1oJDZH16e+/I3ze1tsXAl6I M8km6iTi5kPrbsVcxrrPczADgmEZVZ+YXVP2JV05YLT5nl+zTfNpWdU7teU2UwexTH+g E5VQ5RtLt+5KCDR654+O+tZ8k95iacpx2qvgqRYYUVzSlE1eXxSKm9T1R84epntyCma9 Ww8LgKt3fmWYUNUCc8vzE3rqM6NkXyGvAqb7UHHtdeXJZ3JD82Jy1NYkzmibYvER1BqX Qlq9y0hwiEFL0t6OZ+nl3BeJSI9j70X5KAr8dC8oW2xCWJAr0FrXOwtea7kVz1B18lS0 81aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773260270; x=1773865070; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=WUfDsXE2bewsJbQrNcPdTtiQ5aMigLmKp8tPDJLp/a0=; b=tkoiYG7gMhPXC2oSMRsXej4sqPwlU8XHw18d2dJA04gYDEytYyDy9tXRibf8Vse4GE 9hY/I8cI9vKUsADlNsjt4OlcNsXI6ggB+Fx67cw7wONmbsT0XDIGAErysIJoo/+lDigJ 5BO5UYeunyNDeeQiE3Y6JfGPwkC052Lm4R9llpZ1MNJsPtk5nd1sKeTu85A1NNADvzG5 zPW9gz7eEb57eekqRsTW2nr1j5hS8zLhcsV5RF+e6WX5yloajVbn4glrNpQfcId4Tra6 RMLvzgsmLgjdBbQ0x2p5TCbVlUaQnEBSJ/PcQXOFuyzvF5fGsjQPy4xGjSSayuCXnMJm mfZA== X-Forwarded-Encrypted: i=1; AJvYcCUOZHHfyZjcc2O+U72kcf6IRLO99FZYLxViFqzouRjU3ydpvc7eWihBRcBnokVB3AVLff2Dva2+KXawV0Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxaSxb7JJEClRgR53GSDhmkU2Z27tnDd85PFbEs2/ZxFam0/3zK z9Qs2VYUjD5vtZFvExP83Wn83FMj9knIQ2JlNBlKpiRombG/zP0sx1nTiA0SS4WA1+TN1GhuIjh FnCJ/UQHbPl1FswAEWBxkH0Bo+IbW7OpIHQGn3yQNy0infvPKf5MQDAJLfnNkN96KCes= X-Gm-Gg: ATEYQzwQH3T/1BtGI6HA2H8+XYHhM7hBVivEbW8O32skFZWbt6/XQYnawKJua2Y69bB Q8cRrrziB53JtQ7OSqrpB9ZKdY6aN1uQFzxToETXyJJIuNjUkiM2JKMRGeMWmlFxFK05gceRDcH 5IPGfe/OsIwbpw3FDHGlLLgno3yoGNhcgOw44A71j0ca9Fq7EytmB63rNrHKNxJ0xolPmHZAlwy n3Vw3cCtSMfujE4RaV8/+kR4EjEtjghYO0f//60YKO/aTQYiuBv8SMvQvDwidCUkl59GonXixLl lmxWOwIiY2URy+r04WXtukG62ekjUf4P3ujW1pqCxmlgT7YN4xjqfOpEwxOwk6JnZS8tgzin00Y JN2t+3MeqU+ZRJJgClylZYgMXHsBVC6ZTR0ZsGzZBjFVr X-Received: by 2002:a05:620a:708a:b0:8cb:4059:a909 with SMTP id af79cd13be357-8cda1956ac0mr553432485a.21.1773260270126; Wed, 11 Mar 2026 13:17:50 -0700 (PDT) X-Received: by 2002:a05:620a:708a:b0:8cb:4059:a909 with SMTP id af79cd13be357-8cda1956ac0mr553428485a.21.1773260269682; Wed, 11 Mar 2026 13:17:49 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.94]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b65fd3dsm79257255e9.10.2026.03.11.13.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 13:17:48 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 11 Mar 2026 21:17:31 +0100 Subject: [PATCH 7/7] drm/msm/hdmi_hdcp: Simplify register bit updates 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: <20260311-drm-msm-hdmi-cleanup-v1-7-c5535245f6de@oss.qualcomm.com> References: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> In-Reply-To: <20260311-drm-msm-hdmi-cleanup-v1-0-c5535245f6de@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=9385; i=krzysztof.kozlowski@oss.qualcomm.com; h=from:subject:message-id; bh=8XMa4wsTUcexijaN95Xa/+lE5OvRgvIaBdz6gmBRNU8=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBpsc3cfvxWGj/HrNqippRl5yeLDVnfLLiTatfgb vOaaMf4BPGJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCabHN3AAKCRDBN2bmhouD 1447D/0QPvgUPTbzaC5cY2j7uyYgBrjkju5R1+H21BG9UvvJd+Wxz+McNqCfV34gBK1EPc7bfg7 bD0TUjKJByBioIN+3gL2RZiJJxucvEqsFWmhWxTuOZoFOndaUuymfzBCJMD6EyBPIwk+0Y3VLPq xaxMRrylzi0WnRCxTb6DQqprOOyYBaW/N9C4LFDnvQMbFyTlLLfsiRkVn1WLBkRL1k9ABay7Hoh OuoZRTjgAJjnwmUDR19X/XpiqLYW60aNRv9aNUQJ+12pDskGNQRIAH/TPsZaZ3PSkn0CplVjNOW ESxaZSXWFs5MhcjUpxE4Ot3jS1IgUNz48eclsE96oOucjC+g1CEoX2CeCIucAnEzqYJRbCmuHLH eFLzbiuyUZWedLS4HHY+Hlw/laVRyRl7+wtsAUMIw2nGTfs/wOctan2i/swBiXVyYrVnkSkK5mO YuuFYK4sy1i+2WdhyDbmYkwM9A7VPDXEJaVM+2L6aAEGg5hbZzRwOSrB1r1uPqZE/vLtegZGqCs 6xrcmPEaEWXLQw66S/iNiwbwOar0l3ZgWkiEu99PmHy5AoozRAfuAaZ6UvCAukuANQiq8Ak1/1Q DD+MquVqa7BMAx6JuvwQMY55m3k/DFNbh8jesZfro1no9WwgJBbA6kulK8c9DV5indwq0TQJcTU lL0VK0Gn4XITvMw== X-Developer-Key: i=krzysztof.kozlowski@oss.qualcomm.com; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-Authority-Analysis: v=2.4 cv=OvdCCi/t c=1 sm=1 tr=0 ts=69b1cdee cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=gOEeR9iKwsj33Yj5oN/cWg==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=kVIxuixzSQivcz-PG0cA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDE3MiBTYWx0ZWRfX9bqpK9tbgnDw 9kzY/I9QrCoQDEq8zazsz6W5h+gPK8nPvlmMINNFMmdjE1EHX4b8TTxPyBvfWFjUKD1T/u7LAvB DAmCPx93hF2bxcXb26FHV6S5CSIDC9Ttob8XNF87lRDxBceSN/Mf5esLL2MV9VDotlrjtK6pfCm uNGVtaEWa6Ov3oFqs74NNcXWfNq65XHJN/2P4mnXQiOlAvE4PkuI0kriJ6yekKJcFDxCTL368+7 Hkxck6ffVqjUbOwPkiUEWcoJ8N2HdEXxjBUSlyVVxPloQCKWg9qdQbc4QA2tY9krn07EUqwkJsi EIKSvRPc6aw1ZJkXa0Kohzk2hwukMjuQz6qO/88Feago+FsZhM/NtV8Eltc5AyO7n37mrspEiQy xGYh1ujAmjYFNOdlK8XEqDEeuNy3XVjJlPeLumFAq9h9bRn2zJFgJxjxBCaUG0F/ntSBuFhDoEF smZFIYS2OrltfZ09TKQ== X-Proofpoint-GUID: 15F6w25Iuxs1tPsgDboHdZ53T_xrwhTx X-Proofpoint-ORIG-GUID: 15F6w25Iuxs1tPsgDboHdZ53T_xrwhTx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-11_02,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 impostorscore=0 phishscore=0 malwarescore=0 suspectscore=0 adultscore=0 spamscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110172 Simplify reister updates (read, apply mask, write) with a wrapper to make code more obvious and avoid possible errors of reading and writing to different registers. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 85 ++++++++++++--------------------= ---- 1 file changed, 28 insertions(+), 57 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c b/drivers/gpu/drm/msm/hdm= i/hdmi_hdcp.c index 8fb5497aac9f..7862bd67d154 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c @@ -306,9 +306,9 @@ static int msm_reset_hdcp_ddc_failures(struct hdmi_hdcp= _ctrl *hdcp_ctrl) HDMI_HDCP_DDC_CTRL_0_DISABLE); =20 /* ACK the Failure to Clear it */ - reg_val =3D hdmi_read(hdmi, REG_HDMI_HDCP_DDC_CTRL_1); - reg_val |=3D HDMI_HDCP_DDC_CTRL_1_FAILED_ACK; - hdmi_write(hdmi, REG_HDMI_HDCP_DDC_CTRL_1, reg_val); + hdmi_update_bits(hdmi, REG_HDMI_HDCP_DDC_CTRL_1, + HDMI_HDCP_DDC_CTRL_1_FAILED_ACK, + HDMI_HDCP_DDC_CTRL_1_FAILED_ACK); =20 /* Check if the FAILURE got Cleared */ reg_val =3D hdmi_read(hdmi, REG_HDMI_HDCP_DDC_STATUS); @@ -324,28 +324,22 @@ static int msm_reset_hdcp_ddc_failures(struct hdmi_hd= cp_ctrl *hdcp_ctrl) DBG("Before: HDMI_DDC_SW_STATUS=3D0x%08x", hdmi_read(hdmi, REG_HDMI_DDC_SW_STATUS)); /* Reset HDMI DDC software status */ - reg_val =3D hdmi_read(hdmi, REG_HDMI_DDC_CTRL); - reg_val |=3D HDMI_DDC_CTRL_SW_STATUS_RESET; - hdmi_write(hdmi, REG_HDMI_DDC_CTRL, reg_val); + hdmi_update_bits(hdmi, REG_HDMI_DDC_CTRL, HDMI_DDC_CTRL_SW_STATUS_RESET, + HDMI_DDC_CTRL_SW_STATUS_RESET); =20 rc =3D msm_hdmi_hdcp_msleep(hdcp_ctrl, 20, AUTH_ABORT_EV); =20 - reg_val =3D hdmi_read(hdmi, REG_HDMI_DDC_CTRL); - reg_val &=3D ~HDMI_DDC_CTRL_SW_STATUS_RESET; - hdmi_write(hdmi, REG_HDMI_DDC_CTRL, reg_val); + hdmi_clear_bits(hdmi, REG_HDMI_DDC_CTRL, HDMI_DDC_CTRL_SW_STATUS_RESET); =20 /* Reset HDMI DDC Controller */ - reg_val =3D hdmi_read(hdmi, REG_HDMI_DDC_CTRL); - reg_val |=3D HDMI_DDC_CTRL_SOFT_RESET; - hdmi_write(hdmi, REG_HDMI_DDC_CTRL, reg_val); + hdmi_update_bits(hdmi, REG_HDMI_DDC_CTRL, HDMI_DDC_CTRL_SOFT_RESET, + HDMI_DDC_CTRL_SOFT_RESET); =20 /* If previous msleep is aborted, skip this msleep */ if (!rc) rc =3D msm_hdmi_hdcp_msleep(hdcp_ctrl, 20, AUTH_ABORT_EV); =20 - reg_val =3D hdmi_read(hdmi, REG_HDMI_DDC_CTRL); - reg_val &=3D ~HDMI_DDC_CTRL_SOFT_RESET; - hdmi_write(hdmi, REG_HDMI_DDC_CTRL, reg_val); + hdmi_clear_bits(hdmi, REG_HDMI_DDC_CTRL, HDMI_DDC_CTRL_SOFT_RESET); DBG("After: HDMI_DDC_SW_STATUS=3D0x%08x", hdmi_read(hdmi, REG_HDMI_DDC_SW_STATUS)); } @@ -399,7 +393,6 @@ static void msm_hdmi_hdcp_reauth_work(struct work_struc= t *work) struct hdmi_hdcp_ctrl, hdcp_reauth_work); struct hdmi *hdmi =3D hdcp_ctrl->hdmi; unsigned long flags; - u32 reg_val; =20 DBG("HDCP REAUTH WORK"); /* @@ -409,9 +402,7 @@ static void msm_hdmi_hdcp_reauth_work(struct work_struc= t *work) * AN1_READY bits in HDMI_HDCP_LINK0_STATUS register */ spin_lock_irqsave(&hdmi->reg_lock, flags); - reg_val =3D hdmi_read(hdmi, REG_HDMI_HPD_CTRL); - reg_val &=3D ~HDMI_HPD_CTRL_ENABLE; - hdmi_write(hdmi, REG_HDMI_HPD_CTRL, reg_val); + hdmi_clear_bits(hdmi, REG_HDMI_HPD_CTRL, HDMI_HPD_CTRL_ENABLE); =20 /* Disable HDCP interrupts */ hdmi_write(hdmi, REG_HDMI_HDCP_INT_CTRL, 0); @@ -431,9 +422,8 @@ static void msm_hdmi_hdcp_reauth_work(struct work_struc= t *work) =20 /* Enable HPD circuitry */ spin_lock_irqsave(&hdmi->reg_lock, flags); - reg_val =3D hdmi_read(hdmi, REG_HDMI_HPD_CTRL); - reg_val |=3D HDMI_HPD_CTRL_ENABLE; - hdmi_write(hdmi, REG_HDMI_HPD_CTRL, reg_val); + hdmi_update_bits(hdmi, REG_HDMI_HPD_CTRL, HDMI_HPD_CTRL_ENABLE, + HDMI_HPD_CTRL_ENABLE); spin_unlock_irqrestore(&hdmi->reg_lock, flags); =20 /* @@ -456,7 +446,6 @@ static int msm_hdmi_hdcp_auth_prepare(struct hdmi_hdcp_= ctrl *hdcp_ctrl) { struct hdmi *hdmi =3D hdcp_ctrl->hdmi; u32 link0_status; - u32 reg_val; unsigned long flags; int rc; =20 @@ -472,14 +461,11 @@ static int msm_hdmi_hdcp_auth_prepare(struct hdmi_hdc= p_ctrl *hdcp_ctrl) =20 spin_lock_irqsave(&hdmi->reg_lock, flags); /* disable HDMI Encrypt */ - reg_val =3D hdmi_read(hdmi, REG_HDMI_CTRL); - reg_val &=3D ~HDMI_CTRL_ENCRYPTED; - hdmi_write(hdmi, REG_HDMI_CTRL, reg_val); + hdmi_clear_bits(hdmi, REG_HDMI_CTRL, HDMI_CTRL_ENCRYPTED); =20 /* Enabling Software DDC */ - reg_val =3D hdmi_read(hdmi, REG_HDMI_DDC_ARBITRATION); - reg_val &=3D ~HDMI_DDC_ARBITRATION_HW_ARBITRATION; - hdmi_write(hdmi, REG_HDMI_DDC_ARBITRATION, reg_val); + hdmi_clear_bits(hdmi, REG_HDMI_DDC_ARBITRATION, + HDMI_DDC_ARBITRATION_HW_ARBITRATION); spin_unlock_irqrestore(&hdmi->reg_lock, flags); =20 /* @@ -498,9 +484,8 @@ static int msm_hdmi_hdcp_auth_prepare(struct hdmi_hdcp_= ctrl *hdcp_ctrl) hdmi_write(hdmi, REG_HDMI_HDCP_ENTROPY_CTRL1, 0xF00DFACE); =20 /* Disable the RngCipher state */ - reg_val =3D hdmi_read(hdmi, REG_HDMI_HDCP_DEBUG_CTRL); - reg_val &=3D ~HDMI_HDCP_DEBUG_CTRL_RNG_CIPHER; - hdmi_write(hdmi, REG_HDMI_HDCP_DEBUG_CTRL, reg_val); + hdmi_clear_bits(hdmi, REG_HDMI_HDCP_DEBUG_CTRL, + HDMI_HDCP_DEBUG_CTRL_RNG_CIPHER); DBG("HDCP_DEBUG_CTRL=3D0x%08x", hdmi_read(hdmi, REG_HDMI_HDCP_DEBUG_CTRL)); =20 @@ -537,15 +522,12 @@ static int msm_hdmi_hdcp_auth_prepare(struct hdmi_hdc= p_ctrl *hdcp_ctrl) static void msm_hdmi_hdcp_auth_fail(struct hdmi_hdcp_ctrl *hdcp_ctrl) { struct hdmi *hdmi =3D hdcp_ctrl->hdmi; - u32 reg_val; unsigned long flags; =20 DBG("hdcp auth failed, queue reauth work"); /* clear HDMI Encrypt */ spin_lock_irqsave(&hdmi->reg_lock, flags); - reg_val =3D hdmi_read(hdmi, REG_HDMI_CTRL); - reg_val &=3D ~HDMI_CTRL_ENCRYPTED; - hdmi_write(hdmi, REG_HDMI_CTRL, reg_val); + hdmi_clear_bits(hdmi, REG_HDMI_CTRL, HDMI_CTRL_ENCRYPTED); spin_unlock_irqrestore(&hdmi->reg_lock, flags); =20 hdcp_ctrl->hdcp_state =3D HDCP_STATE_AUTH_FAILED; @@ -555,7 +537,6 @@ static void msm_hdmi_hdcp_auth_fail(struct hdmi_hdcp_ct= rl *hdcp_ctrl) static void msm_hdmi_hdcp_auth_done(struct hdmi_hdcp_ctrl *hdcp_ctrl) { struct hdmi *hdmi =3D hdcp_ctrl->hdmi; - u32 reg_val; unsigned long flags; =20 /* @@ -563,16 +544,15 @@ static void msm_hdmi_hdcp_auth_done(struct hdmi_hdcp_= ctrl *hdcp_ctrl) * there is no Arbitration between software and hardware for DDC */ spin_lock_irqsave(&hdmi->reg_lock, flags); - reg_val =3D hdmi_read(hdmi, REG_HDMI_DDC_ARBITRATION); - reg_val |=3D HDMI_DDC_ARBITRATION_HW_ARBITRATION; - hdmi_write(hdmi, REG_HDMI_DDC_ARBITRATION, reg_val); + hdmi_update_bits(hdmi, REG_HDMI_DDC_ARBITRATION, + HDMI_DDC_ARBITRATION_HW_ARBITRATION, + HDMI_DDC_ARBITRATION_HW_ARBITRATION); spin_unlock_irqrestore(&hdmi->reg_lock, flags); =20 /* enable HDMI Encrypt */ spin_lock_irqsave(&hdmi->reg_lock, flags); - reg_val =3D hdmi_read(hdmi, REG_HDMI_CTRL); - reg_val |=3D HDMI_CTRL_ENCRYPTED; - hdmi_write(hdmi, REG_HDMI_CTRL, reg_val); + hdmi_update_bits(hdmi, REG_HDMI_CTRL, HDMI_CTRL_ENCRYPTED, + HDMI_CTRL_ENCRYPTED); spin_unlock_irqrestore(&hdmi->reg_lock, flags); =20 hdcp_ctrl->hdcp_state =3D HDCP_STATE_AUTHENTICATED; @@ -1304,7 +1284,6 @@ static void msm_hdmi_hdcp_auth_work(struct work_struc= t *work) void msm_hdmi_hdcp_on(struct hdmi_hdcp_ctrl *hdcp_ctrl) { struct hdmi *hdmi =3D hdcp_ctrl->hdmi; - u32 reg_val; unsigned long flags; =20 if ((HDCP_STATE_INACTIVE !=3D hdcp_ctrl->hdcp_state) || @@ -1315,9 +1294,7 @@ void msm_hdmi_hdcp_on(struct hdmi_hdcp_ctrl *hdcp_ctr= l) =20 /* clear HDMI Encrypt */ spin_lock_irqsave(&hdmi->reg_lock, flags); - reg_val =3D hdmi_read(hdmi, REG_HDMI_CTRL); - reg_val &=3D ~HDMI_CTRL_ENCRYPTED; - hdmi_write(hdmi, REG_HDMI_CTRL, reg_val); + hdmi_clear_bits(hdmi, REG_HDMI_CTRL, HDMI_CTRL_ENCRYPTED); spin_unlock_irqrestore(&hdmi->reg_lock, flags); =20 hdcp_ctrl->auth_event =3D 0; @@ -1330,7 +1307,6 @@ void msm_hdmi_hdcp_off(struct hdmi_hdcp_ctrl *hdcp_ct= rl) { struct hdmi *hdmi =3D hdcp_ctrl->hdmi; unsigned long flags; - u32 reg_val; =20 if ((HDCP_STATE_INACTIVE =3D=3D hdcp_ctrl->hdcp_state) || (HDCP_STATE_NO_AKSV =3D=3D hdcp_ctrl->hdcp_state)) { @@ -1345,9 +1321,7 @@ void msm_hdmi_hdcp_off(struct hdmi_hdcp_ctrl *hdcp_ct= rl) * AN1_READY bits in HDMI_HDCP_LINK0_STATUS register */ spin_lock_irqsave(&hdmi->reg_lock, flags); - reg_val =3D hdmi_read(hdmi, REG_HDMI_HPD_CTRL); - reg_val &=3D ~HDMI_HPD_CTRL_ENABLE; - hdmi_write(hdmi, REG_HDMI_HPD_CTRL, reg_val); + hdmi_clear_bits(hdmi, REG_HDMI_HPD_CTRL, HDMI_HPD_CTRL_ENABLE); =20 /* * Disable HDCP interrupts. @@ -1375,14 +1349,11 @@ void msm_hdmi_hdcp_off(struct hdmi_hdcp_ctrl *hdcp_= ctrl) hdmi_write(hdmi, REG_HDMI_HDCP_CTRL, 0); =20 spin_lock_irqsave(&hdmi->reg_lock, flags); - reg_val =3D hdmi_read(hdmi, REG_HDMI_CTRL); - reg_val &=3D ~HDMI_CTRL_ENCRYPTED; - hdmi_write(hdmi, REG_HDMI_CTRL, reg_val); + hdmi_clear_bits(hdmi, REG_HDMI_CTRL, HDMI_CTRL_ENCRYPTED); =20 /* Enable HPD circuitry */ - reg_val =3D hdmi_read(hdmi, REG_HDMI_HPD_CTRL); - reg_val |=3D HDMI_HPD_CTRL_ENABLE; - hdmi_write(hdmi, REG_HDMI_HPD_CTRL, reg_val); + hdmi_update_bits(hdmi, REG_HDMI_HPD_CTRL, HDMI_HPD_CTRL_ENABLE, + HDMI_HPD_CTRL_ENABLE); spin_unlock_irqrestore(&hdmi->reg_lock, flags); =20 hdcp_ctrl->hdcp_state =3D HDCP_STATE_INACTIVE; --=20 2.51.0