From nobody Thu Apr 2 22:25:45 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 EE2F830B525 for ; Fri, 13 Feb 2026 23:03:05 +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=1771023787; cv=none; b=ojJuz+b34cnRqiHsrzpvX0jbMFMhjtJPr6qhpAIqpWyO8dEdiHBvIczYQA+IzdapCKHYjp+VA+4nRgD3F7j7rVZo7/tZ854EFD9BjkDc81fvosoMeERjP6pUlQpveIpr6wb8IXSq6xbB7lxOH1ASM6id0uCOPj4Jj533z6WvxmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771023787; c=relaxed/simple; bh=i33TyAUL6ghJdbWFyMgzRLYcTygWgaYUFBacwDIWYoY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=thOXZoOF2Ajb6Lid0XMcbhhLVW1YPiH1TFsHFBBcA2Gq+SMwUlqk3c93gh3nkdpSre0+xzEXXwMiALKK+RLYelGvrf4jLi3rQsh3131l09+A4ae3CtB8UTxg3nzYxXq74ECbw9/qqymiZRG8jhRGb7KElsEK+Hq9bugB/UMaCjo= 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=fQtGqikz; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=fCgoFQIT; 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="fQtGqikz"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="fCgoFQIT" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61DHaQL23023463 for ; Fri, 13 Feb 2026 23:03:05 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=v9zcAzbE8fM7wVN4+5lYRN cGLf12p3L4/oFrWpvP+70=; b=fQtGqikzjhoXp1t2H2zKUhQGSfqAnAeEP7nKpx 5uxZwrWLeMnRZ0i6Gs5t9mQ21wwPqdxc0uh7kySUOSnSvP1XLzu3zMLlwBSnAw6R qrebYC8DxjScfjhZDFpsAd0EXMw6vnV61wqFjjcA05rGe+XAz1NxT7lcVX/2u/2X ahIGar+J80VfD3doP7gzWWxeMTR8jfSAIzZDjZuhWSb9Du5DpsilBA0pvcBexPjs suIQmWSiEzBCHx5mhJAEFUlAOu5bk+HU1JqCfU9zroPC9UsB/hchigoTP9eCUzDY 4BzILpuZvrAuOBDrGzbzjCgXefq7ACH4AyUwuGwTcvgvuTQA== 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 4ca1hn2mgb-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 13 Feb 2026 23:03:04 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cb4d191ef1so17818185a.0 for ; Fri, 13 Feb 2026 15:03:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1771023784; x=1771628584; 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=v9zcAzbE8fM7wVN4+5lYRNcGLf12p3L4/oFrWpvP+70=; b=fCgoFQITUxe/f9FNoZ94maNQYz/ZvUZrhCm47gAHLlycpGlZtNy09RO3ibmejKFarW +hTg5oNXUuDLuRs4QiYbOWl9MWfQw049Pz2p886WgF5doV3z/F4+rDS6KbP1L94nDIyj eC333XPgm25ZTsm7DdDEpIKp4DCJesJiOHW+hJIIxJ+LjkOZFoB5XNAew+YGy82dkohQ kCm185IYzvlcY4g3JRUOnBAjhrgRed5G4KLRTPqgAEi1aUyGP9pwzSleCNiSTGtvzDrj dq52lLWBgw4Tvz/1/v0NkcyZFbZ90yAzLR9JWBkZ0LpwgTv+Nsi362Pr8FkUHTGfRq7u iEpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771023784; x=1771628584; 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=v9zcAzbE8fM7wVN4+5lYRNcGLf12p3L4/oFrWpvP+70=; b=RwYv58elWZCj8fVmPPgEn8wEeAG52Xh5fkNW7wBwEwiCDCiYuWSKNhfEgx3KAuMmar CDfqsaqX0YfmsyLubFQGYoa3YTzVR5TtELjW+x2vFN58EcZEcS8W/k37eUv+DwHkHKiR 4CRq92xX+s/hIByc4jOaJ2NAY3X+d0EF9uio4dXF7+yDxHXnJ4cFR+m0pq0qkRcwWUD3 SYr4IZIuW+qbq1g3fejGFeexR63X/omHh83+Vlq5Z2XdeA0ErUF6O10rnfsm8VO3btQO aF3l2tWgu3NCD9coSSV+fR63L0/yWHuCq5/GoJKBpwv7bGKFDu0Flxt5SRjE4ksGCUDS hGeg== X-Forwarded-Encrypted: i=1; AJvYcCW6Y86sgNQeS+I0lHN4NobNNMx1gRetuvyu7fiuetl/HxAp4nrh+lyjc1NZMtgl4hJQHPm/jm26O7ZO8lg=@vger.kernel.org X-Gm-Message-State: AOJu0YxtZBASuAm+Z5A7mDqayZcAtHtNkL5ylsaFBQVBTZZKqkZBD7uz YC9EJP4Q5eaRVnqCbtB/ZZ5Be4wPatdu0Ytc9MMiurUkrjxeZuCwu++Wfd5bK5lqYCUZ6BTdY5E cV2E0F3kN1WXvR1PikDbTE2eo8Jxc1CEH9RE8LRsXaXHnRbKdugabPx+GF2Faqyz+GI4= X-Gm-Gg: AZuq6aL8nfi540aL+yt3NOxTZBann9xRoLGAnXyogtyi8pCZjjGmrIZxEpBYFKKDKrK RlD9e4B73ox2qOHWbdEJPXof4eEjr4vR6VZ1AAip4nbZYe75fUe/CtQpkzTM4FlR9nBZJm47m/s Ct8zraAQYgzEp6TMF7rQRLSSiKEoo73brLRGThg4Z85FHItEEzIIpdnsvWyjiMPOci+b5Z7Wz4z 6DCR3Pl/bgDOHyzsaCXKNB6EKkJcSbTX+bFka/wYipEllAUfhR7DTtGvqO700keWXY4tfS1J8Lc LyF9eUBvyY3iaBvUDj0IZw/hDUdxFsY8QeUcf1BJZ/KvS1dx/ZYdQRSQbXhA42/9N8Ba9+X4PYX 5orTXo2e2FyXkX2mUWAjrMq0QYYflcHeOSiXE7agrosMfaXPHlaO+9dK0RHZLDZWCiUSqDS7sI8 tgrtE9VNmEkOPGRRvj4SVkqgjv5O0aYRfnYTc= X-Received: by 2002:a05:620a:3901:b0:8c9:fc46:235c with SMTP id af79cd13be357-8cb424afcb1mr449271685a.71.1771023784116; Fri, 13 Feb 2026 15:03:04 -0800 (PST) X-Received: by 2002:a05:620a:3901:b0:8c9:fc46:235c with SMTP id af79cd13be357-8cb424afcb1mr449266385a.71.1771023783593; Fri, 13 Feb 2026 15:03:03 -0800 (PST) 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-59e5f5b062asm1806491e87.73.2026.02.13.15.03.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 15:03:01 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 14 Feb 2026 01:02:59 +0200 Subject: [PATCH] Revert "drm/msm/dpu: try reserving the DSPP-less LM first" 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: <20260214-revert-dspp-less-v1-1-be0d636a2a6e@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAKKtj2kC/x2M0QpAQBBFf0XzbIppE35FHrAXU2LbkZT8u83jq XPOQ4aoMGqzhyIuNT32BGWe0bQO+wJWn5ikkKqQ0nGSEE/2FgJvMOPaSeUBcWMjlLIQMev9L7v +fT9UyhE8YgAAAA== X-Change-ID: 20260214-revert-dspp-less-8426dee24b92 To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Val Packett X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3587; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=i33TyAUL6ghJdbWFyMgzRLYcTygWgaYUFBacwDIWYoY=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpj62k0mI3LT5UakhcdPql0XWEriNUOHLR+ZgCN V19RcwsqL2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaY+tpAAKCRCLPIo+Aiko 1cLGB/9G2vD96HD1P3/HGbx+hqB96ArIo8y7ugP2WEmk+fgpw+zl+Jw0WEPFyqCfbEApY1zIfzk 7GCfVr6camfzwpxfYAEPnV0r+JhY0fIvM/0LgndWQ4iVyoU+Q30ywgURP5/EGhOxNBHYNG5s0oI auTFdjy0fM05/O55R4PPWHRITrkS7mxa7y58KEVxYZtKCi0uwmQaq7s/DGkw9g+O1bwa4EUyC8r 3efxcBwnXJC00xL5GrojiGanJPvRMK6XvEGKRtH4IDgBkxaao2ZQIKss+2ygs3kqKZWRhLPg+ZN dd9S4K4k1Nl/aT6tDnlpjqUn240/TocaBAjs71uqyuBbEti2 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=Wt0m8Nfv c=1 sm=1 tr=0 ts=698fada8 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Mpw57Om8IfrbqaoTuvik:22 a=GgsMoib0sEa3-_RKJdDe:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=MJBLmyKdI3ciMax9VxIA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: aV3PQmnpj_n8BYmUOnQqYXRfUuEHm7i0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjEzMDE3OCBTYWx0ZWRfXwGBlZ2g1sFOF j7z7Q6dnNgifeFJoXpl+7BxrGvUVYNF+4haLV4MaRfnJhfJ4bvPpeukw7oZrDU9g2Zy3lIUlE7L tBEFlTSdHjqUJ+JIsypYYU4FvO7XwbRD6D2oSzkpZYaZMunn06OM7eV1DAbDmfoG+J3WkACJaec 5krHIgL9Aq4Gd6zujPh07Pguy/7qrpzFbVojgMbCzyAlCavbGcOS0+gksYW9ci7UYUcZmNc9z+C mY6eXd/WlJd5/XjAEjOs+BFf4sz7dRQLwHmE89/hrJZ2I7s4YMgNo8GesctPcDnPtoV4Wp9zjkx bPGjZZxb6mUgzD2TDYVOBDbvCSoc9YtbV36BX5Cud1au1V6aIkyxjBdF9942rz3QcZJrWPjgHAT TOTY5vrhe7icBxZ6dpQvHxNmBhsNtmTHflbaONyDqdk385Hhhr5i1n58tWBiWxMzWC65Ouusqko u/eafTpmElVrblBjS7w== X-Proofpoint-GUID: aV3PQmnpj_n8BYmUOnQqYXRfUuEHm7i0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-13_05,2026-02-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 clxscore=1015 priorityscore=1501 adultscore=0 spamscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2602130178 This reverts commit 42f62cd79578 ("drm/msm/dpu: try reserving the DSPP-less LM first"). It seems on later DPUs using higher LMs require some additional setup or conflicts with the hardware defaults. Val (and other developers) reported blue screen on Hamoa (X1E80100) laptops. Revert the offending commit until we understand, what is the issue. Fixes: 42f62cd79578 ("drm/msm/dpu: try reserving the DSPP-less LM first") Reported-by: Val Packett Closes: https://lore.kernel.org/r/33424a9d-10a6-4479-bba6-12f8ce60da1a@pack= ett.cool Signed-off-by: Dmitry Baryshkov Tested-by: Manivannan Sadhasivam # T14s --- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 52 +++++++++---------------------= ---- 1 file changed, 14 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/d= isp/dpu1/dpu_rm.c index 451a4fcf3e65..7e77d88f8959 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -350,26 +350,28 @@ static bool _dpu_rm_check_lm_and_get_connected_blks(s= truct dpu_rm *rm, return true; } =20 -static bool dpu_rm_find_lms(struct dpu_rm *rm, - struct dpu_global_state *global_state, - uint32_t crtc_id, bool skip_dspp, - struct msm_display_topology *topology, - int *lm_idx, int *pp_idx, int *dspp_idx) +static int _dpu_rm_reserve_lms(struct dpu_rm *rm, + struct dpu_global_state *global_state, + uint32_t crtc_id, + struct msm_display_topology *topology) =20 { + int lm_idx[MAX_BLOCKS]; + int pp_idx[MAX_BLOCKS]; + int dspp_idx[MAX_BLOCKS] =3D {0}; int i, lm_count =3D 0; =20 + if (!topology->num_lm) { + DPU_ERROR("zero LMs in topology\n"); + return -EINVAL; + } + /* Find a primary mixer */ for (i =3D 0; i < ARRAY_SIZE(rm->mixer_blks) && lm_count < topology->num_lm; i++) { if (!rm->mixer_blks[i]) continue; =20 - if (skip_dspp && to_dpu_hw_mixer(rm->mixer_blks[i])->cap->dspp) { - DPU_DEBUG("Skipping LM_%d, skipping LMs with DSPPs\n", i); - continue; - } - /* * Reset lm_count to an even index. This will drop the previous * primary mixer if failed to find its peer. @@ -408,38 +410,12 @@ static bool dpu_rm_find_lms(struct dpu_rm *rm, } } =20 - return lm_count =3D=3D topology->num_lm; -} - -static int _dpu_rm_reserve_lms(struct dpu_rm *rm, - struct dpu_global_state *global_state, - uint32_t crtc_id, - struct msm_display_topology *topology) - -{ - int lm_idx[MAX_BLOCKS]; - int pp_idx[MAX_BLOCKS]; - int dspp_idx[MAX_BLOCKS] =3D {0}; - int i; - bool found; - - if (!topology->num_lm) { - DPU_ERROR("zero LMs in topology\n"); - return -EINVAL; - } - - /* Try using non-DSPP LM blocks first */ - found =3D dpu_rm_find_lms(rm, global_state, crtc_id, !topology->num_dspp, - topology, lm_idx, pp_idx, dspp_idx); - if (!found && !topology->num_dspp) - found =3D dpu_rm_find_lms(rm, global_state, crtc_id, false, - topology, lm_idx, pp_idx, dspp_idx); - if (!found) { + if (lm_count !=3D topology->num_lm) { DPU_DEBUG("unable to find appropriate mixers\n"); return -ENAVAIL; } =20 - for (i =3D 0; i < topology->num_lm; i++) { + for (i =3D 0; i < lm_count; i++) { global_state->mixer_to_crtc_id[lm_idx[i]] =3D crtc_id; global_state->pingpong_to_crtc_id[pp_idx[i]] =3D crtc_id; global_state->dspp_to_crtc_id[dspp_idx[i]] =3D --- base-commit: 50c4a49f7292b33b454ea1a16c4f77d6965405dc change-id: 20260214-revert-dspp-less-8426dee24b92 Best regards, --=20 With best wishes Dmitry