From nobody Mon Apr 6 22:10:37 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 A023117C220 for ; Tue, 17 Mar 2026 15:30:10 +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=1773761413; cv=none; b=J5+SphYe3kcNLlKCQgBxPdZNVJQESmFPmmtr9Lxt8EFIb8wPBvLKpP5bxAyXexkuz5bOR+RcDLnlqiZY78XjfRGf7sOtFLcBRg11lpdnuUrKb+RaY1RCluBzfOs8WHwATwtx5sAaiAO9z/7Cd/wv3L7u9OwZ8bXVGIeTkiYD7fU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773761413; c=relaxed/simple; bh=fiS+v1HmnasQUzAggFrQFAVyqQDaaFzdUqmjR23RuOE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=ZRHJMHjamAq5kddfu70eVyCjDBIK+VEEnsNvDoQnigMh0FjU2Sy8WXDawOO73VgLNsEhXpkqkUcGYgew8gugI1S/ojsS0Jrs1/1eqzClzfQchxl/0LE7jyFtOo+oQAdo+wuY7WWH3eca0NzqgvPe/Pu4SjpkSbmQPHXzq4VV8ao= 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=H5hq37/Q; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=CmrtoDvI; 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="H5hq37/Q"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="CmrtoDvI" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62HDxA1P1639358 for ; Tue, 17 Mar 2026 15:30:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=2hqyYSaS4VrNG8NPTYVWAJ QabhTTesNn0LmRhzY1g/g=; b=H5hq37/Q+b4kSAPhz0LvTLga3y5Z3DySsip5rD rI6qq0EYC7pMNfVUQQs3G7IwOLqLAO6k9l44iMOSKxYJb4kvkLH1wIZkJlO91JrC qXrS6KhW8l6rJvepHOYFmRh6cS+Ir5wf/oBOHF4k83LQRthaCLbrBnlYNbqV0SGY b86Yf8F9uTVbqIq/peKr3EjyeNUn+D2+vbqw3gsWz4rons4P95x46TmZxamf+4bA U2SHzmDKAsPQUFQlxBVFd6NAX/93xR5HWvIB6dM3Q+N50in3p7YwBS4k+HZ2+cUz N3fFAvxisIWutYtl6f9IYLr/Rxa3y04t3zmmVXYOfSzpY5RA== 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 4cxke0cw8x-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 17 Mar 2026 15:30:09 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cdb995a1bfso3936240885a.1 for ; Tue, 17 Mar 2026 08:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773761409; x=1774366209; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=2hqyYSaS4VrNG8NPTYVWAJQabhTTesNn0LmRhzY1g/g=; b=CmrtoDvI8d4tveG74nhplEL97LNXAbQXXeoswIWhdKpfQWNAWoVIRnHj9YTpWtsb4/ w7bTZaA8Qjdi63/OX27HbcJmzxMF0Q5nrw50EicpRjhsUUfpsX0S2tpHlBvug6zHUV+D KbRfEdvUJEtYq02o87aNFv2/Qjk96iPstOnxxtJhTWH9znqhU3ponl6D+z5NW0g8jDeJ 5lWS8t3CEzVVX21TDCj4Fc3qzZsUecnrOluyGO1hqaia5YZkBVCLh2780fNdeauCXTFN XQGgETkBqIhjbVziqgUO9RttVhF2c4tQpVB4rbbAfRMuAX+0Vlk4fyTBxPaxYh3EO/FY 624w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773761409; x=1774366209; h=cc:to: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=2hqyYSaS4VrNG8NPTYVWAJQabhTTesNn0LmRhzY1g/g=; b=RDOgS3goeY+dEyOno9WzyQ7DycGtrZf+eMGuu9wNl3l3HwOVJzc5MY9/LI+6Qutzqq 58gy0zVHl5Qtb6Jx8jTC2NyyTMAch6O2GduYzUOFQp+JIxWAfd+Lxh8GSXrjAh+6Qiy3 XvncVxtc7s5tOXKr4C64ch7DIp5JwKtr2uehyQlHiY2d3BknpeaDZYV+J/6MBxDu0MgA z4Gtg5RJOEEMh4fbCqJ39Q12EjKWPkjCY4A+TJaGU9v4zH4a4o2IXWVKfqnuI5uHOZ50 o8lYGUQxdAyZGlD/W+5A0P42TayZI2QfHyIn1fVQILdV5eCt+LmbTaJHBwb7nf2UFvfd aciQ== X-Forwarded-Encrypted: i=1; AJvYcCXNABxwFqZwAq9SYbLE1KguU0DNStBhsb97HEXwVuN8hwdEkllSJqWUnqcIFseel/t6kMJ1a0wLn9kq0Gw=@vger.kernel.org X-Gm-Message-State: AOJu0YwyihAdXRN4J+7PQuNY7PakfX+2bWNYM/LzS9zqiICrdqRZ8zxv t47+cMWVDgiKTT1ljFwkohqqk9i03YdFukcs5In9nCDIRc9c31tVaS4+HZnW4j0pO1E3H1CTgiU glkv37doRtKVdznTElQQkisqaicQG06Dfpwf3I5AAiovnGxHKI1EGkL48SFYczJTQcrU= X-Gm-Gg: ATEYQzyoqtYBu5msk1aVhS+UU+eDI7eqV3LVcbDGNxWyC0koDMg/gs5YJy36ae4nglE oB3M5KUMaU6pJLTN+940tIeWBQNfGqtV724SSBAulplwMxZsWSyfHGjuU3ZglHgykora0FNWSeH oRUMGu0hsOaVmLnT+tD+2cakVE149kvSptUEzXjswLe5kePG4WAQ9ywZV1CqtpEjQkf+YZIJoRm BZLziA5q1wQ1U1vBdGXW61x4WVhj//2NLoOS8/nc7zIAePZJgKrkduk4RonSIr863sUO6helKDb DgVueBmkAeuWn9fMP0fSDXvEp2z1OdddBP/Mn2EiFTPT0sLUWFW0c14cbpU2ADNgmDadZe1RweP Q4WymWNibNdVZ9PC2sUPGLgJCX4B86EmUYw+lIXSRrnfTJwqaTxsmYwBu9p03wqNCe8jr26RNCQ kRlZDWjv2xkwno82pxCKwYrVry7p2begqYsnc= X-Received: by 2002:a05:620a:40d3:b0:8cd:97a7:a343 with SMTP id af79cd13be357-8cdb5aa4d3bmr2317516285a.36.1773761408408; Tue, 17 Mar 2026 08:30:08 -0700 (PDT) X-Received: by 2002:a05:620a:40d3:b0:8cd:97a7:a343 with SMTP id af79cd13be357-8cdb5aa4d3bmr2317499585a.36.1773761407484; Tue, 17 Mar 2026 08:30:07 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a15602e630sm4121394e87.26.2026.03.17.08.30.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2026 08:30:06 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 17 Mar 2026 17:30:05 +0200 Subject: [PATCH] drm/msm/dpu: don't try using 2 LMs if only one DSC is available 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: <20260317-fix-3d-dsc-v1-1-88b54f62f659@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAHxzuWkC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIzMDY0Nz3bTMCl3jFN2U4mRdkyQDc2NLc/PURENLJaCGgqJUoCzYsOjY2lo AMZ+5QVwAAAA= X-Change-ID: 20260317-fix-3d-dsc-4b073977ea19 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, Luca Weiss X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1391; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=fiS+v1HmnasQUzAggFrQFAVyqQDaaFzdUqmjR23RuOE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpuXN+ZPtoJCWvlZeEDtkMzjrM4xDUmcWGMh1aJ 84QuQJnQi2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCablzfgAKCRCLPIo+Aiko 1cA/B/9vDg1tz2ba7zdh/eaW1Eh0xRGsoAKWUcd6aD2nkw2Mhc0O3uHDvwxwQ5bgsLKLz7jTU2G R3Ej03EzgJvClrTVEthrh7FIb7Df4xaTuHwvAop5em5NKPC/VX8MvAkFDIEFQFqiAbQQYRQY8hp OCYiX0gvhQfS7RIhJOYaWMd3/k7X54I8cMxq92LHVWRJj8davFeBCfGJ3FKypAvP6PftIV/8jKx 6wP2Cp5IVnBqx1a+DYhcDu6cv3w0B0mvWEe0LJG+rSGsHso7awlWo+/RiXPBbh2N9b9Ut8jqHzK hvNm/SFao2/2VY/Vx9vGYZBNQaCaZArOritgb7HHi0twJ6Lv X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: sgRd52NMOXUbqIUY2LsOJi5darX2xM-7 X-Authority-Analysis: v=2.4 cv=aue/yCZV c=1 sm=1 tr=0 ts=69b97381 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=LbxHV1oPoWewQDzF:21 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=VwQbUJbxAAAA:8 a=6H0WHjuAAAAA:8 a=EUspDBNiAAAA:8 a=yYukBbz9-KCo0coATbYA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=Soq9LBFxuPC4vsCAQt-j:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE3MDEzNyBTYWx0ZWRfX1hur+fTN1Emx L+YOkpKsDt9t8fgETNrUYbm2428Dcr1SLkJ4TvGXdB8AeHoTgGo3xd+VlzCCVHvGJLnMckSi+8v KYbH7FtTo+9UveKo5W/4Zxi9RLcSgoo3EZVuftDiVP0awI2YnkYlkz+BzzRDCV0izUAPa8HNUi/ uNIfN0KF4iNtdi1ap/EnekrH1Om2sWQ5RHxS5JqG4Yhgk75N5xacfsl+YUF4nDkVrR2hr+2/Wxg s5i2i2EIznwGIY+g0XopQY22DUniUzzMP0B/9asdJOG+2+o23maA6Hx6eEH3ZgMnrg2dizZsJPk YKQ+xN4em8mv5gKumxrxVI3m2Z+/W3Rw3SI4YfmygH5RKqGaBwEmYoy9RdALez56FmHe6StubN1 I2By2ufjG9Au4uVKuCLzrOUyJ5RfPeXKXq042zJ3SsQKDylFCpogQZlohNW948aMNAuNNNV2500 kPuO8fF8JQ4KE9g5I1A== X-Proofpoint-GUID: sgRd52NMOXUbqIUY2LsOJi5darX2xM-7 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-17_02,2026-03-17_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 adultscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603170137 Current topology code will try using 2 LMs with just one DSC, which breaks cases like SC7280 / Fairphone5. Forbid using 2 LMs split in such a case. Fixes: 1ce69c265a53 ("drm/msm/dpu: move resource allocation to CRTC") Reported-by: Luca Weiss Closes: https://lore.kernel.org/r/DH1IKLU0YZYU.2SW4WYO7H3H4R@fairphone.com/ Tested-by: Luca Weiss # qcm6490-fairphone-fp5 Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_crtc.c index 6bf7c46379ae..96b67ea3fb4c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1410,7 +1410,8 @@ static struct msm_display_topology dpu_crtc_get_topol= ogy( topology.num_lm =3D 2; else if (topology.num_dsc =3D=3D 2) topology.num_lm =3D 2; - else if (dpu_kms->catalog->caps->has_3d_merge) + else if (dpu_kms->catalog->caps->has_3d_merge && + topology.num_dsc =3D=3D 0) topology.num_lm =3D (mode->hdisplay > MAX_HDISPLAY_SPLIT) ? 2 : 1; else topology.num_lm =3D 1; --- base-commit: 50c4a49f7292b33b454ea1a16c4f77d6965405dc change-id: 20260317-fix-3d-dsc-4b073977ea19 Best regards, --=20 With best wishes Dmitry