From nobody Mon Feb 9 12:08:59 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 34B4933BBA3 for ; Mon, 19 Jan 2026 08:14:48 +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=1768810489; cv=none; b=ZaD0pW+UADEbzQKYq47HbMH0WvCyhubLSH6UiHk9/1jq1kxMOWYA0e3EHlRid1/BdOC0HYJJQ/XP2zbGQcMH95VkCMhoP6xsHz1QYd6o7nXUdxRfEnQVxUnnMFQHg5UMLSPlmBVCYnZradcoQTuVP2ahoKabZI4eCfcgh/AYZVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768810489; c=relaxed/simple; bh=Irf6GJDAnKdRVE5ZDTRsZj60m1BLdF1o4/Z3RDY3HSM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rGVKrC1T0dCa4Kq/nLckj5oIFM0QEfgpjVCKUNdW668sp3dyKNNDlL/3xmUduNvQceRFthMznkNVLsMx+yajw7a+Nm1pjAM4kJAlFibh+x9jRZSFy4VP9PHqe5DKwOF0678UA7+T8AXD7n/GaWlarREvbwVURGuKuF3si01nV7E= 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=QHnZHS7y; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=IQlpK8Ca; 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="QHnZHS7y"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="IQlpK8Ca" 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 60J7jfo93329642 for ; Mon, 19 Jan 2026 08:14: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= yEA5A7r2kJllLC6PuaIA9vsYW7wCDvkUCbOlZOzUws4=; b=QHnZHS7ylljx+36j RJu3Ldx9sPlBb00YKfVCuwk0OLv7nFQSx+8oAz0LZZNjIUM2pALQzUwpaJkhyZx4 IIiTMA2Ly1FA7Lmy+ktuGahnFRJhNYfGctlZ+1hCLDj7mrowv6e3ZUNWRuGmgfn3 ETN8P00zeej8sXnabb3Q2N69w+11YhQJX2b8Zg+eFPClfI6ioLfwKb6Kyj3s64Yh +bC6vcGqhB67b2ZDBujLw0s7C3qxlL9bk/JM/ahahYsFiD/WrqcTZOhlaLNWohkM tQJx6QuE3e5tTRgXf0Dxk/e9Em757gUpqc8dGs6HM5rPERa2nGexvS6VjIvj5y0b lUMgCQ== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bs78819x1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 19 Jan 2026 08:14:47 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-88a316ede50so91374356d6.0 for ; Mon, 19 Jan 2026 00:14:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768810486; x=1769415286; 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=yEA5A7r2kJllLC6PuaIA9vsYW7wCDvkUCbOlZOzUws4=; b=IQlpK8Ca7LR2bCsgdJtckBSD0BP/zhB80zhy9Eg561AA54L6/CDF+FOvTmwIu8H4n1 gxlBSy0kfhS0SuqZWNccg+1WMqlHuHTzwz5li7pSm3vBXpfYOKpCnfKKiKPDSyMNg/EQ g0Y0BgjhtVnWCwOVmTxOUGOHI3PMRNr5gIxWx4O0jXSq4WjanpwD/02jl//UlU95Sp7Q c2ONsdU7bvXsguSewBpCpB43KcesUODyg/ns4bg3MRCNOcTf5M8BGiFxO4slZZ+614tX N3ZXkx1mjk/V8X/3T/dtuNyq6z2mjkPsCPmTXCRU89m8FDMbNVSuyqLwCr10IDpP/YFz ADoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768810486; x=1769415286; 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=yEA5A7r2kJllLC6PuaIA9vsYW7wCDvkUCbOlZOzUws4=; b=m18G39TZXYn6J0assGIVNs+F9tjr0FQW9tl74dp8uYo7/hKkb5ioJ6LpB9/Sm50fOM feok0HcVQoeq9/0I1HgCKQVgdfMj7cvCGzwIPTP6FihvMgp3wg8p4Z36UROUFdQTmS3C /aXO0WXvYnOxUMGPzsCTxxXnajDiGZpiG3nFdDWQus+jCw3wZGcd+cO2b0u0kjtEFbjt HsZ+PYa+oYP3+fmfdCPJRv7cqZdg/yVYOhn/kD0qZg/JHXyZvksEFvt4madtH07tukdV Yi51eBgUQTcvh75TvMtDo5Yltg+g4p4hro1WKT8l6E1bzJdgnSABYbFPFyO3hcu1Abi/ RSgA== X-Forwarded-Encrypted: i=1; AJvYcCXXWHHwF2MP5jG3Pc0t9QapPgnENA6TPAmk40dV9Ww1aQ+iyYWS3m6sQn3cx58Y7MzbF92Xu1H00NZxc70=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6z9XuWrUYNb2zIJKEtLb03FJsJGh6fjWqFyUm9WIkq07x/Cfy pAhtXPhDjnwpw8W/yCa1viu2QBQcVmfNN0SabjpvJ9jDF6QT1ZThiBfjdlBF8VpaCmhkCWU7FAd 1mP/z/Gwf4ayYfGcRGsslPUuO/DBXfJBFWoaBjXYB3Ik3lEg1fCRCAJW0UnEBHad0hLk= X-Gm-Gg: AY/fxX6IcqesspCRATfo+WJxXnO+k8XPLJ4JRhJVMi1nSRkGUi9uvM0Sav73EobEoBh lLxe02+N1eRsQ/yNDypFfznJ0QYNBBPaIa6HnGWFOawsUxDydDZuPpvZsoeCzxfACObRYQUomKl 0t8Nifs04dEqgR7yD2VPZwhZP5qC3Wz0UJ8780SJcLlfer5tJCD2ZUtAvtYxo+IUtX8soNazNWz YxyDZ4Pwi1zcACZ8C5OXWfR1s2TydZfU4Q/1+6/yQjCnj5G4bNr3JMmjxgyB33NhOcW9FHCw/j4 8PTqBjuibbAr1cGnHT17W1X5Mfg9Toy40+Ne2p7LkF7ena2DwaiqoEJgKTYRroWk/WwJG/w1kbR Un9UNFfRJj0EydoR+UOPzKuy3j0NUnVFHmS00L2mEXD0887g0hzzUD7XNquGX7eLJ4bCCCa3WLe ZBFfsDJMiNOVahNwdtCI1GVy8= X-Received: by 2002:ad4:574e:0:b0:892:7075:5743 with SMTP id 6a1803df08f44-8942ddbbaa2mr140094996d6.45.1768810486580; Mon, 19 Jan 2026 00:14:46 -0800 (PST) X-Received: by 2002:ad4:574e:0:b0:892:7075:5743 with SMTP id 6a1803df08f44-8942ddbbaa2mr140094746d6.45.1768810486138; Mon, 19 Jan 2026 00:14:46 -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-59baf34d572sm3063845e87.24.2026.01.19.00.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jan 2026 00:14:45 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 19 Jan 2026 10:14:40 +0200 Subject: [PATCH v2 4/4] drm/msm/dpu: fix SSPP_UBWC_STATIC_CTRL programming on UBWC 5.x+ 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: <20260119-msm-ubwc-fixes-v2-4-e0c8c630fdd3@oss.qualcomm.com> References: <20260119-msm-ubwc-fixes-v2-0-e0c8c630fdd3@oss.qualcomm.com> In-Reply-To: <20260119-msm-ubwc-fixes-v2-0-e0c8c630fdd3@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio , Konrad Dybcio , Vinod Koul , Stephan Gerhold Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2821; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Irf6GJDAnKdRVE5ZDTRsZj60m1BLdF1o4/Z3RDY3HSM=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ2bu8/ca+i8f2sd4NaovzTpgGcpeVn9k/lIfT1v9BG3N4 C+31Z06GY1ZGBi5GGTFFFl8ClqmxmxKDvuwY2o9zCBWJpApDFycAjCRJWLsfwU7eqScwlR21Xbr vmDR+l0tuTa063IDw+2v2U26IRMnCe7cNm1646kbt+JOLdTdHDv/5pvdt6o9puw9vi64jP/2r5d lZttfTWaWlPiy5qCkzxVH2Z2MTTEOE58WCLrWXk8Oi2kOOSllo7Pj9+RbHImGC/Ijmm24WTSdtl zwCd+4nk1IKnO689On/FnG3VtY5tckHpTp1eFeUrY6U+5yjbPuXsO8A+/zXD/dm7RKsPaij9eCp zKtEodVU2p2LpwTefa5H+e2wzZrb+0u41nZePj15Abdv967PliqG6kdC0pzU3vFU/JwsZWT04/D z+dOVvhwPilRQNisy7ROIZDHJlDD65doXaawRfKtTcfLAQ== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=KLVXzVFo c=1 sm=1 tr=0 ts=696de7f7 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=7FpWx5GjbivZIX0HvvoA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE5MDA2NiBTYWx0ZWRfXy71vshSsxpol hBQi+Z6pLeDJrxsYeBGi/Qyw4p8ihBUJgyQnZvxsiNqqvyp5z90X07GImrbNnz90En6Qp0FFVSt AJCjzgxM8HSozIb8tZtydV/79wqLztiskZt2YanpCcihowcBXG5WPe06Ufc06AKy/yJMHnDKLIQ y/C2B01QIQrGVEsaZlTh99mMme5hGhnZ/w4ykXma3IKx90nWUEWQyl5ljSyJWX+tXGIP+ZF0eZI GRGmQYzw5+L9F/A4XEUtTBXlrpT5NS31Z00kqOkKGYb+fGGsd2HHny1yoNcnSmuPvfQaOZLfb33 aPAi9LkaX8cMuaTUfVvTgaiZvZHgWTwN32A2dzPc91OjRnPi8j+XVsuoSyx/AHH9uPUr1tl4A3s zjha/b5v2xxx4ASEpjmcXDu0Rw1ZCH6dsKwK1p6HfnesLzgeNcOaG9eH4u6mXMaMLeuyxVLZzh5 vW5XlIT/WLWVOYIdstg== X-Proofpoint-GUID: wH9pqgg8TpmBfLJymp-fJl0SPQ_pq5Qg X-Proofpoint-ORIG-GUID: wH9pqgg8TpmBfLJymp-fJl0SPQ_pq5Qg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-19_01,2026-01-19_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 suspectscore=0 lowpriorityscore=0 spamscore=0 bulkscore=0 impostorscore=0 malwarescore=0 phishscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601190066 Code in dpu_hw_sspp_setup_format() doesn't handle UBWC versions bigger than 4.0. Replace switch-case with if-else checks, making sure that the register is initialized on UBWC 5.x (and later) hosts. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 44 +++++++++++++++----------= ---- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_sspp.c index a99e33230514..80a9fb76b139 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -279,6 +279,7 @@ static void dpu_hw_sspp_setup_format(struct dpu_sw_pipe= *pipe, =20 if (fmt->fetch_mode !=3D MDP_FETCH_LINEAR) { u32 hbb =3D ctx->ubwc->highest_bank_bit - 13; + u32 ctrl_val; =20 if (MSM_FORMAT_IS_UBWC(fmt)) opmode |=3D MDSS_MDP_OP_BWC_EN; @@ -286,30 +287,31 @@ static void dpu_hw_sspp_setup_format(struct dpu_sw_pi= pe *pipe, DPU_REG_WRITE(c, SSPP_FETCH_CONFIG, DPU_FETCH_CONFIG_RESET_VALUE | hbb << 18); - switch (ctx->ubwc->ubwc_enc_version) { - case UBWC_1_0: + + if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_1_0) { fast_clear =3D fmt->alpha_enable ? BIT(31) : 0; - DPU_REG_WRITE(c, ubwc_static_ctrl_off, - fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) | - BIT(8) | - (hbb << 4)); - break; - case UBWC_2_0: + ctrl_val =3D fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) | + BIT(8) | (hbb << 4); + } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_2_0) { fast_clear =3D fmt->alpha_enable ? BIT(31) : 0; - DPU_REG_WRITE(c, ubwc_static_ctrl_off, - fast_clear | (ctx->ubwc->ubwc_swizzle) | - (hbb << 4)); - break; - case UBWC_3_0: - DPU_REG_WRITE(c, ubwc_static_ctrl_off, - BIT(30) | (ctx->ubwc->ubwc_swizzle) | - (hbb << 4)); - break; - case UBWC_4_0: - DPU_REG_WRITE(c, ubwc_static_ctrl_off, - MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30)); - break; + ctrl_val =3D fast_clear | ctx->ubwc->ubwc_swizzle | (hbb << 4); + } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_3_0) { + ctrl_val =3D BIT(30) | (ctx->ubwc->ubwc_swizzle) | (hbb << 4); + } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_4_0) { + ctrl_val =3D MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30); + } else if (ctx->ubwc->ubwc_enc_version <=3D UBWC_6_0) { + if (MSM_FORMAT_IS_YUV(fmt)) + ctrl_val =3D 0; + else if (MSM_FORMAT_IS_DX(fmt)) /* or FP16, but it's unsupported */ + ctrl_val =3D BIT(30); + else + ctrl_val =3D BIT(30) | BIT(31); + } else { + DRM_WARN_ONCE("Unsupported UBWC version %x\n", ctx->ubwc->ubwc_enc_vers= ion); + ctrl_val =3D 0; } + + DPU_REG_WRITE(c, ubwc_static_ctrl_off, ctrl_val); } =20 opmode |=3D MDSS_MDP_OP_PE_OVERRIDE; --=20 2.47.3