From nobody Sun May 24 23:31:55 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 8C3813ED3B5 for ; Wed, 20 May 2026 14:51:27 +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=1779288690; cv=none; b=ROM6yjF0OyfkikdiDprlaqdAbOxN1r8OfoVVR/enHqmPAoDpZ63C383A+31BVm2MfgzeZwnEjofvjCxfjYd9/Ra2woxpknGC58+1sF4T6JJXptjO/okT0fxtjqTESMrhaimRfICsPlQwsAklOdkCCHPB+qxjf/B6QFCSBZ5I1Lw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288690; c=relaxed/simple; bh=0jnnTKmBVzx8ajx5YR0+k88TfAux9nzkeECglU8qUoc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eckn4KRxek8Ux07MuAwZMTDQfrYc0T7BRBg0Saxiv6nzw1hTUB5EY3MLt5AmUQdynxkN/9Iw1baRYv9I0gzY+ms0QjQprcIHyBWxvJXkQtZKUwN4MSzR/646Jy6VSxHBjsoqJ7z034jRnyoWl+xtW7XJaxG2Wxt3fSThXHJqQ4E= 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=Ub3/C+ZJ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=AS7sc6A4; 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="Ub3/C+ZJ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="AS7sc6A4" 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 64KCxbpH1725321 for ; Wed, 20 May 2026 14:51:27 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= DhLMvVZQbF3J03WMc2id/1RoXxcDZvjE9wQx5sGd7p4=; b=Ub3/C+ZJfbhY6/ls axipwBKPQAqBpSWIq2w4QYZ90cJmsVCNNS+ZnQGHWwVP/oL7qg+0MwMBMCuIy1oA sMuUSl4hCKbD/cm9MIfN48FtHxKNbP44NLlimQXKdQLI2lW37540TpgxPSJG8Q0Z mDWacPbAGEUJYxlNG7vn1wmtCgIOp9ie/L69an/+CnDaErie0LMz+dlBZ4FG59qL ZMcswYya54H7DpVXBTHzLLSmOXUjEmvB/8CZ31zanZnGxMyjI1T/jwFb0QvzZu6K TuJ/SPVXi6CkS0x7CPQUEXmjw4DAuZFTrJppFQIVHWUM6DbLXZx/+yJJFcTIo4ku 71al1g== Received: from mail-vk1-f198.google.com (mail-vk1-f198.google.com [209.85.221.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e8t3qn8u0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:26 +0000 (GMT) Received: by mail-vk1-f198.google.com with SMTP id 71dfb90a1353d-577c69d3f04so5463197e0c.0 for ; Wed, 20 May 2026 07:51:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288686; x=1779893486; 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=DhLMvVZQbF3J03WMc2id/1RoXxcDZvjE9wQx5sGd7p4=; b=AS7sc6A4Xe+W3+eYK4UEB01MmBlzlpmgKjkhNGgSXvreR7sP7nmduEtg/WWBc5NTcy gBW4+dttvLyq4MA2ZdBFq+2MCvgsrnNR7JcgUOgpDwEgzRYXpvIxjstEXgXXPKVSuEsf genFPd1r4Uix1bcKMevhDWp8BiEaxVvJKN0Ek3v7i1p5PaXiBwcX1cIlTzP0Wrb7O+rN ikjQBiWbimADl6fwukGZ+Xw23p68oXQmP4/5z3Hjag2ZvgicUQQ9gveHhAuJ0yenri23 VFz/k+Ekuamqq60i8/npv3Q7wgKd8F7e1W+zkJDVb/BFaPcE8QOzwbPsg7Lhx4XjgI6z U22w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288686; x=1779893486; 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=DhLMvVZQbF3J03WMc2id/1RoXxcDZvjE9wQx5sGd7p4=; b=WxPsyLYFO5zHQBQsANMrtHAdL3WNfdGxeXDV68nEFLkNZWN0Ps25njJTETdqtDllR1 vKQ3Yzy5UeE2GJlU20ckLiVwL2oUXrKThy1+/oPxxQeB/yDYl88HYR3Wvj0d+g7sGCcF CZEyb3kAwPFF2FEfm5T0PvmPUjNkj1yt2fITAhO/JlHHf0wKNufW73yVIWAJQxXP8CaS Wer1Hv2V16gN40OdLAn1NZjXxQoZmbmRGW7SJqJQ6m6UjGZHbAzbv+g7B8rl5lV4zmtp 5iHdY5G9fRtoGChN4VOSFZ1J1WY77/pPwXxALG/6uTRSF43RMsRrVtNZ6sAXpm16a5JT oJkw== X-Forwarded-Encrypted: i=1; AFNElJ9vimEIb/WZydd8YUsV9DowMLA8glkPPMK/pndyygNWl90fMYTKBrW9SGweLuQ8y84hbVUQgieaO6TtpHY=@vger.kernel.org X-Gm-Message-State: AOJu0YxT/jhSINH0eRrRFacjFDkKWFONi/v1Q3upOvR+omslQePXpdeW YyS5KLA2Un8VLVB6psAEsg+o4yv7uWV+8ETIiW2rBSk0HoVmy7Azs3ieUoighV5CqdGQafs7WYy rqA35rJgV+wN2b7TNNacSCjzbzo7dACJ0i2PQk+cSx1lFP61hyUb4j/WDWqGfLUt/usM= X-Gm-Gg: Acq92OHu8RScn4YT5yV5Lknmof3mytg0IMWOfFSH5byTeblIV9TJnc9siQPXrP1OPL9 9uutG2Y11cElQkFVGgDNCVEw1OSvRD5p6oOMOIzI9PQN/OJgs8s6LyARFQXrTK/N3rj3LyQSJ/8 sVJC96GIgig0NkdxWKEa1Sy6DNfRW3bdp+zE0Y0YnhEj+5N5gTWP9cm46+YXeLdvlr/L8RU1Owt wNoFiW93nOZx7tL9IzPoSM7cLmOtmDdnTFcAT3/RtOrk2mkOKm0idA34xyCelfk2LwZQbAxoS9Y 35i1xJswAmW4LwtE1HnoJMdV8IATN9jVxsLuWiRyKEsY+Kl9csTBGle1Ms2lT+HwHOg17Lbub8s Kf9wpC5FpjyFrA4deBPx7oPE1bisoXXQen5gV+sPmx8IEf6pCw3ij2EFqEPM6qwxD3mAnRvYxLb 6xLADc5t20CbmKodQqWOkUPqYUnvesXoKpNAk= X-Received: by 2002:a05:6122:179b:b0:575:2ac3:4166 with SMTP id 71dfb90a1353d-5760be898a1mr14028605e0c.6.1779288685677; Wed, 20 May 2026 07:51:25 -0700 (PDT) X-Received: by 2002:a05:6122:179b:b0:575:2ac3:4166 with SMTP id 71dfb90a1353d-5760be898a1mr14028558e0c.6.1779288685286; Wed, 20 May 2026 07:51:25 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:24 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:08 +0300 Subject: [PATCH v5 01/28] soc: qcom: ubwc: define UBWC 3.1 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: <20260520-ubwc-rework-v5-1-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=914; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=0jnnTKmBVzx8ajx5YR0+k88TfAux9nzkeECglU8qUoc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcplYiehb7WoqTeu02NUv4h10NpVZjPhbe8EM 6ruVayulkOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZQAKCRCLPIo+Aiko 1RJcB/9RW/moB8fe/PV5gy+RL/l4+HEVXkDKQX4mRW/3S8f2W4iEYaITIEeOIFX1mfQ/czZfVhq H/yFBOSA1NV7X0xsN4oNLJuQzeBfr5CmzLayhVuy6lWQNUAVMM/B+drkm2Ddym3f4evfcU6SddU q34oAMPW3lb3Z6WvwpL+MHx4YL+AqlwZiNwmtQG6rFG7WntaNnZw0+sjYVulRaoGY333QxXffHo GNW78p7+v/GOJ3EMWMrnf/nsyaQRWV74UKqoBSch56VyDNDE7HthLnoYpCgCQP2o8CGDGxGQV7j OIdSB+bWJqvQNCmcrUkWpY34g4F5XoA4u00BaoblFCJiK5qG X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NCBTYWx0ZWRfXzWFsC7tiL5pX HiNV/PVMZsadnLb0zBJhDE/slKiRKPaHSLVDbdJShi52+KPt9nW4BsNzU5BDVclQkqaJpnQ5Qf+ Dz1RwW7s9oH04xuoiPos3hfKSjhUp688tGIC43DA7sxnXXmGBX/1vnC+Sa6RBAx8RYspNPz4hWH VWLAaSQHexAHs46mwjbmEsQsQZ+N2aBj/hGikpDIew8Yspt3pEnchaVHbjZCqyB2gx2F7JzRGvd x7j5BzNsZBgrVNxPvRXpiK0ZhnBf1W7w6LXAeCFPehX3RvrLjpJbD9sGc/JM5SqaQHmaM20W2YM 2S8UaEhFR+nwmvwpdPEWqlpp6QRtW1yqrQggAoGH/q1gOHFEFVCji3IZgs9DUDsYq3Laq/ERiWb JT6RJgBRn3rP7nnnixS3wSB7oLQDpOwVs6ynMRQF6tm0jtmU7+NDq/+w3htVwqm4H/nLjGd61Vz XsDq3Mvcl6WASxfU+QA== X-Authority-Analysis: v=2.4 cv=N9cZ0W9B c=1 sm=1 tr=0 ts=6a0dca6e cx=c_pps a=1Os3MKEOqt8YzSjcPV0cFA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=o8D1m1ilSIXDguKSM1sA:9 a=QEXdDO2ut3YA:10 a=hhpmQAJR8DioWGSBphRh:22 X-Proofpoint-GUID: fjQVYzLnBPaAM2RrDXZLea47uabY4eew X-Proofpoint-ORIG-GUID: fjQVYzLnBPaAM2RrDXZLea47uabY4eew 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200144 Follow the comment for the macrotile_mode and introduce separate revision for UBWC 3.0 + 8-channel macrotiling mode. It is not used by the database (since the drivers are not yet changed to handle it yet). Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- include/linux/soc/qcom/ubwc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index f5d0e2341261..319caed88775 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -50,6 +50,7 @@ struct qcom_ubwc_cfg_data { #define UBWC_1_0 0x10000000 #define UBWC_2_0 0x20000000 #define UBWC_3_0 0x30000000 +#define UBWC_3_1 0x30010000 /* UBWC 3.0 + Macrotile mode */ #define UBWC_4_0 0x40000000 #define UBWC_4_3 0x40030000 #define UBWC_5_0 0x50000000 --=20 2.47.3 From nobody Sun May 24 23:31:55 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 21DB23EF65A for ; Wed, 20 May 2026 14:51:34 +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=1779288695; cv=none; b=dxOwKk4HGbJgP9a+KGrAl3pj2NAYAKbW3/YfmuaBoO27I29bNZFnbPUCVpP8y6lFfg5NMATyTCs7DzHHPWfbQkm2d9Ew3fykCKjix1ODH1f7PlfvCkJnezDO6DFt3bBwXgY7yWsnvZmYwNyY5/6wjUt5A5GywoumSIp0dNY2F9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288695; c=relaxed/simple; bh=NJiVsMMKzJws+Cks3lRdvlT1mL0gwv+c/6r+WaGQjLw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nW49gkwQIknwUZC22cQf2HE0Ygb0g2FKPs6nJ9e2S/xK7M0pvJmOFcds986Y6T1Noyh++JYEKr0CHFC2X0+ENfKqPSgqaww1H+ODZqDhjffzrOzMP0DlAmq9sYxiCJ7vfO2NV0tFBiSwwqKjHCzJ97lMQsKykQFK7YiEWNoPzP8= 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=A3oGLcOg; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Te+0tbuT; 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="A3oGLcOg"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Te+0tbuT" 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 64KCktNF1725708 for ; Wed, 20 May 2026 14:51:33 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= Jnv3IJHVveO9Wr2l9i2vrKyKNiwoqkqE7X6w0Obsuxs=; b=A3oGLcOgFF1lDnCL pTtPs00VgH8TCriDXW1SOGfOpuZ4EtAwE1wL1q0nCKImvfS+DmjcbyfRjzhuElKI NHaQHOm4y+kSG6ODc2+Vpu+Y+BngCkyPQ3OEZHq3rfapNdo3gT3dx7ymqZq/j/xa uWcCZ53KKk8yQhfJjuhlQ9gaZ7/I7bdvhDX09hHd98Qfef3TAEcXIEFN9nglKLvX dV8fe41F52LT+jFnNyZRPTSeDNX3fd7YtOsuBWQ5mNoWpmQzNBFthNOAjpEGjVzZ 4Tge3U17OKPrh4OIkiN1491spQwJdpkCHj4d8KB5yLUxIvqbn/a19SL+hh8PMsoD 2ANB4w== Received: from mail-vk1-f197.google.com (mail-vk1-f197.google.com [209.85.221.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e8t3qn8uj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:33 +0000 (GMT) Received: by mail-vk1-f197.google.com with SMTP id 71dfb90a1353d-5754e645c63so11964856e0c.0 for ; Wed, 20 May 2026 07:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288692; x=1779893492; 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=Jnv3IJHVveO9Wr2l9i2vrKyKNiwoqkqE7X6w0Obsuxs=; b=Te+0tbuTzwaetGJbDjzqPUp+gAeEjVrvMMg/vzi9fkIku8jY7MHcea6rH1nq+TRrh6 YPhehXD6dJY+e4wCOhoWi2uCe+rENnl9D9g8TdGkbSU0aevVShdp+lMcH/Q6U+Yw8GVv 8Hf7vbYqwXw4nacjYRpvOqDHLfyLhEKPassamia9aVZoyWHzc7UoaWSu2eOLwerZ5v4f 8tpE4qRw8Uth3CDa/XwIPXlzNsDzBIZCtMXj56BE4pe8UWRle7NlcDtanuDMYTmsBHe/ YmL5HDoI1IKjRbSB3oOPnmtOEPpvD5NZ2KHuZzUWFa1F2NNEfh09IuKnZ5TvOw1W/zS/ syBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288692; x=1779893492; 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=Jnv3IJHVveO9Wr2l9i2vrKyKNiwoqkqE7X6w0Obsuxs=; b=VJLiBAxnTX9xsdr5KnxnTAZ3eW1+1/cfOIkYJ/PdXY+PD/mjBmY0M/NOIOinxNUpU2 jjeY5oj3ou9JcKcP/6r9uacBUEu91cY58YcGkN2QB+PU6WhCkYQUbdFClbyluquoYP5P eSmMLKdSwI+L4lhXavVYLmhCaTbqwQZJknodiZLhrlyGesy8ii1VmuVcDkEaoP3mxjuw ed2v4j9+7kHz9htgtrFt3roM4VU7JsqrhT4GSg9M7DSA+Ie5/Wg2hHmVoP02N9Qa5s4P f4v8VkfsPUpH9bMwupsKvdnctPxeMevqdvR+TmJqSb0Zb4C+5x1J4F20rYZ8+E4xhjwO ZYGQ== X-Forwarded-Encrypted: i=1; AFNElJ+aIaNrpXZiNO2q4Ca8Vj6i4duekuX9nHGxtcD/mi1XDc5byjdScJmWcuMdLZJC1d5ipLaWcGD5aGS0Pmk=@vger.kernel.org X-Gm-Message-State: AOJu0YypKEP+QO6tqDy1lWZt2oRs1Z7dMzNg5lUBb8LV9QVa/Ofdexm1 I+weIty1iJWBYCTEwqDERYvU/I4A2mdSXmHKjYZEBPFlaUUNBxMYqkqbF503hNMveEifGZ3LoDl Rc4Xr5gx9ffJrBM7tuZeKyOapiUFYaIpFUbbN2CRB3PS1E+shQaq6jMhskYUUi3db54c= X-Gm-Gg: Acq92OF23nPKjw5RtIoZ2p30RyWphuSEIleVK6AZhXrxAj/VDJOvM3jRPm/F6jx1RkE jp7Q1huGlbRSr/UD+uzhgbYMwbAKcTmx3Qpr0yk43w3L6EWiuiConuKHFc+jjKizIhsqCCoGAgw wGNuGNP33XI/eu85fnvvAs2OzlN0OK3BNVfiS30arYp5vYZ9Aw+PKuCbrmCchpenc1LNC/Wkp2M wmy5894gQHR9M7wboRSsKtFRzsBhEMdkdPZhThJCtZchDLhzVT4UIo4LglNKExwIJ91f8MRKfq9 ILRUr0W6C2XZHmqPk7VubY6Xtp8p2aywn+Ez8oYvfBg5e2MV2ZSwLiQnj/FvxO+9do6Irvy/EHG GpjRXuuoFhRgB8nBVwqiQdxJaPIVkOypuqUi6K1bYJMKgHMfddsKOvE2nnp1wbipSG1FIe4BQtk qxXSrhfjq3r4Osed6yoPjiKqUXqwGjoW8KSvY= X-Received: by 2002:a05:6122:30c4:b0:56d:451b:e4dd with SMTP id 71dfb90a1353d-5760c1c8c1bmr13738411e0c.12.1779288692229; Wed, 20 May 2026 07:51:32 -0700 (PDT) X-Received: by 2002:a05:6122:30c4:b0:56d:451b:e4dd with SMTP id 71dfb90a1353d-5760c1c8c1bmr13737803e0c.12.1779288686682; Wed, 20 May 2026 07:51:26 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:25 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:09 +0300 Subject: [PATCH v5 02/28] soc: qcom: ubwc: define helper for MDSS and Adreno drivers 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: <20260520-ubwc-rework-v5-2-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1061; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=NJiVsMMKzJws+Cks3lRdvlT1mL0gwv+c/6r+WaGQjLw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpm80cDP5L52G3Lw0/8I+QpNhHqbG0OnWv2Y CS1v/Lono6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZgAKCRCLPIo+Aiko 1R0/B/4wJHR93HM0x2ZMQYcL1jqZ9gJ1ccKOlBjmw+4s2qEGoANYjZ6aU5+QpnzKKfmyAmwCmdu jFtFii/XfvruQbGABUsPVE62vw/eLlactl5vWdsHLv38kO84S/daBvc2O6t4lz39eO+C9pY3geF bCH85Xq1B1/KxGysYvR4YKKFF94quMjxFMRaoEaMiLDPDjuv6RhN0bjZ/OIrHzGJzthMr9DAYOr nbyJyMuk+TJO4oFm36GT0/z2I1PE66tyBrrgPichLyMI5sR0wIAtqd0xmvy2yb3+YgLQJqWH9ok jydOHrQh3pY56EQuOJ1ucA5K9kPgky7Oyq5IGvgSfV/GBlgh X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfXxhz7WFcXsqul aDvrOlKHeDqybd0H3IvmbhIPZj3MqBjpxI8/m8nAIt4ju4KBYpt9zC2lPPjXizTbuhijMxVmwZP yU5MjlzHgD09NsI7JGTsZSWtCSSGE3DxqaG8GYqVEnUmWH7R09dLq0jhBSXLZ/GIZ+Coo/+P4qr Pffp2lD3VeggkErijwOXukE55ezV8x5gafwSG+cJUBtMhG2jadqbwNF56qjCfs8pNfcSE6NBIvG Fatx0bciGTNhZaxK/AA+p9tLa1eeJeVv2NAuzUaZ0TanIV/FSIksTNOcBhy47crSLeHov1rBuEQ Vdusq0L/4vNXx5zeP4p81w8Zi/LEKDJfexpZELHCHxW+ek0ZGAksoIjHyiWp2JT7U6/N3M9E3S8 GQkIzlWKoLlFVfIE4OmROwQwGzoJ4dthaeX4c3smy8y+/xE3oCoElEupMkMYcPOAsGJiaw2Uw5U 1E9RGIwH5wQCEYdy4qQ== X-Authority-Analysis: v=2.4 cv=N9cZ0W9B c=1 sm=1 tr=0 ts=6a0dca75 cx=c_pps a=JIY1xp/sjQ9K5JH4t62bdg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=TXJx5zmxIxDbTTGRO54A:9 a=QEXdDO2ut3YA:10 a=tNoRWFLymzeba-QzToBc:22 X-Proofpoint-GUID: ROQPxTl6Memf9O5ncSevFEcVLET9xocF X-Proofpoint-ORIG-GUID: ROQPxTl6Memf9O5ncSevFEcVLET9xocF 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Define special helper returning version setting for MDSS and A8xx drivers. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- include/linux/soc/qcom/ubwc.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 319caed88775..8355ffe40f88 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -100,4 +100,20 @@ static inline u32 qcom_ubwc_swizzle(const struct qcom_= ubwc_cfg_data *cfg) return cfg->ubwc_swizzle; } =20 +static inline u32 qcom_ubwc_version_tag(const struct qcom_ubwc_cfg_data *c= fg) +{ + if (cfg->ubwc_enc_version >=3D UBWC_6_0) + return 5; + if (cfg->ubwc_enc_version >=3D UBWC_5_0) + return 4; + if (cfg->ubwc_enc_version >=3D UBWC_4_3) + return 3; + if (cfg->ubwc_enc_version >=3D UBWC_4_0) + return 2; + if (cfg->ubwc_enc_version >=3D UBWC_3_0) + return 1; + + return 0; +} + #endif /* __QCOM_UBWC_H__ */ --=20 2.47.3 From nobody Sun May 24 23:31:55 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 6FDD03EE1E7 for ; Wed, 20 May 2026 14:51:30 +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=1779288691; cv=none; b=Ffg5RHh1Aaja75ET4jteDX3rhuTRaAcFbejLwYDug3Zu2JsjuIh6lplJ8U/tavFaXgW7PIjG11f+RZ4KUnCm571GoMZereSmWjfvdDjMKEbwnE0yTeWyzWG9jSKJ+UAxrS+sWVQBpS1bDXnSgXdVUtSJa68SvJxka++jRQHmGa0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288691; c=relaxed/simple; bh=ExWr1JY9whNXUKFY5t0L4RzJXMMulXiTflbhGuiaHZI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uX3P/93zxev9dW5QuVs0V4yDdjB+4hyBlQEckwWQzn76PRkPCpt4gi2Ky3Xgu2qFrER9c/mI1db46bE29VjFFACXLjeUbKQdMNcl7hFjsIk7+FT8zPdzrp4NSA4WPVClIteRj660KtwZmOjPQ2Taex6aztDZ/F2HM65EoWnoxik= 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=Sr7amdMm; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=fzU4axmq; 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="Sr7amdMm"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="fzU4axmq" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KE6SfD118976 for ; Wed, 20 May 2026 14:51:30 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= UrwG1S/O3qAkBaF791AYRGLqRUMhO7W/iLd53FJSriU=; b=Sr7amdMmfYdMr+Zc VWcjkcLGyThlQ8ycj8LrvSrNHd+eJI8+TIO5+OERDI5sxeWr104+c783A3+0ARFB aMu6AxPef7T/xpQcTtKU/m8l3dWbPQVw+iPCThTZ3+0c+q7moL657Ihuh080CfZL zsFkqM3QWIrTBW8+/mfHtLD0YQLBD5Tz3DFLa5gOhaw8JC40xPDg9GlqH6P3sXmu tRrCrbZb0YGdm0ghmrPxrqHSG0m9WtdCK7ezHyALetH8s2+K52dvKCXdYNqMIp7h J7EewccH7oxtCid2TDWWQwPzNUBC+LsqRkEpYJKazVyMns1Xnw+dO04zUsylQ6uf +t8XlQ== Received: from mail-vk1-f200.google.com (mail-vk1-f200.google.com [209.85.221.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ee886dj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:29 +0000 (GMT) Received: by mail-vk1-f200.google.com with SMTP id 71dfb90a1353d-575ff9befe6so3939688e0c.1 for ; Wed, 20 May 2026 07:51:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288689; x=1779893489; 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=UrwG1S/O3qAkBaF791AYRGLqRUMhO7W/iLd53FJSriU=; b=fzU4axmqxCvG8sIj6q6KOfqN2ngs7DC2q+SBrdS3XFpAE7ZskYV0XqaeAM3kTihdL1 k5MKH+BXe4aJuCrGmagEbriAJzAtprpxXlLYVUA9qD/S4VGNBeUR9N+IrdZcYpn5OKJ8 MuNcfJ7hlbRkd82yuT6STto1ifYUM/BpwuRN7qXADwrSkIj2Ah5N1uQH3VDYkbu10GjT 8pxudIfegYttn9pOTK0jxObFPcAbAM2YmV/Vqa8GHJUQ7WDYt2MLYSjN2F50grnRte4e 95EXXDJGQKzjre5wYH7UY9ny1A0Lb/zGTkF9GAosEjxO6AvZPhM6+OlhVTXxPcOZ+e6u Yy9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288689; x=1779893489; 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=UrwG1S/O3qAkBaF791AYRGLqRUMhO7W/iLd53FJSriU=; b=YKXhWjmWwL5diX+mQEAGwR+AgpeDcO1R/920jNtGXpBkDP9vj7or7woS0rk6YUhjZk QVxUIVb/TKdmbXn7jvzgHPZJMFkLyOs53nGTjd7aPqMqDPIjRl3l6Wj6j/KLwwS1jHfJ wgYErOxqHSuVI/w8vIjFjbV/9IyOW/hMTz3Q6+or5JQMtu/CkHqP12UYL/xXLNMrbxCf 9K/cS/X91haUP9QWH0b0ZsN3FaHxBNEAMdfETvI3yoPjGN0KETYO5MLtnHxgz5/0jVyz FJ3zbHfOo+Ql169e2kIHOVkKWtxLOYkYR9WunXYbUq3vYRXa2J8WxsQ5mqgSnb+sQ0/7 L8Tg== X-Forwarded-Encrypted: i=1; AFNElJ8o4/Bs3HYFMHN6ZiKvFTEghfwjwswELl6X5StRcQ/B9TcF+1ia4ZNwbf8eG5/d/NM79Pf/W1VLqbwjYyU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy555NyuM/xCLE0ZBQ0cVvauUhPJ4ZIjOaFIXsTJoR4jwS5cESx 1qOjupqeX5zDxTcFMbzlVrvaXrN5cgZhrF9Wh4BQFG+tog/SJagkaM0eF5PNdI1IWoumpfJw/EA E1FLxMhBpID4qsID/XzXS+iCZX6pFx/fmZDNB3d47G9bNHN9Fkz6bHgAXSyfR5ek08Fo= X-Gm-Gg: Acq92OEOrDNkHsDp4gIBG3C352SYuWvRicGbtCUy627K9yZyWgmA4Oa+2dnfGcMBVPB FFsv1wCt51hGl5ncxbNeapLxTSzp7HEMNadx6e+HEKHeSaxLbcBBkJQLxphL60rICVh2yp7e01c MVGWWFhHogDVhB7Vrj+b5ZO0mOA/l1v6Ocp+2xk8/l31yhjGeooPe1fOiWSxJvmsH1qjEU9ds4f iWFu0rbw3Nwyueon3kMtdwzFCSXD1+u2ACcl47z8Lz58JoEwgxx8rkiim33hYUJb1ZDKF37hjx+ W5rv0V4vm18KYpeeE/dq1DnB7rlxiPySw/1T3aE79MD9HlCnH6qTdkDFKnFirft+rFjs5JFevie f/hswP4a9Zf5HRvBqVPlHl9k0SUflrFsYc4tQdxJTA13b4PRvUpowUQRQDb59a6wl5NsDgEUHwq DZ9GO9lti8AUg763Yha+MotOL/EBeLxpAKNwA= X-Received: by 2002:a05:6122:2988:b0:56f:a3e2:66a4 with SMTP id 71dfb90a1353d-5760be39af3mr12943033e0c.1.1779288688835; Wed, 20 May 2026 07:51:28 -0700 (PDT) X-Received: by 2002:a05:6122:2988:b0:56f:a3e2:66a4 with SMTP id 71dfb90a1353d-5760be39af3mr12942975e0c.1.1779288688306; Wed, 20 May 2026 07:51:28 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:27 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:10 +0300 Subject: [PATCH v5 03/28] soc: qcom: ubwc: add helper controlling AMSBC enablement 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: <20260520-ubwc-rework-v5-3-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=819; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=ExWr1JY9whNXUKFY5t0L4RzJXMMulXiTflbhGuiaHZI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpm7L98NiVy2c2G3dWVoragMCzQMvvnfaS3B rjM1n57BTCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZgAKCRCLPIo+Aiko 1QSPCACCKpLUBk3NUYdB90kskEN18nV0MDp5L9vyeofmX/kuMqKVnnQtsrBNVeMUJ1cjSl7TX0G pr2GTtlNGfEAVhw+MI0axWiTiG0IQkgFl1X0vSvvXBu5Zod4D5SCgY6ggBJpLY3eDPlvYpT+qrS cVYtenD7qxrRndKv/Nkgd2gsGdAL1u2eMq8mDMiKXihAYz9pJLbcbBeSxY3uEtDT2yZK1a30w+O v5nak+iIo+62vUHowH7ST3EkEUc8QyMoFx6DOrWEXxmfKYRKwKe/yzzQXeecSI9z8cNPhyTXKXR wIJGgqw0IA62dIbrc/MGHHBOPHaEkUADxL4OA/rfKKBwRNgl X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: fImecy26EqkIBpfHLv-0rpsAkzsQsSmf X-Authority-Analysis: v=2.4 cv=e5k2j6p/ c=1 sm=1 tr=0 ts=6a0dca71 cx=c_pps a=wuOIiItHwq1biOnFUQQHKA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=WuC1ZyUpIfxNvbBu5HYA:9 a=QEXdDO2ut3YA:10 a=XD7yVLdPMpWraOa8Un9W:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NCBTYWx0ZWRfX1JjeLH5YXnk3 CvPYkb0SVGJVweZJUPRxSUzvTilIakhqWbTteDcFNt+G/ehlN8lRAvuuu6wMsnRcEcTL5BK1LR1 shDQTBVzGOGw8a1VLZEaW4AoqWWFdRSi66QGiBF/4Ba46lp47kniagMNdG4TBPSwh+QjoS7OUSd 2ygCCbzlOjh6T2QT0ljFd9CtESL5yhfADdSgz2It4osxsBc5qSJ3x4VdN7PQOp0qND6leRs2YoG 7EjrKNbEAinTHt2vXKznKg3nGDUfGPMQR4HqHFGUGrBChIe5bahcK5QqR0R924joXw2mQ+KlW5q lAuT6eGNIGlDCRTQ89A7y6AmCME/YrrIQPJhaZ/Thf6wACqO6Ms4EGYbGBgiymWoEBl/6nF0hJN 6vPK6ovzhatMkLn3CELPgBkmZfSikZI7iymoUDo/pY2z8mZvOh28kazvsoqqU1wH+eX8vnBqpx5 Tz4Nt20Xo6scgzOa94A== X-Proofpoint-GUID: fImecy26EqkIBpfHLv-0rpsAkzsQsSmf 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200144 Adreno and MDSS drivers need to know whether to enable AMSBC. Add separate helper, describing that feature. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- include/linux/soc/qcom/ubwc.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 8355ffe40f88..83d2c2a7116c 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -116,4 +116,9 @@ static inline u32 qcom_ubwc_version_tag(const struct qc= om_ubwc_cfg_data *cfg) return 0; } =20 +static inline bool qcom_ubwc_enable_amsbc(const struct qcom_ubwc_cfg_data = *cfg) +{ + return cfg->ubwc_enc_version >=3D UBWC_3_0; +} + #endif /* __QCOM_UBWC_H__ */ --=20 2.47.3 From nobody Sun May 24 23:31:55 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 671383EFD1B for ; Wed, 20 May 2026 14:51:37 +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=1779288698; cv=none; b=XiUNINTSq9Vl8fQ5N75J9fCvF0P/GtMbNneR6hOumwcf2J6x2VZ0x98O21h7cDqdhAyqZIwR30RL6pa8YWooUYrkKVxlJzj2Q2XJ+6Ql/YxWgowaA0kPy8C0NYRbSzL6lNE7dUDxqNwprUjv46eaDGPGIczfoUFZaiqXwuEikpI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288698; c=relaxed/simple; bh=llQosyriopAsPU93KsYfwj0RtQomBCEpetcDR/LyLdE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=o166qw1VzW5xH61MMtmCKOz1gNTo+i+oW7fGBP+rerRQ7JNQjkMyyqwHuDc6NFBahkHepHVmlqzTmiyqwAOu95JR6Uut5tVyxN1rCUvsJtOirKf+50Qc/QI9d1KPFWyatr2VgHppOXrHzou03WoBeg4Qq3g/Em5HQjOG/hT5cSs= 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=o4xMXNAy; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=PXKWwKKl; 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="o4xMXNAy"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="PXKWwKKl" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KDXgXR1798322 for ; Wed, 20 May 2026 14:51:37 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= Djk2zkStwaWZHr0e4GFbsUt4SMVtvVziVb4lu5RPX68=; b=o4xMXNAyRg0UAL2c JG79nbqqiWoxdFdV8PS8egzELwuuFJXb8Jb3jcQNQHFocYYxkPGRjuDK7o7Tjr0+ AEpwYe2ZNPuiACAJFgxuRSk27S8CXLcZvUsceK5qEQm29hwjdhHY7ULsx20dLeCW OZ5RTMnochYAwmTzLHBnlLOL3mNDlHmODDTO16kJ2qMvg4dqRcP+uZdwS9mede/4 dEoOQPDdt9L9BgJrHhDY4wq6Cn+qcjY+lvPps0ZbKFbrmiLM11zbeoKOuBfLgc41 6/VcIvD3AdyMyYJei8QrpTYW28LFkpEivvoqM3VwqSjUITxCYgkvQwAp8H5Y3fX8 YeVgnw== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9dxu0a0c-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:36 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-6327b45f59dso2183568137.1 for ; Wed, 20 May 2026 07:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288695; x=1779893495; 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=Djk2zkStwaWZHr0e4GFbsUt4SMVtvVziVb4lu5RPX68=; b=PXKWwKKltI+w1/jx3cYrPjNhnftENSE71rSvMY9MI3Ij55WfRUkaVIirSvnUSgzcda xpYVAeqcVOVwwErQOmxUTiLYEBjnbBSAF7LajX4TeLPACMQN4jslortkgM1J2E3YPJDO Hyoi4QTbIfbtzn3CbxfXIWca3nGA9/oE943HMztxrGVUy9Uo6iRHReX1PbqyuKtjKhEU i9N5JQduzD22LPOO1hwtm+tg2zFDkyvUgvyibpzhSR969OfFTHOuWIPSK18FBzw5GjtI 4M9B1i1SjVQWGNN44R3FCTdzbU/WMBqptqT3XP0pW010+JLvDjUbtAqttU7cK4wMln95 S6kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288695; x=1779893495; 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=Djk2zkStwaWZHr0e4GFbsUt4SMVtvVziVb4lu5RPX68=; b=H4Ir97jZiT3zYwsD87XlWAQiF8yrlmWGQ/MB5/nxxvEp8DZuVKS6EHpT1f7TkZ73p9 VmAtY/zVxTCehjJivMs1maQ4A2MSF8O4fvHoOYX+0OrDG3hqYivlx4MoXuF1Yu72+QNw 4GnEq8CDEYFhSI2UBNCQ+2gTbYW9ht/WLf0xj+ysRCMdj8zAoLXfelGicTsmZjrwlUTV 3BARx1tG4Aj1NrP9mL+Gnk2tKmgdI91JJMNaNxNwkAE04zsK4u6cMp+0bfwJIe2MAw04 olt7zSd4U8FczWgaR7im56AgMswDptIYP5YqVSSEiP3V0KCJdk2XUl831r1oTJpPdy4L bfqA== X-Forwarded-Encrypted: i=1; AFNElJ/H17JGW4xPdtZGjoWwlXfP02sh2wAf8iAHNHhs7IdPdSwCNbJHeaUuwg75dvmCPcu/qEH5l5s3KnV2hZI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8pJmlCJO5c/APgTfNFQwac2BLIgB1g5CZnk+4TU53ApexoI/h +Hz7ND9szxiWxlElzbqbb1Qj2ospODoGmFhYtAsFXriIsDBwJGS+At3AMbmyLLnBmYAkJqWLW4g tU6zcrQHxFvFY8ef7w7GSVerWA9tm1ku9rCg+VDeNtOhmNarQpgLn5idi9K7E4+d3YrE= X-Gm-Gg: Acq92OGziYpGkpGTBP7RGcvUzNS7m/T6nv5WEkV+JSnVRFs8ao7iQmae9TAzeS5wvxb rdjQ0oLbG6qDoUyxZIVVSMaIdmB9ePkzKoBd5dqZBFUw9gygCHcXhucfy6BYM9YePba1+90Xrc9 svut9TN4+PabrVD5XYDd63u+OcueZ5gkFe+SOvHiD9sLN4IEHBfDg13YV/GC3sH51CR46Mt0JiJ 35PfjuHd1BdmuYuIk1Ig5HgqVJr5upK3irFsedtqyNXAkknQPINonbD7f7adLLAuXj1khr51dFG 3+53OJXOlY+kf3tU4kXlUkSpdHfMk7BVTEiZrewc/ofe/uVLT0s+oRGM21AE2qyzxYBYc6YtEDI zucnJg0aG+n8vd+RpJpOYoCMK92olqo7lkDd64B0Xa4zRFExvhkoXxPK/OVKM7eiL4PqN8vQuk1 oYuk/47JdTnSOlOfRDXTGnSLe9/ONUyejQd3k= X-Received: by 2002:a05:6102:4b14:b0:602:a9f3:74d8 with SMTP id ada2fe7eead31-63a3f9980dcmr11919386137.25.1779288690437; Wed, 20 May 2026 07:51:30 -0700 (PDT) X-Received: by 2002:a05:6102:4b14:b0:602:a9f3:74d8 with SMTP id ada2fe7eead31-63a3f9980dcmr11919340137.25.1779288689885; Wed, 20 May 2026 07:51:29 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:28 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:11 +0300 Subject: [PATCH v5 04/28] drm/msm/adreno: Trust the SSoT UBWC config 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: <20260520-ubwc-rework-v5-4-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5936; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=v3UCol6mfqB5clR/DI5HzrndmV9Fvkwgup9nT+3uePc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpmcLmb1eTiMXqdlk7HOL2ywGiNyaADZQB1d bOd8qORDTiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZgAKCRCLPIo+Aiko 1bWbB/9ljxlAsqB63oP1geucWwRblpeTznE0EEUs7ZYNHv2c9V2hMnIOyatoxgNm2Uy7PyzC9yC 7fCb9Q9+JiCtCi16OzeCcJU9Th/vV1IWUeTjWxPU0579QSeF5rNSU7SA6DsAfpGdDEzTOd/aG8f tSF9w9yhybsILaKwXed3NopqALRzxQEExfkIO/Cs0tviU56xqBFGJ8jz3RiLCAmrpglE4TYyFah CT1XQ/c2vDpqG2Bdnb1AcHm+HRCJwPmDwpVM7rlt/HWeXWJVSvJO1sWWpbvZWkcV7b+kJ2JUTZ3 SgZQlmBBYCetsfkVEnROC59AE260LENTA9NCEHmfXVJ6iEpF X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX2E3fk8kK4ikr 0+2k3bAl1Wm+DkYfwXe4YtYewBz+7WY5F4/VzK/NUwIq1ajZ8vlyf6ollKEbS5d5/Y7T6PeKQpY bKevyo2U8RxO5jqZ3kQp++TO8OkjhMQMKTkFOdLabQ8O2rMXvuLXyd6/Dulv95vYdeF6/5jNbWr 9fgu0fJtNPKA6vpOKiYVlyD6vASBb54SSNdq81IKuILAllMfu3VWzRUk9gQCTApQSvQOpkcHvkW vYR+ssXU+BKf5GHhr7pFG9FsunVSamLueE7FqXPPT+kg3H1A1AuRhN7zN45pHvnLi1bCn6fi0Op +dwyU8e+noCMEYCg/6Wk+R2kx77XpuKoRZuwLwo8e4bcB5gV1bRnoVKGLzAqvz2K95yILhQ+hJ/ O4hc/aQqnY4rImxiF2tfoDRnnyjRHrO0mAKBhZ18Z5VETWZ9nc2AmzswjUpUFF3IGRPvAPqT2ov +GbpdF9K5KloSkzLzRw== X-Authority-Analysis: v=2.4 cv=Zckt8MVA c=1 sm=1 tr=0 ts=6a0dca78 cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=IhcC-CrlSmvFA89tYH4A:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f:22 X-Proofpoint-GUID: eXxMsP7gHLOHYTr2XagP97cH59kc-vkv X-Proofpoint-ORIG-GUID: eXxMsP7gHLOHYTr2XagP97cH59kc-vkv 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 phishscore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 From: Konrad Dybcio Now that the highest_bank_bit value is retrieved from the running system and the global config has been part of the tree for a couple of releases, there is no reason to keep any hardcoded values inside the GPU driver. Get rid of them. Signed-off-by: Konrad Dybcio Reviewed-by: Rob Clark Reviewed-by: Dmitry Baryshkov Reviewed-by: Akhil P Oommen Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 11 ++--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 82 ++---------------------------= ---- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 -- 3 files changed, 6 insertions(+), 92 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a5xx_gpu.c index 79acae11154a..699fc0f551ed 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -1725,7 +1725,6 @@ static struct msm_gpu *a5xx_gpu_init(struct drm_devic= e *dev) struct msm_drm_private *priv =3D dev->dev_private; struct platform_device *pdev =3D priv->gpu_pdev; struct adreno_platform_config *config =3D pdev->dev.platform_data; - const struct qcom_ubwc_cfg_data *common_cfg; struct a5xx_gpu *a5xx_gpu =3D NULL; struct adreno_gpu *adreno_gpu; struct msm_gpu *gpu; @@ -1769,13 +1768,9 @@ static struct msm_gpu *a5xx_gpu_init(struct drm_devi= ce *dev) a5xx_preempt_init(gpu); =20 /* Inherit the common config and make some necessary fixups */ - common_cfg =3D qcom_ubwc_config_get_data(); - if (IS_ERR(common_cfg)) - return ERR_CAST(common_cfg); - - /* Copy the data into the internal struct to drop the const qualifier (te= mporarily) */ - adreno_gpu->_ubwc_config =3D *common_cfg; - adreno_gpu->ubwc_config =3D &adreno_gpu->_ubwc_config; + adreno_gpu->ubwc_config =3D qcom_ubwc_config_get_data(); + if (IS_ERR(adreno_gpu->ubwc_config)) + return ERR_CAST(adreno_gpu->ubwc_config); =20 adreno_gpu->uche_trap_base =3D 0x0001ffffffff0000ull; =20 diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 7a3e3c2f5cf3..90e814c64c6e 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -733,82 +733,6 @@ static void a6xx_set_cp_protect(struct msm_gpu *gpu) gpu_write(gpu, REG_A6XX_CP_PROTECT(protect->count_max - 1), protect->regs= [i]); } =20 -static int a6xx_calc_ubwc_config(struct adreno_gpu *gpu) -{ - const struct qcom_ubwc_cfg_data *common_cfg; - struct qcom_ubwc_cfg_data *cfg =3D &gpu->_ubwc_config; - - /* Inherit the common config and make some necessary fixups */ - common_cfg =3D qcom_ubwc_config_get_data(); - if (IS_ERR(common_cfg)) - return PTR_ERR(common_cfg); - - /* Copy the data into the internal struct to drop the const qualifier (te= mporarily) */ - *cfg =3D *common_cfg; - - /* Use common config as is for A8x */ - if (!adreno_is_a8xx(gpu)) { - cfg->ubwc_swizzle =3D 0x6; - cfg->highest_bank_bit =3D 15; - } - - if (adreno_is_a610(gpu)) { - cfg->highest_bank_bit =3D 13; - cfg->ubwc_swizzle =3D 0x7; - } - - if (adreno_is_a612(gpu)) - cfg->highest_bank_bit =3D 14; - - if (adreno_is_a618(gpu)) - cfg->highest_bank_bit =3D 14; - - if (adreno_is_a619(gpu)) - /* TODO: Should be 14 but causes corruption at e.g. 1920x1200 on DP */ - cfg->highest_bank_bit =3D 13; - - if (adreno_is_a619_holi(gpu)) - cfg->highest_bank_bit =3D 13; - - if (adreno_is_a621(gpu)) - cfg->highest_bank_bit =3D 13; - - if (adreno_is_a623(gpu)) - cfg->highest_bank_bit =3D 16; - - if (adreno_is_a650(gpu) || - adreno_is_a660(gpu) || - adreno_is_a690(gpu) || - adreno_is_a730(gpu) || - adreno_is_a740_family(gpu)) { - /* TODO: get ddr type from bootloader and use 15 for LPDDR4 */ - cfg->highest_bank_bit =3D 16; - } - - if (adreno_is_a663(gpu)) { - cfg->highest_bank_bit =3D 13; - cfg->ubwc_swizzle =3D 0x4; - } - - if (adreno_is_7c3(gpu)) - cfg->highest_bank_bit =3D 14; - - if (adreno_is_a702(gpu)) - cfg->highest_bank_bit =3D 14; - - if (cfg->highest_bank_bit !=3D common_cfg->highest_bank_bit) - DRM_WARN_ONCE("Inconclusive highest_bank_bit value: %u (GPU) vs %u (UBWC= _CFG)\n", - cfg->highest_bank_bit, common_cfg->highest_bank_bit); - - if (cfg->ubwc_swizzle !=3D common_cfg->ubwc_swizzle) - DRM_WARN_ONCE("Inconclusive ubwc_swizzle value: %u (GPU) vs %u (UBWC_CFG= )\n", - cfg->ubwc_swizzle, common_cfg->ubwc_swizzle); - - gpu->ubwc_config =3D &gpu->_ubwc_config; - - return 0; -} - static void a6xx_set_ubwc_config(struct msm_gpu *gpu) { struct adreno_gpu *adreno_gpu =3D to_adreno_gpu(gpu); @@ -2700,10 +2624,10 @@ static struct msm_gpu *a6xx_gpu_init(struct drm_dev= ice *dev) msm_mmu_set_fault_handler(to_msm_vm(gpu->vm)->mmu, gpu, adreno_gpu->funcs->mmu_fault_handler); =20 - ret =3D a6xx_calc_ubwc_config(adreno_gpu); - if (ret) { + adreno_gpu->ubwc_config =3D qcom_ubwc_config_get_data(); + if (IS_ERR(adreno_gpu->ubwc_config)) { a6xx_destroy(&(a6xx_gpu->base.base)); - return ERR_PTR(ret); + return ERR_CAST(adreno_gpu->ubwc_config); } =20 /* Set up the preemption specific bits and pieces for each ringbuffer */ diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/= adreno/adreno_gpu.h index ec643b84646b..324319762383 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -236,12 +236,7 @@ struct adreno_gpu { /* firmware: */ const struct firmware *fw[ADRENO_FW_MAX]; =20 - /* - * The migration to the central UBWC config db is still in flight - keep - * a copy containing some local fixups until that's done. - */ const struct qcom_ubwc_cfg_data *ubwc_config; - struct qcom_ubwc_cfg_data _ubwc_config; =20 /* * Register offsets are different between some GPUs. --=20 2.47.3 From nobody Sun May 24 23:31:55 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 A8FA83EAC84 for ; Wed, 20 May 2026 14:51: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=1779288700; cv=none; b=RiEZmVaoav89JbNWqxyaZXTU+RqP5ZzkzuXK5LthpVNAP67F4OjUWqR6R7xs+6d72JxkCfDpQjzLD6ZdVkAOhq5fvX81tXd5q3TgPpqiIAauBQmbQ49SnXrpSWAAXqW/V1IgCvLkGYL565rsdZ3YFvPyIkGBCGU6fNGtw/csJTI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288700; c=relaxed/simple; bh=0l58tGlCZ3KJhlnY7QHsm5XAPXWOlSpowmtYXNxh9w4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Qy/AiZxM+Ko/sGGsd/jb6GhyBHfvB39EfPaBbD0gwt/rW1ED+Rg9VmTt2egxZT4ON9h0xBzCZHpUjOyo5342+ydXngRU2KS4hRxlXxf/i0O1epg+j+LsxS+yGGaU5uwJuXsCWtpMvfzKZ+o/GoZBDuVI2PGrVEsAFqKMesdVyR8= 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=RQ0RXCA6; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=JCzrFUwJ; 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="RQ0RXCA6"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="JCzrFUwJ" 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 64KE2K3d826528 for ; Wed, 20 May 2026 14:51:39 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= FqMqhI5UYkOHH0CWlGEm+fCS4mKO20wPw4ekmFs5Kkg=; b=RQ0RXCA6PbqLb/Fx WlXE3RChKqir9pgSvrG+scBdVL8hkGPu0CC50TNpLGr/DBpoqynSgUZFbg+aMvi0 QXPkHFX0XG8HfIVwE6D7S9XcOWl5PJDLC/KfJBhnR1KdXuG3XqhFlqBzuNoynnTE k3xdi7IqzPLBmi8AGkPQ7R4WRSXnVVqkMU5qU06QsTEZuMOg8iVkTbcZpACq8C7u 0d8TI6OvnL6ihaWmfuidvY4ipsxbOrqAElF/JYfWvKqH/UGMaBFTaK9XEXudShLV mojhsnur7LO/riw0ls96Scu9R5hace9g8zjya3ZhVWzOsSWsWe/iaSZSKHi/kqEQ xV5bNw== Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ecag6ee-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:39 +0000 (GMT) Received: by mail-ua1-f71.google.com with SMTP id a1e0cc1a2514c-95fd51d5c22so9929895241.2 for ; Wed, 20 May 2026 07:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288698; x=1779893498; 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=FqMqhI5UYkOHH0CWlGEm+fCS4mKO20wPw4ekmFs5Kkg=; b=JCzrFUwJ6yLK4leKkjC0soIuW8NBRTv5x3h8+IPOxIRAoHUwAkIoAPuLyYt4iY2K6f R3xw2kA8bRxhXudDJ07G8fsl0reQtDzLqeXenJDFA0AiUhf6mHs0svXLL5ARCRYQqkGJ E8itKYJ2D4V7nxwK3OFv/Be4pLEEdYHAZhT5B1/L6pKV11glt4jQZ5GcCINLN4t5d0Re BXRTfPzpBcO3JL7yUkpARq2pWUGOyKGlVFElz8e8geeVBiuf7cr0kC96My8zoSRjuJEL q57U453BT2IeI6+6GsSFxHwv3ITrZST8DU7sAb7+sj1DLHOf+r61GZBD7ogii1vlwpFA VRrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288698; x=1779893498; 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=FqMqhI5UYkOHH0CWlGEm+fCS4mKO20wPw4ekmFs5Kkg=; b=aOWPjAOXT3sy5QF3wSCU0zwO1Ix0ws+xT/au8s5Vpgp7VwCSYNgt0jn7Ecy2SEggjV /r6VZBo5wLuOVsXRBqgjGyah6vDVtk/djTn6Qy56UCh97Vq7DooY1JZMiLxodiqdIF59 YVycqYpajtdhQB/9Obm8zXYtcqa3eV2ulI46WnEEwfbuoQ+NN7mFcZUPlwZhsv+dvavO EjQkFkri+8iPuTum+qI0Qkc/vZ33FgZVb06VoRKN1U780jMHCxFf10h9XfgQUfs+lqJo IxPbHqe1Y4BvRhKCyFwJKJqVD3WsgQBYEY880Z4Mr3oJfl/b44G5f9R41Bo6GPmHqLhr 7kZw== X-Forwarded-Encrypted: i=1; AFNElJ/kw/9/JrTI7nBg3d8avgELM8Gxn1F+TqICHDWySLpHe4eooIaq6Ohdl2iqoIuAydgg9c4Z3tlnLD6xeZ8=@vger.kernel.org X-Gm-Message-State: AOJu0YwsXzuygGJ87OZw+15NZugF0i0yu2PpKcgPVkF7q71VpsFa9BBh WGHtvWEE+Erq8+eUxVD0UuMVmX889icej+Ovgs8CExVqlF3/c+H2AUwP6lSzAQVSXxMSXdjqXFy a3hIBgB7kxdai55Yr7WivRqnG97hfs/XdDxWp1lm0NUM9HdA64JQ/R5zPdTw157y6C5E= X-Gm-Gg: Acq92OHVPBJSwtbMtsYxhblPbHbUo+Jox6Ha42VYGUXNcXOG5KIgAWSEc7fWOCATSBm HM7KTygdDXrG45s7JeiXLlun1IHXKioXT6HHwerVVf9UoIqfBhpJFlwVFWtJkIaWflQItaBOh9v sq0e9jaMuTzOc499Qm90xxjelKcXMkXB7vATHFvXZwPc/1Ku6ZIKoo8jg/9WWhowDMF3De34jNH UiclxTblF0GBBIzZcEIHcNNV4gCV3dk5wPisGkCTahaO1KW8+gQaLIgIr4X+/Q/Gg+moJyXHAxM D0GzZoCaABt/sgmdSC9TCn9g9WRLZ0QzsmKLhWjXA/sOyvkEUlNktMUrO7raeF8/6m/1iTv3W8I 3XOJtjrT7mKxvNLGTKV8kftGABSUfI115RDrmVVRZAFz45pbkTAf7M9h1HZJgmlEJ4tnX2W+db6 c5vzyd2bVZadT38E0GZ83F3Vm7GyZT021Rk/E= X-Received: by 2002:a05:6122:920:b0:574:6c7d:ff08 with SMTP id 71dfb90a1353d-5760bfb8c49mr14719233e0c.1.1779288697712; Wed, 20 May 2026 07:51:37 -0700 (PDT) X-Received: by 2002:a05:6122:920:b0:574:6c7d:ff08 with SMTP id 71dfb90a1353d-5760bfb8c49mr14718621e0c.1.1779288691430; Wed, 20 May 2026 07:51:31 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:30 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:12 +0300 Subject: [PATCH v5 05/28] drm/msm/adreno: use qcom_ubwc_version_tag() helper 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: <20260520-ubwc-rework-v5-5-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1621; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=0l58tGlCZ3KJhlnY7QHsm5XAPXWOlSpowmtYXNxh9w4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpm+jKgocPYblJFNAWl3I+e8kco9lDn6wZwP H6K0qUhOxGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZgAKCRCLPIo+Aiko 1SVyCACsyXzB2/3qJ9oEITmYeNPQ8pb5ecPBHWIyxss0NLfSG09OY1LszIQJbDAOElFDIi0BwyD /2QUMiU12+O/Iw2EOSwJkLruPtrNxlZMEKphxlEu1/5bzoo1rmNODFavRQNjcPcrU5zpFxRY77e ZC/DSsA3U1I9i9apqLif4jP8eC6m1HSN7vGXcldD+7stgh5QIYZKorw0YuvMC01sZlm8DZeOCGp ZZxJvsnTYVv65cuV2132BRV4JL+tCnbvANSP0g4e/kXm9QCnUQFFQYLXCerDMvx5TbKmpiG0C0J /endi0aQSN7Ef5RAnGWawBPg9eSN5wzLSVZoVXyc6ZvO8bW7 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 9IQ54eSCLjTgNZehr_fgdZS0OhWOio2d X-Authority-Analysis: v=2.4 cv=WqMb99fv c=1 sm=1 tr=0 ts=6a0dca7b cx=c_pps a=KB4UBwrhAZV1kjiGHFQexw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=xoTxleRWwXRO4XdZWWkA:9 a=QEXdDO2ut3YA:10 a=o1xkdb1NAhiiM49bd1HK:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX3CKMROchPKrC rt51DPH9RZo0Xmiq7ExfJ9sLVO9xdcKQZ6axRSgns14kaEwa26cp6DJb+WX5I5tN3Er5YQnjZGf M7nTykwivFgfLfjbxMfQSTabq5RMBxSFzm2BN/T/qXgbnrgfuoH/kXNyN/9GTf/0r5jqovBmn1t I3xLyYWWQQbP4fqCgNchBeSDvg07vrTBtCAVIj1I3wAFc63jMvfYKwd1SUP5z548Q/bvKIRCOtm qEJJJYsdycfXHTK+4i9zNl9piJVDPtXbdhSkFoKBFAyL8DWGOTTiHO/8splEhc2PqZxmIdKP80B 4zocfLooQ5Je1cZMyAFQ5kc/TUCq9OgGjVFz4HiY3z0zJAiu4jSYp6P3Kl6mMxIrcZlSOxK+CRQ teejeReaGMFH0ZkaDLAl7P202CPWSJLQSNX/20jvzy6aNYK4CbLRSszoh9gN8v76EcG5Ma8NgRZ DT0KerKvIPSrPO0m/rw== X-Proofpoint-ORIG-GUID: 9IQ54eSCLjTgNZehr_fgdZS0OhWOio2d 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 adultscore=0 malwarescore=0 phishscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use new helper defined to program UBWC version to the hardware. Reviewed-by: Konrad Dybcio Reviewed-by: Akhil P Oommen Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index ccfccc45133f..1923f904d37d 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -282,35 +282,33 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) bool rgb565_predicator =3D false, amsbc =3D false; bool ubwc_mode =3D qcom_ubwc_get_ubwc_mode(cfg); u32 ubwc_version =3D cfg->ubwc_enc_version; - u32 hbb, hbb_hi, hbb_lo, mode =3D 1; + u32 hbb, hbb_hi, hbb_lo, mode; u8 uavflagprd_inv =3D 2; =20 switch (ubwc_version) { case UBWC_6_0: yuvnotcomptofc =3D true; - mode =3D 5; break; case UBWC_5_0: amsbc =3D true; rgb565_predicator =3D true; - mode =3D 4; break; case UBWC_4_0: amsbc =3D true; rgb565_predicator =3D true; fp16compoptdis =3D true; rgba8888_lossless =3D true; - mode =3D 2; break; case UBWC_3_0: amsbc =3D true; - mode =3D 1; break; default: dev_err(&gpu->pdev->dev, "Unknown UBWC version: 0x%x\n", ubwc_version); break; } =20 + mode =3D qcom_ubwc_version_tag(cfg); + /* * We subtract 13 from the highest bank bit (13 is the minimum value * allowed by hw) and write the lowest two bits of the remaining value --=20 2.47.3 From nobody Sun May 24 23:31:55 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 3ACEA2F12CF for ; Wed, 20 May 2026 14:51:36 +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=1779288697; cv=none; b=OtyB7uj1V42CE23x5bF1iLAkuDuRrxg6WvHYpaSgDgNU2iOuz+VQ5PEUTN3SohOMo3mVVtut9Cmahl66t3UG+9lGhfPPVXdDBMNoaka55IYvfyKeD7g/N4VXgE264dw00oq38FTCQXdyoSXCUwKUuWW4RnPo16QC+b5qlPl2HbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288697; c=relaxed/simple; bh=pQcZSLClq75f0H7mdOxTbEo5DpGKFB3n0GBshQz7Fb8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=a9N/mZw1S5uQfEa/9m2oVwnDEmdL5T+I9J0df2CR6Yliu0xe3Jzt3LHyika9vc+VE749YGMovjElhuJQIostTiPlVGUSKOdy5y6CvbnGPpN/Ux4uShJhCryxW1i5hnRKeWTs6DNB+WNkWIs4lFyJdsUk/s8FypRZOyP3yiRg6qs= 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=P2vaaCjk; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=PG4F3D0X; 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="P2vaaCjk"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="PG4F3D0X" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KDY5xx1798819 for ; Wed, 20 May 2026 14:51:35 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= KrGdZ6Bna8qkROGke7rL/1evORye3ZzPkLd+P26j6Fs=; b=P2vaaCjkU1BUJZWl XIZQhkEQSn5+slMBBq0wvj0JXwI5ALlArUA/q/Kvzk38Q7z0Fa8wsHaFrtMZJKVI nYWJf2PRBZZJ49SiTKXi+J1Rq6ohbWIWhEXDV70skg/xO1gv/Za8EORVhK/erNDd KykoCbbGwX2oYNJYNzFIsh9jrlTGug9BsTX4tYc+b17x7koLG1qf0+VVGZYmGaLN Ac3PW33z/S7J8pdTLAY1ni1l/GzU58/FsgTQnMPqJTPujxpOsN4COjZmUV2LvByF 8NTI4GDbEes3D3kBvABVlwugiKgaQeaWlx1WgDIk9rawf3rdHUGIeKhVpTv4vKRr XKR80Q== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9dxu0a09-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:35 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-6313385ca1bso2827658137.1 for ; Wed, 20 May 2026 07:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288694; x=1779893494; 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=KrGdZ6Bna8qkROGke7rL/1evORye3ZzPkLd+P26j6Fs=; b=PG4F3D0XOfxkGlSE3Cw5DTFjhr2rQt7E/5Yx9LnfV1FJqlBLJ6FUt7d60mWTMiZM0v SK9yQUxbkiWWiRsvn94HnnBqFsRvbdSZ9igA8MD9pHLzx0xPpj7vykRzr8l8beYcCJRA wjRCyNFbEINyR0PLSO0jlT6mLivKI4jyDkMM3nlNJio3chMbbLds9rpiNqi+3Cwy+Jaw JAv35eRF0UGBb0lDsWCBIcpxG0SwB4usEAx8+7cQMh0R7T1+qz/nVYMmIcffy38NuMNK pn+u7suH/ns3kP8PTOyXYSGEt5gezwW+SwwNimKlYYZEeb/sZMC42MNhDz7eTHXK155T +FNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288694; x=1779893494; 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=KrGdZ6Bna8qkROGke7rL/1evORye3ZzPkLd+P26j6Fs=; b=lnhBzGXzjfg9CfaqlxeX8DamgdOpi48DeMfY6miRR5BNsLO89e1ZIKKPdKkVLgzQMR RulY2WpkSOfFd/sE31/8d+kyZleODlwSoC7fWbbcANgZU/FzdfVAmPMxzYP/yGLcD4J5 /XlQ9sBEI+WL3kytd2K2Ld1zXrj56II90yiLeC04dGkWcJ7WrNpKxSYA6e7GAK4cWI03 AZ3zlhNc4niO8gVUDKaa2uH+lWzwSIKpanVqRVkhtn/5qm3v0OvOliUc0snTc0cPyMJZ ViDN4WhR/2UFHs4WEw0a6IGHR1exOvmmNRX+h4Aouz7G6qnqXZzcz33gTPKDA7YbzeDz U+6w== X-Forwarded-Encrypted: i=1; AFNElJ9IH1Uoy3JIbMspf9HywswcG4rlebo9yo2gciJiRLqdM3+ggY3PmVRx7ud8Q0tKpwRDLSt060TN0+KGq3A=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8Nan+49R4n6yTfFINd/HB1M2G+6bBi6awlSJuZCnn8atlt3c+ YR+Z4a/aVBYzanbqvo7j920Jf+MLFn7/rogHUvepjrZ3nLNxscBHpvM/PXGQk9kxxn0+AvzbEix 3dRXUNTJKDLHXvJwXyFqpfe3jgClRp86JDCObFvVBweulqONEhsSxZcPeJMAqBDO4WqA= X-Gm-Gg: Acq92OEK0aPefpTgsG0u568UoTEg+O9cIU7ZrD5wMPmDoJ8lKcKKmFeBQMS35hptiaM Oj5mvlxvMNqcaQQeGioo/+bdENVFP3pWcwA2ZzyHfdqvpuZgwAm2JRlkKtTEFes0+bOUuzSt7xy VMKUTJap25tqgOqOLvwefOLcWdEFLgNELLM4tOFJ66W21WsqY8eBrOf9A615XgPGuRzxt9bGixU uDrjy1nf4qyNAzJbTOGlM9596iAbIetuMYpjhLP9AiZ2nk/5NbPP/xyfYNP5Zv5kshrDzYbTWru WWnxL9TkfJz3r4JUBnuoOpz8+jLpdWJnPLSZsPt9TW2kfPOt33vcEWc8Juu3GNi3Cyz4NjR90w1 +sWY3S5LU5ra5tfaP+CUzdIiALW7wjrRdKRtHmP5/5ry9KCgRnD2Ybq/wMS3J+mqd3yAcCUB+na XpmhSZ2D9SRgUIyqefnANskXk+x2UTxrhDIiI= X-Received: by 2002:a05:6102:1492:b0:631:d3e4:efc4 with SMTP id ada2fe7eead31-63a3d951d5dmr11748434137.11.1779288694407; Wed, 20 May 2026 07:51:34 -0700 (PDT) X-Received: by 2002:a05:6102:1492:b0:631:d3e4:efc4 with SMTP id ada2fe7eead31-63a3d951d5dmr11748397137.11.1779288693853; Wed, 20 May 2026 07:51:33 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:32 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:13 +0300 Subject: [PATCH v5 06/28] drm/msm/mdss: use qcom_ubwc_version_tag() helper 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: <20260520-ubwc-rework-v5-6-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1662; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=pQcZSLClq75f0H7mdOxTbEo5DpGKFB3n0GBshQz7Fb8=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpmxwfkqlssMuazJ+ZnFSAY5SwQV8SGP2rxc OLxiVEELr+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZgAKCRCLPIo+Aiko 1RtVB/9jLWGlQhSV8Z4vXHYlDNi3b4AohzUIwBfvDF2UuVqGjP4wAJvNTIxAO9+Xx7ShPDskRfP sGxAF9JqvTllksEWZJ3RL+Cs6pxtBLUcmcXxbXOtsms57sH+L3yvTc4oLpuwXXQ6yhlkxiAySPr mEHrqxmxcVVjYTBa5hScgIiCtucXxp+GDJb+H0TUb+dUESvyz+K3R+iuuZq3WzIntwSeOB1+7AH rXYQGPTt8RDQ7qcRcnbzoulM7w1u5olKt011cNdiRidfk2nHCQWfeYpI78zZAF0lsRBzzKguljz vgM1ZqhZXnlBoKr8g3a0u8NaxmvhQbeopvlPxFXJbGXA3eHU X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX3pvphgU+kC71 w3LDR9gjykNRLAzZ/+gjCK3gyPPQZ4aVP2q4PLG4X7HrBxR2cHArzO2DG9M6y7oSz3DuT9GlPyo uSAZSVWb324XnpoLmV+q0qO/7GHG1jEdLNw9Y28aY0somDtkVOOJwJdunGIOCPxE8B4BKB2l58S XklJKeE03ggc9Zi33CUl4+HEppa4Zs4Uy69XJ6MgDdNAvGENDC0bmKvqkCHTElX+a6946g2vRtN wCFgr2hXnsjT5UGTXAShrT/niy62zZvT0JR0vsk2/HrMuZPHEyjuJbC2T1muSxUfZjhd/vfUVD0 Z2J3QI0hbch6LOwhyOfzHLCaXmTaNuQHWC2VzDB29WoqteG1zJKnCrHIWAWu0UWbDw6QfeqUC6l 3lPvlHQpV6toTgohe1glGKhQmsqhcPcST5n8VDCXp1xtZBmq9nZZsAdXtZp/0TIAROUU1DdCYI2 zaKUKEzaJ02tAk7QhrQ== X-Authority-Analysis: v=2.4 cv=Zckt8MVA c=1 sm=1 tr=0 ts=6a0dca77 cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=qBJULKV797PGQuHHbA8A:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f:22 X-Proofpoint-GUID: xWCaiCOPq-dvGV-DohIf9hXFRMVbozuG X-Proofpoint-ORIG-GUID: xWCaiCOPq-dvGV-DohIf9hXFRMVbozuG 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 phishscore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use new helper defined to program UBWC version to the hardware. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 4a6acd468bc8..229b47415f29 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -201,7 +201,7 @@ static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm= _mdss) const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); - u32 ver, prediction_mode; + u32 prediction_mode; =20 if (data->ubwc_bank_spread) value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; @@ -219,20 +219,8 @@ static void msm_mdss_6x_setup_ubwc(struct msm_mdss *ms= m_mdss) else prediction_mode =3D 1; =20 - if (data->ubwc_enc_version >=3D UBWC_6_0) - ver =3D 5; - else if (data->ubwc_enc_version >=3D UBWC_5_0) - ver =3D 4; - else if (data->ubwc_enc_version >=3D UBWC_4_3) - ver =3D 3; - else if (data->ubwc_enc_version >=3D UBWC_4_0) - ver =3D 2; - else if (data->ubwc_enc_version >=3D UBWC_3_0) - ver =3D 1; - else /* UBWC 1.0 and 2.0 */ - ver =3D 0; - - writel_relaxed(ver, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2); + writel_relaxed(qcom_ubwc_version_tag(data), + msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2); writel_relaxed(prediction_mode, msm_mdss->mmio + REG_MDSS_UBWC_PREDICTION= _MODE); } =20 --=20 2.47.3 From nobody Sun May 24 23:31:55 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 95DF33EFD22 for ; Wed, 20 May 2026 14:51:37 +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=1779288698; cv=none; b=NI1x6sawuhFyjalw0htQCC/XwEPtRZN2OGoHJpilVEOgs3wFNZnnrAZpf/wqi7DqEGtiRac7EOg7tgexcQ2xX0k7lRBkUgr0W7dd+KqD9DeeLtaxTHMTiZhhC73q6JWLW32UbHRPJWqAa32UTWVgAbX2uFQN/Se/K+113fwxovc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288698; c=relaxed/simple; bh=HMBD+zQalz6ee/fp488Ht0p3cICpZxvH9sX4/PHcPpY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s/L7rBaEDeq3kPzRYHl1Sr0IC2Ngh2HQPjMjB3x6tVc11m+Bw8Wp+G24A18N45tEB8RGDnoVCMu11U5m553pPeA51K8ozb8Jgw0ee5taVykt8aE+T1+1TX/aDI6TB3LFWyAA8eIdVFNPzDoXhImDR9BeQAXM97wVwad1TMnGjcQ= 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=FhJ8HzQn; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=SQJNqii/; 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="FhJ8HzQn"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="SQJNqii/" 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 64KDPxoj1725756 for ; Wed, 20 May 2026 14:51:37 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= A6XloU2OeEBOoOyp9QPMtaZvH32CoTQEY7LmlmTrejM=; b=FhJ8HzQnAmcIwAuj 1X0LwOcccEEvagGW8Y0MIp96vJFC9XUVXrG0J4iyjBa3jPJ+BWfKvPI61efvT07n dNq2DjOpK8TNHn1CBpbhA1yYjzlNgank1BGLxBtRqShKLlIOvJAXKOJM17tR1bvO XeZqqonj8U7PmQhoQkAE/s6vWeIO9nvB6jGL+SVeUG5kAAD9TKXmXmmw4uOx3Gw1 TiIQGr2sg/xpjf6NJopd/7BCD8JdsnipHX7AI38E6lCyXhU6+EzL0C6HMyn8SnVo 56Lxh9xsgwc+Rc5Jc2EZUIVZLCdcrw2dXWOzlGjwkweHBDyu5fWuPwVMbxsM5wAS SGQBAA== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e8t3qn8uy-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:36 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-6332db4182dso7830994137.0 for ; Wed, 20 May 2026 07:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288696; x=1779893496; 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=A6XloU2OeEBOoOyp9QPMtaZvH32CoTQEY7LmlmTrejM=; b=SQJNqii/2yAp+Mq1OZ3BmBGamhHVKfx41f5P2Aih8+3NvC6+OhH93bpIbsKPWYWA5l HZv1f+wwe7qr551Mf6TRO6BjzGapKe/5Fh1xf7KIFziC3zb/3p2z0GjiDQW+vg/qjhOq L7dvrHhw6/33debtb1ov/KECR0njyCC+OrIM2hNz5t+IKPMuYaG0Fd+oVzLCcUFf+9BV pGmTfNjOk4hdI8Gfced3F4eCYs45FplnPQUxDYjkiBsX8RC1+FIMoV3oxZA5hugSgVm2 85jscq1G2BMPa8s5qAX79B8DgHr9QRVgwRW3mOCulShHjFByS1EYkxxIfAlDIvA3vU0o tUYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288696; x=1779893496; 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=A6XloU2OeEBOoOyp9QPMtaZvH32CoTQEY7LmlmTrejM=; b=MkncN0TvEIfWtzufCw/ziNMYhr4IAbE8g5xaLURKv1sN0IFQsWnVdI+zFIJbaWyV4s EHD5nlpty1npRM25J2k5teFQ2sAp8QJog4q2MMsIj3mnlk9uqkHjOm3jDogsdFzIsE3O O9S2awp4el4M52WndKEDbeOiI/4Fcv3A3WAeV2HYa46neQNR0rRUMfaKbwBBlKtJWlYP XLGSisadJXoJHFSE23ZCMZeDJXgU8SkHFylIUTIc4fZIYWU/ipDq0Cvzcpvik8JkRONN Z6EaStGfd5YCIRYTWAlXLfkeU+i7h+QdNe4sZ462+5RTbwn9wi5Bcc0WAZPVz2xRqmAe jZNw== X-Forwarded-Encrypted: i=1; AFNElJ9KrCRAxYxu9G5Dp0Yxp3pnmYbqIGVI17BlwPosh6F07W1Ewx/oiOn+9rrmFfRkuYtd+cTGbhpV/42ujhY=@vger.kernel.org X-Gm-Message-State: AOJu0YzcYH5ZUnvn6xML3G7/bcqpIQyZLmjei+rms64QMiyIdZUURRbx en/YI2f3wVyzdwTYA3YXh0vapQI3d4vWNCYP+vNxW88vjj4Xzen/urX9MrHjO4x7QkCrE1wupQk No6XHg2IwxzwFb9R7RLGakRbHzfUYGODKuQ6dsKcdnsLNQrVJokwy/njPrxK7LHFr2t4= X-Gm-Gg: Acq92OHKlcbfrEsbPc25xfc9HL9r3d8p4Q7a7al6Hg7dhT+s5ADKYFcB8HI21n/U3z2 rLg9VRbGQ1o+KcZE/rig9Y1pE0moV2+vdzetbHwOcJ8XArXnssPjMIey3zhHqE9sWG19974wsJa RrJMDuzXS3bO6lT4rFL0ToQuEMfh8lFQnZOFF0VvFE0krPz0nZM7g4UexewPhmMJGUpsClekcmJ DRaC+EjY+ko12BDfC1RrSLrnSyQeUf0HVNQCTgY9hC0vubT7JCTRp8ERfBIfcCawsBMxbAsICPp F5lIBchZQeG5v7QGlZYZr/2UvGppbK7p7lp1ZMDARWsTomUXmkts7EVeAeJVqdgu1dU+oQioT+A CZF3rBM9MWEL7+sADiccF7reYfCjvdihrrvHIPg88BbqH63GBtAkJ/DpsNVTEbsUDku7IXwqtuk XCd5jQEjpXsbEWbjvffUGLmS4A1HVzYJYtlDs= X-Received: by 2002:a05:6102:5e88:b0:633:c6c4:b32c with SMTP id ada2fe7eead31-63a3ee7d510mr14583176137.15.1779288695865; Wed, 20 May 2026 07:51:35 -0700 (PDT) X-Received: by 2002:a05:6102:5e88:b0:633:c6c4:b32c with SMTP id ada2fe7eead31-63a3ee7d510mr14583149137.15.1779288695410; Wed, 20 May 2026 07:51:35 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:34 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:14 +0300 Subject: [PATCH v5 07/28] drm/msm/adreno: use new helper to set min_acc length 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: <20260520-ubwc-rework-v5-7-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1349; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=HMBD+zQalz6ee/fp488Ht0p3cICpZxvH9sX4/PHcPpY=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpmOk/QDc5BszdG1Cy99moG6bYTjHAju/kgl KoHccTJntGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZgAKCRCLPIo+Aiko 1c9hCACEfZlXYi2usBJHOpyfQdxGSG3YqIcwolWkdRupnez7HJd274TK42And+zpnTeQnr3PQks k+vKaiv+L87o3ehRk5twOG1CwhoT4KKxBtLcRYe+NIkoWLbmXLitdUAAZT2Ov0ZP6FzldJ7mWbm +PCia4irpP2/x9BYaDdojgVOnN6qqBaHpr1FXZZcL64XuMTQxnzJTOz6igCPSnO1FbqfcBSN3C0 1t/PZ1jYQi0iWwwB1s0A8ucn09FfC7oZNWOjK39LcjywIJR74fXo1dEBFgweJFcZulVjnaJPHbQ zybs44gIetawaIcy9Vfch1k023ifY5o2j2Ud0rFy67445cJ3 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfXxHvt8RtxZegh UbxLsZq/+6ZbTArx0CiA8pEOOgPPXGBSUz24SZNQJO+wilaYNvdxtnhWc/98n6CmHTwNY5LyVoX qS5Iq/0MYTzqs+yitO52yycHUxLWww58pnRn/iqiSSgxS86KrsVo3Ufo4BNtTlgMqk9tf1WzioM UmbTZELG02bbJ2sU3/d5DN0NT2W6/6rZBXqg6t6px944as9QPgc8D8+O7ZzKIAUQ0puJGwrGCyA 4C0c4aamBDdM3HCFLdcPhqUXjXEOuGFP3Ly3kMn5h5hfSrzVNsSYf1vJ2yWoN6w/8u1mz/0oMqm LABlhk1mXRYXFjHhCfMmX3yKaTj/Qlqe8ldsVXSJqY+matjnBYIPldzjfnJGML+zwJTLir+MpOV ixAEvqhZ/rv6PTcQVElwDV0XOZdAU7gkwthsyRANKBr1TtJUcDIETdmtIgBz2LKTM75pFHl4tyT llAAtMy6u95bmt811NQ== X-Authority-Analysis: v=2.4 cv=N9cZ0W9B c=1 sm=1 tr=0 ts=6a0dca78 cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=X-e67srwgh_QgMMAbO4A:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f:22 X-Proofpoint-GUID: 4zToeMXgRprB1Hipmiz2EK_1nW7QZAhX X-Proofpoint-ORIG-GUID: 4zToeMXgRprB1Hipmiz2EK_1nW7QZAhX 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use freshly defined helper instead of hardcoding the checks in the driver. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 90e814c64c6e..45c966610511 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -748,7 +748,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) u32 level2_swizzling_dis =3D !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LV= L2); bool ubwc_mode =3D qcom_ubwc_get_ubwc_mode(cfg); bool amsbc =3D cfg->ubwc_enc_version >=3D UBWC_3_0; - bool min_acc_len_64b =3D false; + bool min_acc_len_64b; u8 uavflagprd_inv =3D 0; u32 hbb_hi =3D hbb >> 2; u32 hbb_lo =3D hbb & 3; @@ -756,8 +756,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) if (adreno_is_a650_family(adreno_gpu) || adreno_is_a7xx(adreno_gpu)) uavflagprd_inv =3D 2; =20 - if (adreno_is_a610(adreno_gpu) || adreno_is_a702(adreno_gpu)) - min_acc_len_64b =3D true; + min_acc_len_64b =3D qcom_ubwc_min_acc_length_64b(cfg); =20 gpu_write(gpu, REG_A6XX_RB_NC_MODE_CNTL, level2_swizzling_dis << 12 | --=20 2.47.3 From nobody Sun May 24 23:31:55 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 33CFE3EFFD8 for ; Wed, 20 May 2026 14:51: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=1779288700; cv=none; b=SSf/9zExTFypGZf7y+w+GTeotHehoKA8d6LelqoQv4ebWmU1gyzHqP4Mc5xiFgbBPEAhbuZzfEuaWGUM4eXt4TGRn2LA7q13xvoy2Fzl63wvKZ6H1gmXCZNX6vkQIWKg3gQblY+aMHeXb1VF/Q9d3RW5xok6TrEbnclr+s14ayA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288700; c=relaxed/simple; bh=2ZvEjuy2Z2pk8ChjGlcTOYKmEPN6QT5mYQGegDBtU+w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RebUZxaY95ZXWj5BXU2QQF4Clle0oJc17/wfLXJEmgIhQfxnKkYi4Zn82Vm9Vuo40Gkd6+xaiSOHJMlMOtegfHQvT5llzUMg4cTuGppdOQy0sjn7JJ2xrXPp5fIDv5hItqNUWDPn5gwwyeK0aXijYSKlFW8bkjrA3aZrJO+tNzU= 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=coCyPRsk; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Jy736gtn; 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="coCyPRsk"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Jy736gtn" 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 64KDuWkI3680335 for ; Wed, 20 May 2026 14:51: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= xeqmVqS4sWTzNC5Ka5lPWcTosbNT5mxXRMsZpQCt8rc=; b=coCyPRskEV/fxgS7 HkcT432VZ03i/n3vjw2hwqdbupn6FA2Xd2X56hqt39oCUS5AAvIY7uFVIUOfg61s kShVE+ZAfSMBdoConruYqX4bnXq0OPzhIeUDpQU4zxPRUqbKVBTiCbcDDUQvQH36 GvOvKTsMBbPboJbzlR5ZAuNA3ZSDIz9O8/B7XDrwd5Fdx4HoDWS+/7p4S923gMGT jdGCh9z/FboxLhpgki6cxH4LIncy7/U4jLHH39uYQnWwolPFQEI4sPza6UWwh6NM plqto0OXjgLbSahD/lgBQmPDB+ucekKtz8f8FvgvsM575c+WmOeYOCnrECbCrYha XrdmHQ== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9e9j07ng-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:38 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-63136c0b6fbso8650474137.1 for ; Wed, 20 May 2026 07:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288697; x=1779893497; 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=xeqmVqS4sWTzNC5Ka5lPWcTosbNT5mxXRMsZpQCt8rc=; b=Jy736gtnxBG/zrNirbvwFEOuiUP6nkfvIVFarwoBQ6MjBjWrfOCCZCF9DqQGt+lcio HeH1Izx+28f5yFeHEG5zZdw6z+5DHcSMQv6Fnx8u2DvKV/iPvJA44DX9wSXyRg6cSbo2 Po896fN8X+D1k2ujZCLbL6L5Bc4KSsD99eE7L41nyIRmBYgoHAGigi5xfW14xaOlexvr ifoi6ILGj8Q/igZs4f/MkLklTS07FgnPMprH65C9MVN0bQWnaUGSbwrHrNe0Zl2FZn5y Ev/GuzHZdTI1TS0KY83/KKvTw1oyIWdlvsri3JkONhj5pZqhb7PHwlAhPWr2wBZx7dZH aboQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288697; x=1779893497; 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=xeqmVqS4sWTzNC5Ka5lPWcTosbNT5mxXRMsZpQCt8rc=; b=mOvGJKrmaoDZjmrQXCAQ7/dt4LfTw6+S0JtF9vdOoAj6z7QHO6ZbW8XVynrLJqz2Gl 4tFERyq170BElhWtUKHp36ytpoBFYkxgAwg0gKrJ4Ap7EeLXltytgCkkzg2R8DYTYckf dS3eQpNG8okluuzj5lg7q6dumG85iWGYS2zB3Araq10CQArfuioGP6PDnoToZ+rQFncT LHPF1faVYR/42yOIdVDHdCrJyvV8zaONniZ4IDRS3XmjtBS5JaqW59ZQYiLCFiOUoOQ/ NcxRc8HvAAVDpc2QqXZt4PSN/bf3s9TlSI/PwqMENixuEQuyFJZD55fNjDYb0M8xfCsP I61A== X-Forwarded-Encrypted: i=1; AFNElJ98rxVCBg4ATlYjGZnrfBLYgOveRQL4kYMzyTaMM0SeNEEZ1qhYEqOlCNJ2YaC7LkTyGrexMGRutXdNMbI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8oxlzgNP48JIlaGOnAZGOFUjzOgrI8x2v3H7TdIH6Ku13uvXa nDZr1N4uUWNY5YyxIfYsmUYweLZuLsgKGFzJu0kIIxuzGjeQjEunHL0O678pFBmtePV8jclb7IN D3/to/M7gb9WvzGbwsr0gCwyS+UDJGgUXe9HKcBXL6Vezq4FJRJ6z+ga5n1agvXmPGkM= X-Gm-Gg: Acq92OFNsOrIao7vZTHQiVjDFVZjVEjBVuvCAdWNLBs/pgynR9c/7BjwKzF4kfKmatH hSvrjY6twpoIr3otC8ZxyLxQZqqfsjna8SDreKlgIqWFgok4dJFKyDIK5F/JqVZJfU7gXPEwpYI 6sFPqfcID+42jZfYktBPTDNbb7Lx07+iKP69PZtnpGi18qqMZDqiPIC+9vSH8DR9iX9Ib7bPxKu DsFC/dD06bp4dz4qUjCzEK7pJPxldKpo56+5mpAs9d1uW+R3FNqqnkKgjo2xxqmsVucoaMhayKQ 9nH7vH5JLar/fINYMSnSUF1vGs3VXP7EdAwMWg800cRt8vKdLnlejWSlPSHqDH80peWpu2wMaTR ZC9uds386Y1c/8t36CkXF82sHRncfOD3wQpTwnKRQHEWms9db37wW0Qo08UuqdL96nwtrl9FA5Y cpU+fYLDa0P9gMxXs7T8drrzLxZOtJ776jBXoFJ07B+8rZLw== X-Received: by 2002:a05:6102:3911:b0:632:b111:965a with SMTP id ada2fe7eead31-638b70ad67fmr12317897137.11.1779288697537; Wed, 20 May 2026 07:51:37 -0700 (PDT) X-Received: by 2002:a05:6102:3911:b0:632:b111:965a with SMTP id ada2fe7eead31-638b70ad67fmr12317880137.11.1779288697109; Wed, 20 May 2026 07:51:37 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:35 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:15 +0300 Subject: [PATCH v5 08/28] drm/msm/mdss: use new helper to set min_acc length 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: <20260520-ubwc-rework-v5-8-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1832; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=2ZvEjuy2Z2pk8ChjGlcTOYKmEPN6QT5mYQGegDBtU+w=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpnSg3pNpgwzfEh3V7TwPJgChmHzrCdBHVlJ +Sw3P6JQ5eJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZwAKCRCLPIo+Aiko 1SqkB/9NDgpTEOuwrSiBDqeuqRiL52qgHqQllHdru+mhQOQicKMM6zdSJI+7VvIocBy//xCl74O oOkqcYdCdaSvEzPz8sA9s7VozHF/6S/Kx8d+quZkRoiaHL/6oir64aR6ArfQ+gqn9m/Hsmn3Ro2 Ff6hM9riHxTUfWxgbhRoek0yP+DLvqdVxvDIPoSMNjgtaMSoNYzsjMJ1Ii+qUBdU4RYORk47otR 7tC4TrtIPVtlC4Oudf4bunUD1AnRBsDaV5FcHZ5bSHxbeIP9420EujU9ePdMG1LM1QQ5xekRSf6 kBMz8RQCidexoZacg25miN6pyKOGkWvkSxaWyd36tAPMQYpH X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=bfhbluPB c=1 sm=1 tr=0 ts=6a0dca7a cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=X-e67srwgh_QgMMAbO4A:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f:22 X-Proofpoint-GUID: 6CRXC2g3c8LhEPDQ41hEYvODwGpGLY-- X-Proofpoint-ORIG-GUID: 6CRXC2g3c8LhEPDQ41hEYvODwGpGLY-- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NCBTYWx0ZWRfXwM+GE2l8/QlD wvs7BKyUGGc9e6fJmqg/nUPYncOJZwp61TJt5Lg/jMpDMZpk8sg/btXTEHiB1+6om8G48dffjlO fQXiMowRfSTcpxz9uIVA8SGumWNkkipJ1u5tqD9U/XYGgrSKe0TGazvilqlqitAgcmGJIQyC1BB xiAUdLVww1aPv+GregyHgOPQkDPcpGqnTUtl3ZAtDQqBd5UxtiOZfdlR2Y/Lc7IsLpCERFJEBzM c3aslRb61i+cL2g3yS4WI1+JlWpPhyUjxfkcEfh2QqKkvVcxuQOIggePr3hebWnLZONpCwmAwFy TYbt+e/O/YvZJtB0EhPkI9x1PKWMcgKE++DB1iTCbPSZlJorXt5qQRlxZtDG4KXWk7MxqGPKRmY q8VJeJ7a3dHI1YT390Epj/5oFb9Vz7J+oepPW4epw5AtJQKC1GEV4OE8bczIO+Jex+KVRJzN2KL 7iyWyhWi3RivL6DibwA== 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 adultscore=0 spamscore=0 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200144 Use freshly defined helper instead of hardcoding the checks in the driver. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 229b47415f29..9f2b366d45fc 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -172,8 +172,7 @@ static void msm_mdss_4x_setup_ubwc(struct msm_mdss *msm= _mdss) u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); =20 - if (data->ubwc_enc_version =3D=3D UBWC_1_0) - value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(1); + value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(qcom_ubwc_min_acc_length_64b= (data)); =20 writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); } @@ -190,8 +189,7 @@ static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm= _mdss) if (data->ubwc_enc_version =3D=3D UBWC_3_0) value |=3D MDSS_UBWC_STATIC_UBWC_AMSBC; =20 - if (data->ubwc_enc_version =3D=3D UBWC_1_0) - value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(1); + value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(qcom_ubwc_min_acc_length_64b= (data)); =20 writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); } @@ -209,8 +207,7 @@ static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm= _mdss) if (data->macrotile_mode) value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 - if (data->ubwc_enc_version =3D=3D UBWC_1_0) - value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(1); + value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(qcom_ubwc_min_acc_length_64b= (data)); =20 writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC); =20 --=20 2.47.3 From nobody Sun May 24 23:31:55 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 D1C283F0AA3 for ; Wed, 20 May 2026 14:51:40 +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=1779288702; cv=none; b=bZZt4IivGVeIbSKffzF+/vYLcYuBXJgv2NpSDwvKdI0U/2hioar24j/GOTsfdjGrHu1IxM4X+vnVoDmvIB0a30LaTZMLeaL0ZEHtHSikg/60w066N7weBVsQ6FqYpGWeO3UBCc7Rh0aubFjrCoontMTT6r/eE6hpee09OMfqa84= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288702; c=relaxed/simple; bh=YFsDO3JoZHZoGFeDfQhOfrhr6lwbEX34GrHVmQ8WqWA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mPOoc66wKkb8eJmDtqJA/5IQvnz0RJ4AelD99QtXtXG+zi2RqaUACLWN/s8jV10NpABOE//lirSaphqbps7jpWCSZrLhU3BBo/VUGPLYlwEJXOFIDgz/o07fnGHGMc4k/aecZA33JyiHlCu/ijaBI1lc9K0DDOeyfu4csUr3wmQ= 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=PrchZeNn; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=etKZ6TMl; 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="PrchZeNn"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="etKZ6TMl" 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 64KCctAB1725327 for ; Wed, 20 May 2026 14:51:40 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= Eeo9ei59HVM192M/bjlrRrRCHN6RB/mEIWbOlSQQvRA=; b=PrchZeNn4t63qFdf hI9nUi+N2zDsKLFEmdhmBk6+coqYiT3hDhl+HbWzIUcZGgS/1Dx1tzzEO7ODOgZT HE7CYaree5WiCxFSyayaTyeC85DLnnroH1BUSmsBg6L+pfUtIJJygzI2/H8cfgO/ o9A+mSUP9CY244jqyHZNMtQgz5lQOXmhvL9hKTdKvERCWNxyukx3cyapv55CfAsJ bL6vJS5HU4/0LsX5CtaW9d+eDWL8KLRGAhymEIBwQKfLao9H3hUldX6rv27IXJHP HdjXOb4L+pnjvLowcLnYX3nmAya/r74lIBY809Be3SNyxcAJHAkHrh5HvzuT9eeV iTcmTA== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e8t3qn8vb-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:40 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-956732444ffso9367795241.1 for ; Wed, 20 May 2026 07:51:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288699; x=1779893499; 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=Eeo9ei59HVM192M/bjlrRrRCHN6RB/mEIWbOlSQQvRA=; b=etKZ6TMlrYJxRXq3kPRHfnIiYpNKYBoyzybZ71++XNvGUgIVfnouyh06D+cGuOlDnS uYEf7/Xtpg2un9PTs84SfOsbPVL6I0wNX5qFQQG5CHydNM5K6x2CyBWH36/y74u/0W7c jzimXzt747pQo55lvLgvtxDEQyGo4YeYrI8xb9SdMmbUWKExyXVLUl8S1XMrIQrt8xsJ o7SrlO5Kp8ZcnyVYkril8/pxe0VioD3tF2qQe66X9bh20zf4iUpnozt7PhcDJGKbkYnb z8+/N6e6k11SoBB07D3T/UwChhAXI274VhZXKyzGrdPwCZMaS3/7JOTTnw3kRXwuhLQH qJRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288699; x=1779893499; 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=Eeo9ei59HVM192M/bjlrRrRCHN6RB/mEIWbOlSQQvRA=; b=RK3XDVPlyIUSp9P2UZ8E7rXr1PVR2LA0rCnDzekcno7tq7ah2wTQWv1LdlYXrEFnCR cNlry7WqVVQHQMaMMt25zNMy9X4x1pNCYfXh5ixfFRhYD3acpGAH3IgHK44L44NDV6ps 5QuXE/2XaVO76QRVMyMimOGVZZ/zoWsH4CCXVKssLDMjCUNV9jxxdfUD/WCdM8ByGObv 2bJ3kGvwbUSV78FvdBqmX3yHEWV2hBVXsnk1BvjBIHvm/tJUvnqvbw6XBfcs3uF4P3u4 AH3t6vhRyNymq7E6BZrCASdP/+suUYTgPUlWqnF5x/29tLdGqRFsmEmcNCsaO3Erih+D F1zA== X-Forwarded-Encrypted: i=1; AFNElJ9b7x+989BVclesUPIPVPVopw4gAfnE5kBoj6JKOhXLGoVEBUbb8f9wNgNcYcGCuLLIeyrVVYuVaQfoULc=@vger.kernel.org X-Gm-Message-State: AOJu0YySVYj/jw12MNVNhGGM8RuGNLsVifHSW5zd74wkleXKl3AztnYF 8OzvD9XJOGJUETxOw2JVPXA4G4wDkc/p9bvmyOO1YT4Fawk/7bYOCNUstCT9ZltBL45ME74hz4h kQitN7fWQmwY16gsCSZ3QW4ftCkZTandiZkWkLLZi9tbbNw8KoVDSS2AAI8NRqP/ErVE= X-Gm-Gg: Acq92OEt8GRpVxIzwh5KFDnXmSRNgfeUWRgddfssHT3w7E5THGqk/rpesDGRzf5QYCw pHNoGlIBFemHoslFrZWeT1B+rWAP+35hEcMvPU/s+HotdzRO5J0EpW0CWPLsyKuEWbUpqrIKcNa PQ8ajN+r00l71njSWxqfPs+8qZsjUDaxrycYhJ8UPzqcwKzg5yd6DLiPZ4S1zbXhqQQue1oC6oT cmbk+tUnZcs2tjuZz65n20ekTxlHYIZ8uItLxu5SEM1xurM5vLluRGpT/5af48Lbjq1sNhimT4d TBkH4CNZrWWCLuo7ssgtT0qnKCxxKIniDMfBI1DYuTMgcEpPLFjKEbYtIE/1+nytxGVTbonB+sh X3yOTtZ4YDgkXHv2zp2ZmUlAr+jW7rN/rvDK7wr6xxROpmlq7qhfcc/FbRGzr7/Gt9i7nrnB2s6 d9gXW0uD8iL/nf/18xxZrC5DCUWmu+026VJQc= X-Received: by 2002:a05:6123:4201:20b0:576:1a8d:8989 with SMTP id 71dfb90a1353d-5761a8d8c59mr8715647e0c.0.1779288699215; Wed, 20 May 2026 07:51:39 -0700 (PDT) X-Received: by 2002:a05:6123:4201:20b0:576:1a8d:8989 with SMTP id 71dfb90a1353d-5761a8d8c59mr8715554e0c.0.1779288698506; Wed, 20 May 2026 07:51:38 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:37 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:16 +0300 Subject: [PATCH v5 09/28] drm/msm/adreno: use new helper to set macrotile_mode 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: <20260520-ubwc-rework-v5-9-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1616; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=YFsDO3JoZHZoGFeDfQhOfrhr6lwbEX34GrHVmQ8WqWA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpnptHF0cvSg3htcJq2qUXfc7rPQgOHPfOdq mBQUOPEJEuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZwAKCRCLPIo+Aiko 1XOeCACgNFmMquQqVD64f6D97uj9j4yaAvvnVe7hHODyf6xs4Tht7rToBtBXI5vtut61hXLdZtt pUPIIpKjZC5IefW2CW7cZbapGVw52IX7S0gZMWdzssgJ1zofLqw/l7L31dhnOsRErb+xw6vLFXD oq2f1rKKdsNyAEGhYvAdWqLE/vAW1f+YUtELLLAfKUWUABnuqOwhxTkMGB1dBcNg+FpLE+vgLgH vTlaJbl9Ue0RKvnA+bNQUi6QrzaeIsbDM6X1n9HCwEngjVZ2/O6E2XlpTJz2UluZL7yCORc/lbK GIILktH4y1Ehl4SGViyL3BmgOLIbv8sWAxZ97EoEQH4LPG9u X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfXy2YdBPbLu3iN zTGFD8LVf0gV4puX+R2HuKWd5MZXZ9rdYhhRqh25BPvHA7dECvD1Xq2NwpUSQ2OYIHoPSe5OCsA c+vWCiLNcfwBtBrY6KXANACEsA/6P+9I+BiE8tQjSMSy4vWttkoBKDMfK27r5sz2W2RlExf44tw AhUAcVKI5kpiqY78QfBO4OSL6DGvT6eb6PT8TiJadvqaYyWbE5K3LnD9sHnVmvmObcnrcHHvrWo 7EVNF7A2Glp9ctEAr/RN7FwcR47HSl3dAsOcNJ62ph9ItHrw6vg+UOo4j8tCO2fA/9zWu/Vms6I jqMLdIt+blKXx3NA0knrDituO4s+DTaeZfx1iChde6dnpwL5ENN/+bwIF8TRGkwGejyXBxJeHei Tl9za3rk4Mhgb8GKXAk69ueglYPjTsqMaPwkJJcLpibbbenGWebgxCf+DCP8NzAiRtf7dth27RG JvqcrJtFiK5uxWHZHOQ== X-Authority-Analysis: v=2.4 cv=N9cZ0W9B c=1 sm=1 tr=0 ts=6a0dca7c cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=AuD0-tKUimmDNzgPTmIA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-GUID: 2j5JuzrufKcNIU23zUklaItHTynoYf9y X-Proofpoint-ORIG-GUID: 2j5JuzrufKcNIU23zUklaItHTynoYf9y 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use freshly defined helper instead of using the raw value from the database. Reviewed-by: Konrad Dybcio Reviewed-by: Akhil P Oommen Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 45c966610511..43818d1907ab 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -791,7 +791,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) min_acc_len_64b << 23 | hbb_lo << 21); =20 gpu_write(gpu, REG_A6XX_RBBM_NC_MODE_CNTL, - cfg->macrotile_mode); + qcom_ubwc_macrotile_mode(cfg)); } =20 static void a7xx_patch_pwrup_reglist(struct msm_gpu *gpu) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index 03f96a1154e1..78d7ac3fd8c7 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -439,7 +439,7 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_co= ntext *ctx, case MSM_PARAM_MACROTILE_MODE: if (!adreno_gpu->ubwc_config) return UERR(ENOENT, drm, "no UBWC on this platform"); - *value =3D adreno_gpu->ubwc_config->macrotile_mode; + *value =3D qcom_ubwc_macrotile_mode(adreno_gpu->ubwc_config); return 0; case MSM_PARAM_UCHE_TRAP_BASE: *value =3D adreno_gpu->uche_trap_base; --=20 2.47.3 From nobody Sun May 24 23:31:55 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 800983F210B for ; Wed, 20 May 2026 14:51:45 +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=1779288706; cv=none; b=ejcPwGL3QEYTs6JHCYMnDn/cQDH153pjTh8vL8quLln1EIBWNaCgKEkZbb8N2auZ20qX3vFXkeRLyWSJDcjFEPECiy0ygGJidzGiRk2OkFrZjpsFSw2GC1+u2sWmugY2lHilzhDFMgrF6fULNGKH6HapEpLR74607Aodl2MEsFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288706; c=relaxed/simple; bh=gBDFjN7fs9zNZK1OT0Rge6uEp5iYTQNKw6PU4vljOxU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=p2Mt2Rf1B5E2Q2xuD5bkPzKLNHS2FAJ1WUOU8JV8m9zMPWkFWHu/WjW3hQaB6dkvD2DWAdVYpbGk9uWwrNT95/ov0ovbkWA82e4cBOLlF+pJ4xcPCAYE32qTBxu70HeLE5/LNJUoBRmvE5vSD4rU6irSRBID8DqTEkhq4CWgdQE= 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=Uj5lADhC; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=BkCMqTIq; 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="Uj5lADhC"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="BkCMqTIq" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KE6UIG119026 for ; Wed, 20 May 2026 14:51:45 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= SHppxJbIcnxAbn5e5BxkZY1HBroOaNwMncF5FMMJzNI=; b=Uj5lADhCgKZb1LaT D7zB9BClKwWbn05PR90+3hViJ/HU5K+8mWgMA6bYhecEEEuwtQscJmhyi9p6k31Y TDtguLgTNDw0mMfq/0zH1+LEJ/IuTMHdUSUerBakr9mbiPB+TzUhYj0w7ctG/g/m mCVHpNOe7E3aBepVBrqSXPCwN2Kv2zkXnMmsCFz4ZB/pxHmwFh3idfdQtdojL9R3 e4Cm4Ct/4F8UpuaY4C4jTnDP4ourA7uzONJUuJUwZbcYhEQ/N2gH0CTj229drROg xL2TLmt5rGQW/IK1rTxyHuXJovUIfL+KOJGWkHT1YY5VVZb9RpYV1ggfRzmVzWNp C9Wt5w== Received: from mail-vk1-f199.google.com (mail-vk1-f199.google.com [209.85.221.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ee886fb-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:44 +0000 (GMT) Received: by mail-vk1-f199.google.com with SMTP id 71dfb90a1353d-5756024c77eso11418397e0c.2 for ; Wed, 20 May 2026 07:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288704; x=1779893504; 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=SHppxJbIcnxAbn5e5BxkZY1HBroOaNwMncF5FMMJzNI=; b=BkCMqTIqwrloK36vhH0VZP4pBXo/nmcMaO3pn3PNZRVV0f3VGsmGWeSs3sCci32vhJ 7x23xfyBfCXkvWd64s/BqeYZLXkyDeHcuwFB/h0MlfghI2jJBHucTd8e+1/OM8HWPQUB IsFQV6Yud2TgGjH7d7e5HmjctX8MbKWQ95t45ojmylqRpevi/yLTPhwo4ZEUZ6mp5g9c xLs6IachX+m33X4VMbGcraCS/LFqXOjjy2nm36BHkaqh4harHfGR3MQOPTdZY6AfyQyY UwhHMwtPI4b2+dzUCMjYXVRAu9IatYgzMqZaZYgCOPlT4E2UcyZtNzzB3dKXnnMOrPyr zyEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288704; x=1779893504; 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=SHppxJbIcnxAbn5e5BxkZY1HBroOaNwMncF5FMMJzNI=; b=rjR7Z1jSNKHRPJ1B/Uy0bYNAwsXTIX87rwmSNCywWsyG/Ibm8zzI3tDkzZiIitqTKN 0ICTeF/tIwo1Y0gzbUoZBUFDXm386hVUxkxD90gxN3RgTM0VhT/vYSKgEKKw22d2SUTt 1zY27iakfV4CTmP9qPTIupShbAynHqidcFbbX/5nplAX65sJsIhaJsD+CutOAkwUqZmW GsDtAt5ViBlkvIm0Srhv5aB4R9BnxA+9DVXN8CmnzWAXRAap6MrfVTcd3k2ks2gtGrgt akcp3fFUREygR0cyifiJ9pp0sggmQqwp/dxK/CjuQIgGyGMlPAmRyttfRCqLzTHBDbV/ vYEg== X-Forwarded-Encrypted: i=1; AFNElJ8PLq5UM0exCrCfQONnYKZS3YCjI/oci2otvzkMJ3PXUKFId9HDzakhTcuwKn6WeBlAJwkTOgtqZJ5ZRxg=@vger.kernel.org X-Gm-Message-State: AOJu0YwrSHs2DCogM0+w+mT1Cp2id4S1Mv4o6FoFIdkv238Ibau+L/Kk kRC+mEa/LUs0S+enlabOim7boD4wcmDvS55mKR6kqTLEl0r5I0SrEdA/WbPk9Ncc6GXhGe6nhAN Qlu6dk+3ctcDRfuZTxC9LH9rOxULWPMAYWfzncjNIAZuyzRXbIEJ0A/zJIGiy+FQ+KGI= X-Gm-Gg: Acq92OGVlVMPBwNCj3aHWSIKLIjNaAoI8kQ6XQWieF/vmOQhwHHKfMZ7Qkb4V7GhdXY H2fKGpvIMSDMi4LuC2vnYA5o38elIa8Cg09NJofu11CXvHCipHnGbTCQfgR+6CnDUfa/3qxezBw xdKYoW7cmBQQcfHsyx98xKrPapaJDyGCTC5BQF4EMZtdmVuSLC+a8duOAnDvoyNj2hP0m7kSODU 0DU0lcLFOawCAFushcXplaxf/syi31BYhegnNYPXxhACC9tnutLaVmIkiiWtomRPee9x0aLBS5s owkZkUsppClAassfIRvhgeU/xksCkPQ0D5Vup2QCjTc1sswDdwbBzFi7ou086j1qYgeAwWYxSbq yDz3zPSuUNWm8uOIlqDi1qQuhHgO9McaqpXuTeufXG+Qh3JhGbdi+20sXAx6+i2jKX9fs+s4FAx eYoNEVrNUsKLwlsio51Q7ZAtr9rHBtbNNizdbBkIavOKDG+w== X-Received: by 2002:a05:6122:3b87:b0:56d:9f2a:d6b1 with SMTP id 71dfb90a1353d-5760c094366mr14488501e0c.12.1779288703745; Wed, 20 May 2026 07:51:43 -0700 (PDT) X-Received: by 2002:a05:6122:3b87:b0:56d:9f2a:d6b1 with SMTP id 71dfb90a1353d-5760c094366mr14488131e0c.12.1779288700206; Wed, 20 May 2026 07:51:40 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:39 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:17 +0300 Subject: [PATCH v5 10/28] drm/msm/mdss: use new helper to set macrotile_mode 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: <20260520-ubwc-rework-v5-10-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1276; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=gBDFjN7fs9zNZK1OT0Rge6uEp5iYTQNKw6PU4vljOxU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpn5CalDZqbTqL/Jq1BQ4go8L+gmdNsxQigR qilEu7iUXqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZwAKCRCLPIo+Aiko 1S9RB/0UDuf0TK/Oq67GOhJEtwUfg6VhDxZ01giJdv3bCzs/5SdM0iUFUw5fYTVEIlaZgTk/ESO cCUT+jc/4d6rmWvD1+NTnVR10NrN9QxH8NFFjV14yP+I+s8Rpn9TlFr7Hevv/iKPGAciNqLduhH T/lAcw+wJi1HwTPm8k0XLEyEpNIYA/PfoNtqii4t2VtPF0kE9j3Fuocdndx5W+P6SA97FFC0WRS 33D1kw27PsKDJrXyf8bK4RnVcUieLsScjrPPUtghYTIkww38p1WQTOJ9G/AR0/vonPil69JEctR abKoE/8hQnyMa1wB5qqhXeHXHcrLb4nSul2DLuiKqylYcCXZ X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: YeiflNUt1EyA1t_h3W6dTZ4Gyd0cXkJR X-Authority-Analysis: v=2.4 cv=e5k2j6p/ c=1 sm=1 tr=0 ts=6a0dca80 cx=c_pps a=+D9SDfe9YZWTjADjLiQY5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=ujCctoy6CNRHcyqwK_8A:9 a=QEXdDO2ut3YA:10 a=vmgOmaN-Xu0dpDh8OwbV:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX0rbW/GQ90FP7 cnloXis80d39fNFjmABobys1R4XrJmqn4eEZbqgv+Fq8EBEULiGv0ofRh+2IdAbnssI2qTc7XcG jCFx3SBfqxuDEIGlnW4OVlCPQHwx3DrgdGDO+LG/asnOmmxXodDsIB6CDE7zQq17yeD9noQhg+U 4WBhk1JX2AUDNEkkYAJ1XXXH14qQOsaqmGuFddsawdb93YUKWNo0gu3A4D2JoO2i2m27mU6yugt Be7p/g6iyElaFm6laZKaY6DCXLXSZrHvHD1Ju1OOFNYGZoJJTG0PzAM5A09w7lvqV3xEoZVR+5k nBdlGcmANfgYFTJmgFQY7KX7ranqdknCXKLmXXkCqYuIPnmyfp63IG2X4bvYYsRQB8bS6plQInv 42KXxlJ7FwCyIZ4Y9SiLz+/wg9iMLid0TPxELzcRsRTyq3iM5mirHMHAZOh48qo843a9CzT/hNG 03GSyEzjtpNhEab1P5A== X-Proofpoint-GUID: YeiflNUt1EyA1t_h3W6dTZ4Gyd0cXkJR 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use freshly defined helper instead of using the raw value from the database. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 9f2b366d45fc..2742d4bb2a4d 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -183,7 +183,7 @@ static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm= _mdss) u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); =20 - if (data->macrotile_mode) + if (qcom_ubwc_macrotile_mode(data)) value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 if (data->ubwc_enc_version =3D=3D UBWC_3_0) @@ -204,7 +204,7 @@ static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm= _mdss) if (data->ubwc_bank_spread) value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; =20 - if (data->macrotile_mode) + if (qcom_ubwc_macrotile_mode(data)) value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(qcom_ubwc_min_acc_length_64b= (data)); --=20 2.47.3 From nobody Sun May 24 23:31:55 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 0A16B3E9F71 for ; Wed, 20 May 2026 14:51:43 +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=1779288705; cv=none; b=RAPE+Trki6r6zn0eotlWPI7o/FwpTy49am8LIvK6CszxtLc6004aEFNeYiVVFAV0qZcQj2LbTqoDWNYCu44uXTbz2hjAfOGJRsJ+5DQkg+OqKaJtNaqUNVFz5NZ29jCKl+pA7VrUfj2GBT3joTncCBNT4gqjBx7fCu1poWkLwnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288705; c=relaxed/simple; bh=05LhYAKGVaBgZaN0qt9lOXQChuEy0ARdc0e/ucvP2Qw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IrhCoGzFis9gSfh3kYzRQ0FvbnAQ41eU2e8eMe9IMdom1A5irM+i32X23HMtsq57o2Q48F9rWeSLnjyehazkPqsifI3w7GIjw3stCE0nKzTNmiiaaIqi+s/KJEfVINgOjiEjyi3CPe1nClWVajRYwBuWAGX8WJzF1E+9l7ACEVA= 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=Q0xmi/Nb; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ed/Vq2HO; 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="Q0xmi/Nb"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ed/Vq2HO" 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 64KDPxok1725756 for ; Wed, 20 May 2026 14:51:43 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= oiUTlYZdmXRE6wHZobRlLY7t2S1s4URFF4b8EHPtYQc=; b=Q0xmi/NbitxmcvIr sw28MKVhUys3bEosnqDqsthvWfKzFVBJjHXz2CZbkGHjPewjfw/spQ40hv+ovtio wN8an6OWenbw716nkkjpoTLKOLqI1XxdCgGOUKCtFRsZQsPiBeTab5PDF2+Uvp6l 0jXIYQE+6NGD7ACiiqC0kX0QRaCADJZMvdya4I0mnBP5ss2QQ+UGKQib+WftNSU5 mLJS7sgy4ZQb0BE8R7S9t43b/xNoawgMCH/po/di5/n6DBPuUW2sxPTeya++OGRQ 9c5VFClwrT3KMJvRi1838bBxxuVAwOjtXR80P8F7WjHJLn9y9MHb/WBtWDJpOtZJ 6iOCCQ== Received: from mail-ua1-f72.google.com (mail-ua1-f72.google.com [209.85.222.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e8t3qn8vq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:43 +0000 (GMT) Received: by mail-ua1-f72.google.com with SMTP id a1e0cc1a2514c-95fc647f356so8149555241.3 for ; Wed, 20 May 2026 07:51:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288702; x=1779893502; 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=oiUTlYZdmXRE6wHZobRlLY7t2S1s4URFF4b8EHPtYQc=; b=ed/Vq2HOp5bO/g0Vqui2XEhDCfx4cQ1D45y48D+i4rvqXqGyAxwZDFZGo41hOWhGHc PAik00r66bcVc0wrZaQK/q1MHJAHxE/PBo+DsXWpBjOmB4PgrNyOMQj02QvJsiSUWsKw C46S0VQsFlrxB+WJUtPbAIG3TB1HC91HFhyn+NRzOx3dY/93OzSb/nanO0ruPQFP+Fst /nq15wTm1X8y4qrzxKkqNfOtsjV04GqcMzLOj0M1pejFEflLoXC68mO6W2Pmbt+i9jpl XoZkD7b9/0h0zrxrMFrKuL1hWIEUfFWNUuvqoDF2yg0rBrmvMVX9ZCgc+ljXfT1fWBn+ 7oKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288702; x=1779893502; 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=oiUTlYZdmXRE6wHZobRlLY7t2S1s4URFF4b8EHPtYQc=; b=H5hJJYYvdGPUmRXrvrIhigyYMF4jIyrlhddqkP8ltCMgGOESYqkfwAf6sZ94QH9LV3 GElx0XhsGyUfEfLS2Caah/TeeHDQcaElRDL4Pk79Q/IsU39Tbtl/9wg9C7IKdvMCcRiM KfiIChndDrwXcowyy5BsaO6u0ijWG7i4E0EejCQXovBUbSnsY1ee34jKVN1DBFl6FKBg OQDEOUQYyMd18iW36Gqo/aOOmN+f3re15F/1d0kNkuUSUCCxD2yBnDU+l33sM9K6YkbK 2rDYZyX4vY55fwyOqf68j048Jdo8Z38OmLUuilCobkaz0IAM4tblF6P+8K4xvL7HdS7A 6IjA== X-Forwarded-Encrypted: i=1; AFNElJ/F8NanP44r0spt3D8wqRrUs5d/l3itg4gJhKv2b45M8VS03mosREIPGKX4xYQGXWinahzhDITlJco2/ns=@vger.kernel.org X-Gm-Message-State: AOJu0YwAQP283+HeFc4+XejvQi4SeAqqDDdzmlMSq1FIXAKpqTvVXmZf dd2+abPoaq7b2HvWIhJML6zXKBC1zfZmWioALh4HEXmX16Syu4Uqmmx8F4W4YNMmJpGww0Ke7X8 96qFCWBZXii0T/7pGRJM5pQumusPEMZe5hlyxgjRg4MiZb0iW1q2lm29CIpdLHiNgFeo= X-Gm-Gg: Acq92OFV1RaK90EQQtiUv7Ys6mP4CAkmu5p2HRpwodvTCR2glUeI/rUqJQBM07br3Rq Ecb0F2o9Dg/jXq9V+h+mU900S+1vkXybjR1X/eqMxVBWdxK3rzj0ml/SFy3GQq6fCKCQ/3+esOP POeDRcpuaspA6jefwis3iIzaCYJpthUuv51L+DvGlsa+7eBfhRkLP03cmUGQPpsZXyzjVmRihqW sfq0pTJczvytVrpShxFM2W//v5gdfSjDLh19cSGSfURmLSxUxnkRQ5P3zik3gCcbWez4wjgH9lu TKRHrjBScPZEL7vDL7nnCOUwMt+GXY9PMKoRxn7S6nwknCIwIIOg2WGqPB3Uz5vReBV4Lqaahm4 NG4F1qUdkUU44LDP6GgqvEbGFR9C9VVdYRvUDUdFMQRfjO+gAIaQIrmWZ6iqJWjlfyGNi3UoQ2d aUGcpoQKZuJyUNtyIlIQfVSN6vmS+urt7hT5Y= X-Received: by 2002:a05:6102:358e:b0:605:5d09:8631 with SMTP id ada2fe7eead31-63a3fc98de6mr13087506137.29.1779288702157; Wed, 20 May 2026 07:51:42 -0700 (PDT) X-Received: by 2002:a05:6102:358e:b0:605:5d09:8631 with SMTP id ada2fe7eead31-63a3fc98de6mr13087481137.29.1779288701632; Wed, 20 May 2026 07:51:41 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:40 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:18 +0300 Subject: [PATCH v5 11/28] drm/msm/mdss: use new helper to set UBWC bank spreading 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: <20260520-ubwc-rework-v5-11-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=853; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=05LhYAKGVaBgZaN0qt9lOXQChuEy0ARdc0e/ucvP2Qw=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQxbvqfSTCpfebak57jC9nSVwT4AL/ymz8IhVb7WtIvnLE 6skXz7sZDRmYWDkYpAVU2TxKWiZGrMpOezDjqn1MINYmUCmMHBxCsBEbrRzMMzoFH/Afbu1VdBg 1prG6pJJMh+MT/belZig94LB0v4Bp9bX42xvOb7c1bRNif5zTTaK4VzLtMufdv+ctCXmxWTzI78 Cv83W+jvF0VXd3kdR6dCWV/GBQlvk1BTvrJRhnRLMKPJ/zQ3Z+hbGF4bv9S9fepqrI7Er7QF77v zbRfZ562cdm/rOqNcx2fBu/uzrWgp+/9zMeyrfKC9kNn91klVldd4c3o/OngWaZusf3Wm5WHRje Y+nxTWP476Z6jZZyhr613UOVafVyx85y/J2XXhJkw7fQtm8hSZhf09sN3zfvdfhREr9zwXlTQxr jymocqwvcbXtLcopuL2IVUW1p7SX88hWzuhZcX9zrXX1AQ== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX5d8I21Qk2pi3 BfjL90Y4UDQizdXJJ+POa7/6e49zHc3F6Qy5UpWyGTxcuf1dFl31eh3iPrpA6qpNeqzsWPDRChZ PbOPc4QNMmKrTDVL2OIDygnoGUEJCr44rjHhShkousmwVWjfEMU9FmquhKImRazcWzMEbEtEANh 366lVyuwQNTigCsfb8ZPWve3AJhUUtogO+5kzwEEAfmbSj8QhKlCRGq7GiaKZMBp3gEYgsmb5Tl 6+4TygdTxB02S+j/Mod3OaEdmKjxQe+vgRVQSTaN95jVC15EqjSg+Qi3N5zJTsRV1DI2+wP0//D tvEusY8vf15YP37ktFOVKJy7wwvi48S4LlOeYTJ5WzhWzR8V4FLtFQIG+evrtn85NmLbi3ZAUrh X/cRF/vZePjQO3ncyqxikLXxS3WlCohaP4Xy9X1VIv322ADj74dSZeuPAo1NgFROnjpOZPtxINw nqor/ZK+o4qF7QQLN4A== X-Authority-Analysis: v=2.4 cv=N9cZ0W9B c=1 sm=1 tr=0 ts=6a0dca7f cx=c_pps a=ULNsgckmlI/WJG3HAyAuOQ==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=vkIeKiNhsAXvYQN2DwYA:9 a=QEXdDO2ut3YA:10 a=1WsBpfsz9X-RYQiigVTh:22 X-Proofpoint-GUID: SAdit8Bgt-JJZgmFT9XybjL5y2drCi7a X-Proofpoint-ORIG-GUID: SAdit8Bgt-JJZgmFT9XybjL5y2drCi7a 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use freshly defined helper instead of hardcoding the checks in the driver. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 2742d4bb2a4d..bf106d849dea 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -201,7 +201,7 @@ static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm= _mdss) MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); u32 prediction_mode; =20 - if (data->ubwc_bank_spread) + if (qcom_ubwc_bank_spread(data)) value |=3D MDSS_UBWC_STATIC_UBWC_BANK_SPREAD; =20 if (qcom_ubwc_macrotile_mode(data)) --=20 2.47.3 From nobody Sun May 24 23:31:55 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 7FE613F2101 for ; Wed, 20 May 2026 14:51:45 +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=1779288707; cv=none; b=bRctNaw7miXWTEtexw04Cvz878LT69KkxErfAPBRshiTwbAjVH2vDCNDHYz/PHYGFC8xLZ2mSiF1RDLBo7P0gPR8XP9PIy8igEsjKIH0cAfEqih5w/RDTsFxn+20vQzn9R/kOzOXdm3EXwMXWvS3nxdNHpf4QDjerE8W7p2dLTg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288707; c=relaxed/simple; bh=Rq86OqLICFZTHwXLSbQJz1dBgV2pgL+p7E6Jilm9kng=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=evxkyIwosdmpcCHsS/hochkTfJD/DwV/GqUIMnnynHxNx5dpNTx3k5p9gMwJM41jEh4FR9uZLFMBrw9gSqGwWIe25LTPhZZPlkJL19Oq0TZxe8VH04LJmHS4jc/c3GIFTXIdZDcUtYkRxITNkRd17nVsVIqPXduxKLOGILxgGzk= 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=kLrJKZoP; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=K7ywn9mo; 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="kLrJKZoP"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="K7ywn9mo" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KDXgDF1798325 for ; Wed, 20 May 2026 14:51:45 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= NK2U86iVUwe0wxQ0Q8Wy0PvlrVHdH7DQTfK16+7BeiA=; b=kLrJKZoPEpkYiTcx 1+5v7y9f+Yf8W0fgkJU/hROnIS+LLs1nUbVRhZriEWc1jl337owfxxV1PgyCSi8v zNX+AU9/QZYhCY/NVrkYsIt1q6iNrthVku7IEMX4jGCF5kObcEFrCPvP2pZk7+gk j0fbIxxiqGI57QKhVYB0oQXEBqoWX5X0w00OkYVDpqTXML0+b34+R3F3qSIkC+W/ kEeoH913ritLWWlmvJteRM1XxA4W9uXpeo2Tr6hqYv7Dr/cMEm5OKIbwD70W2hjo p3R6Y0yMwWemIvimoMK0n4QXxV093vPLnbOcetj6uxQ4+WRoZS0SHh6suDBhsPd0 zL+6EA== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9dxu0a18-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:44 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-6343bea7909so1924211137.0 for ; Wed, 20 May 2026 07:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288704; x=1779893504; 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=NK2U86iVUwe0wxQ0Q8Wy0PvlrVHdH7DQTfK16+7BeiA=; b=K7ywn9mo6hK5QxubjV/bW3wwfebkgkG6a24UZ1+nXhz2FYxmazJJAb/1IArma7MnrH 8yEUg7PaxgSBHVcAKnQe+0+YNLT8ovcZ3yO0cjJrkNSwQx4YefslA3atyuKCxGNzyG0B +p1+bChtFeFTSY7zeF4JVFVcxwhXsWf9NO+JSG8gBcLC7YBAao/HApTWa6E9FaAqFyOK AdG/NgwaV9rEC6cFaWYxhz3yZoI3LDrg0GPwq7WOA2mIHhAKGSCGksJaJzPrhqdakPHl FvyIZJU1hzOa7a0V8f81Ihiz4BKJ+2gRAvygIhLT3zZ7IFNK11p5ZcqDCYDPa4x90o4+ zB+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288704; x=1779893504; 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=NK2U86iVUwe0wxQ0Q8Wy0PvlrVHdH7DQTfK16+7BeiA=; b=HKYVdlfDKU8WLsREwdGwJi4frgI2WNd9bWbWu1LE8l/Suv2ZuGI0sF2YXkVDuVatkH d28IHjAAFl52iiHVBb5TtRpN/NqrW2SyV/29OyEdjgwdZiVmJHNzEZnUNNiy9m8JXP3w t92JjAs2ARFp8WTVDhz10zPxhEWQoIPmov92T78bWsw5NQIzrZPt6uC8d5DhowXzhmP4 t+Jyv9YAjTKmZiAg3mYML0frSGcy7E+6NvS+4M4pwgwRaghAN/BBdycftHwM5l1Zo12l SnCqy7CIwfpPOAme6GMMZxhewpGoT6XYpSOAVP0ozXOFCngqEfwBVD54mwkRcICFq/Dz AcjQ== X-Forwarded-Encrypted: i=1; AFNElJ/koZJD3Uw/UWRMUCSDaO1Ems0C3IYRG+Kh2xqw8bqTLOs6L924m0w2VP7GuSw3qiEvZp3OmEITW6h8BW4=@vger.kernel.org X-Gm-Message-State: AOJu0YwylymKkOdOVl4T2pFOf2AufX9BguICMGyzlBPZikNJieEugEiT WHRqX3FLY9H7fq7vjGFouiTJmoak5STW4qmGu36WrJtEWbC1SmESzXgfcX+xXx448qAJOOWjscC oH4oy7asSloGHmOn0ac058iDKg77yALphsQHETQoOdBxDhVrlO6tor+dSfVDcGWmobr0= X-Gm-Gg: Acq92OHzkmxj2qgFu+QKGrJ7E1lHyUGhefdrCSWOiRi5I4Bg3qXBhqbVraSLD0L4pbC Grcx2BECxceglV5yXjtKutqW1nDTH4POBZLJeFyccNbWlFy+4Ly4vymgHGn6ol4QN2MUQZLL1s/ 2WDMyy7P2o3eTpWkNo03pCumV/oMphWiiwKO+rW5fFIR3Q7tZMWVwA+LsL+herhbJvBtV3tjjWp bhCk6quA6+mJLK+KtHeguXGRGBOuflceJBIZRS29x6HgXvz47SxScrkHjfNBPFCOE8+pOnMQ1D+ qoidcBk/0N7RBfDHvQiaHqzgP2rbNdC4+KceuB39VQ7EapLuZRk8vFh5ZWBq+2+f/srm5d8i+KE AOEo0/UFYDj1OL3ZBxzFpHztrEvosjAfifgCDJsKzXfkoVwDqOqt6L4B4Ys5Ovacjt11k1oNbjW VvO+evwiYqeycEzIjiJUVnsvwtk/i1SOxq+Bw= X-Received: by 2002:a67:e70a:0:b0:611:e0c2:1604 with SMTP id ada2fe7eead31-63a3ee862bemr12371175137.19.1779288703571; Wed, 20 May 2026 07:51:43 -0700 (PDT) X-Received: by 2002:a67:e70a:0:b0:611:e0c2:1604 with SMTP id ada2fe7eead31-63a3ee862bemr12371144137.19.1779288703085; Wed, 20 May 2026 07:51:43 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:42 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:19 +0300 Subject: [PATCH v5 12/28] drm/msm/adreno: use new helper to set ubwc_swizzle 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: <20260520-ubwc-rework-v5-12-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2770; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Rq86OqLICFZTHwXLSbQJz1dBgV2pgL+p7E6Jilm9kng=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpnUEAvxY7G7aZM/d5Hma4ALMMOdIYBP2Rtt UZb8lqJ5vCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KZwAKCRCLPIo+Aiko 1c1ZB/9jYl+4DtBU2lqbMe4XPOpNhy4phU2TyumZVEgSRaYdONjSU2MIbn2lYPs+Czy7fPe/f3M 9Bx5cCVxRLGNWHYMKjYFYiMHdSLXogh+ooVcRhZd+PPL3boBKTzOKEI5lYj7k/h7RTJD+TIf7kR x/0YPS2PZaL0w9omGNZjnXISUOAscZTb/6DRgkpob4au0PM0aqs3AGv8QwgJGqF2bVNMc/IT/kh 0/b+6BUciHQY+DoXO3UjfLo4riTgFj72tDbXptsmuX4QKfMcnvk6bK+3XnvefsWCu0dj6AXgfXa H8Mq6WEFw6fZyZlp2OeJ75JjRRsYpEgL/rPlOLzz5qZK1n9m X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX8ecfpwyg2oLp N5CF+kNNNewSOhJFaGCPzvpf95iicG7iY3+6fJ5mlLw6EV0ZUJNKDwzfZoOs/UFuXWGTDcPTF3E rFB2bSQ363V5ONlDfxmf1Ej+V5YOE9EC8SbgrbqJQwMjMPeeU70dzGaCsVfyRGJndMyC6N7N1XT QJrEqMtnxNCuixIeNk1IV1oHDiBKsFQi8oMJOErOksUj2Yb4n4I0pjS4YhNPYRVmxILtbcHhIi8 F9aq5NHHsYf+lbj4H54Qt7Nku9reLh8j15U4qp1/4wjpP2Wb2nmVgAcKIv11iBpnMqAwJT8ks0g oM+S2T8aBkVwQ9pGn92RuLPzTX4tEIDE+nQynIf4zSM13Y0W5FqziWRdMvwm3pewBO8khRmUzT5 ktqrPuNJoiIjx5qWvsB5QZ/oiVZ2DEu/ukP0osy+wb/9Pk49At/RSq7xUWDZMZzYt7413p/urIa 6GMbrYalAy58MXJ2FDA== X-Authority-Analysis: v=2.4 cv=Zckt8MVA c=1 sm=1 tr=0 ts=6a0dca80 cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=cZwUhCRcRhp0DfqHmjgA:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f:22 X-Proofpoint-GUID: hEJ-ZPOTJQ_8WTtyqFy7R7UcHwlJ2jcw X-Proofpoint-ORIG-GUID: hEJ-ZPOTJQ_8WTtyqFy7R7UcHwlJ2jcw 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 phishscore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use freshly defined helper instead of using the raw value from the database. Reviewed-by: Konrad Dybcio Reviewed-by: Akhil P Oommen Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 4 ++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 43818d1907ab..e7a0d315e022 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -745,7 +745,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) BUG_ON(cfg->highest_bank_bit < 13); u32 hbb =3D cfg->highest_bank_bit - 13; bool rgb565_predicator =3D cfg->ubwc_enc_version >=3D UBWC_4_0; - u32 level2_swizzling_dis =3D !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LV= L2); + u32 level2_swizzling_dis =3D !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENAB= LE_LVL2); bool ubwc_mode =3D qcom_ubwc_get_ubwc_mode(cfg); bool amsbc =3D cfg->ubwc_enc_version >=3D UBWC_3_0; bool min_acc_len_64b; diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index 1923f904d37d..53def136e0fc 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -275,8 +275,8 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) { struct adreno_gpu *adreno_gpu =3D to_adreno_gpu(gpu); const struct qcom_ubwc_cfg_data *cfg =3D adreno_gpu->ubwc_config; - u32 level2_swizzling_dis =3D !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LV= L2); - u32 level3_swizzling_dis =3D !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LV= L3); + u32 level2_swizzling_dis =3D !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENAB= LE_LVL2); + u32 level3_swizzling_dis =3D !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENAB= LE_LVL3); bool rgba8888_lossless =3D false, fp16compoptdis =3D false; bool yuvnotcomptofc =3D false, min_acc_len_64b =3D false; bool rgb565_predicator =3D false, amsbc =3D false; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/= adreno/adreno_gpu.c index 78d7ac3fd8c7..6a0877e5374c 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -434,7 +434,7 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_co= ntext *ctx, case MSM_PARAM_UBWC_SWIZZLE: if (!adreno_gpu->ubwc_config) return UERR(ENOENT, drm, "no UBWC on this platform"); - *value =3D adreno_gpu->ubwc_config->ubwc_swizzle; + *value =3D qcom_ubwc_swizzle(adreno_gpu->ubwc_config); return 0; case MSM_PARAM_MACROTILE_MODE: if (!adreno_gpu->ubwc_config) --=20 2.47.3 From nobody Sun May 24 23:31:55 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 D5E4B3F39DE for ; Wed, 20 May 2026 14:51:47 +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=1779288709; cv=none; b=pabQNFPqOFnt9D4wZJx+7rwQGXYMSHM0H7P3MjjIS1VuumRa5tXCWAp2YlTycGYiL7YrQ0Nu6CR4poI2OWd1wljR5Sa7gxDTmXT952+4pViQG/6qyzGvJd03yFP48AKRBVYGwbFvUO63cZSVDOUWFJxj/49jye1krKZh8XcF6PE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288709; c=relaxed/simple; bh=BQXxAsNkcgoIebP1VAZBuBHx3qvfk0HLeeYsTxoyeyM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pyVINgdMWmmiossWEGyMpLK/tnQZFjUEMyOWDTxpfDprkWImztkDuATQPXzUg61kRvoQIGDpmrM/Tv1fSFXQwPiMPmPGsFrIkewQa8Duj0MHtHcUHn89Ke4UJCSUMP6fXsJ1vEJM0MJqQeaM8sAKOGK/3p8UjepZIFifdhhbAIw= 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=pXmUISEd; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=VoxJrMEG; 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="pXmUISEd"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="VoxJrMEG" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KE6dpg119201 for ; Wed, 20 May 2026 14:51: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= wJB79bVUZrsbxSexjswx340+SsqpUDunWLmQTkIAkcU=; b=pXmUISEdXO3OhvLw Y5hMss7UgyhFvve4cwXHa4F2jlhBJfB+3LqRC82Jlqi0+loEHGPGqvFPjExMhKqk 1UAjIEVm0aPwgqFNlbVUBu9yTa7Nwnq5jptpK6Ba69hvwcp0p8ELnL6UZZ75IZrT M5ayS9l7KHEnmyE6sMaxXkO9XxK6uHO7E35U3TQGAGoKsF78GdkiZOJjVzDQQ1Gf jkoZotsTXjbsdCsS4IjG57Hmioogq9BPFUzAyUkUHsL0UarEaDS00DnBlzk8RQXG i/TZ4opJ/BBt0AkkwdntUcJKEGdvwrT4HVRxz94EusMwlGTp1UYFmmsku+7xiElm 0q5N4Q== Received: from mail-vk1-f200.google.com (mail-vk1-f200.google.com [209.85.221.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ee886fj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:47 +0000 (GMT) Received: by mail-vk1-f200.google.com with SMTP id 71dfb90a1353d-57525c1ed46so3941863e0c.2 for ; Wed, 20 May 2026 07:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288706; x=1779893506; 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=wJB79bVUZrsbxSexjswx340+SsqpUDunWLmQTkIAkcU=; b=VoxJrMEGFWbmLfdzFLKhHeagwJv0+Mudr/XZq5BnuS8NksRhLgHMI8U6YHxN8WE+4H Ep4nC5ExoHWwnTnIuxCt41J8FDnAKabsUOF1ACkSZAZ2eptPQ9li+A3LIAJjhPOjw/og Ya1nvY2nfN5p2+0FyCbDKSrey281/nazRk/kdaBSv+2bb+i6dTR4LJh1gAQmq0Z8ll8C 6qz/ljSc5RlyA6pHIWfFLAEMRS9HLWaMzbe57c9f0kGU239LEYG1tWLYPaCKUYsRZ860 M4+izXAJrvkXsLhtSWxHMzqZ6tsUrGu0v3HrO2Jxho9iLwMO0VYK/GAOlPAgsgWXl4Qf SKpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288706; x=1779893506; 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=wJB79bVUZrsbxSexjswx340+SsqpUDunWLmQTkIAkcU=; b=hD1rL9F7WV5cL3v0/mdxmZ6kPtnQqouELZYA8YS3Gzb+ESiWXDKhuIzpK+6OmU9fZx pBDIWZ9TjFcVv6JubhpXTuG7yKTQpssnIkMQ64ob25+nq7rzHhjAqMAs5vf7Q2WLIeUa DUB7l0ByMhgwRQdLI1zhGHooBl56byr9pKWsQnEATZEKvch+TdQjR0m2cKNpTeJhbTaZ SvUbmQVIaibowoqGC0qiwJL9PLgGI095RStnQowGjW942iWmI5LesVswAD/AC38KtAt8 gPyazr+PRyq3K+zfuCgBawUBvVqD9xyMwQYaAQVcqDhHpKqh7UWrsxgqEm+WNocnHQFQ z2Ag== X-Forwarded-Encrypted: i=1; AFNElJ97is98LngBdjyLMdTAPhaUIVwO/9s2mjoaOeaNKGSjOU0eUvV13tR1k8RXVFMVS+byKzSxT9yODG7PeEQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yzmy2UTGbC8arhyk7lxdc9zj+zsJAtKKL75Mt7g8fJCLHOP42MK c1yDEYGgRGFOb6RWaQiXJwi4YyTaIuzxZUhFLN+1l7xyUbJvf5Akl7MyWkzYlC2AYyUcQPQ7zJ1 xYKz8A+n2QHiEV1J2ZhOxpwGUcjpTh4dFh4+cb+0lycVw2UhS2GNCxbBwKb4kWK2cSGQ= X-Gm-Gg: Acq92OGoyTmaQwPfdPhKfTlcruj9cA/3eNIzmTrhDnYIb5KpK7ltPj8XIvdhirk5ko7 InlPO4rPkCxTCuIPHHYnsOUMQEt0kUOujBW7oqlzvhbzhyKeqx6yIB3D4DtMB+xvd9+VTNbVnga 2x+a4qPSfUyYEsuzqsRtg1PiNdjre+yQrZgevLExmWaAbLzmlIlcv7fpe+NpXj8lkv1ywi3vwjf 6TJi5ntskN3EMTbKv2nP4HQEYB1YnDvOPlbduNUbZ/uapgEnjlwMC+BdC7x5T+TFLk+wBVdsEiY rYHscySio+lne6Uu1JjKm69CFsy0WxM1k9VYY8tobidkDRnvgHiIftugzobYJhHgBgpL3enVKY7 HJN+QEAxjzi8NeadFhoPmd33GhDaGVL97Sp5UNi5wrcPpq5xYLYPqwdgzAc154HKqeJddsZDoB7 YjycRa9jCk1ES/IeQt2ump2VGcXk3/UQnBzk2sI92adeMlIw== X-Received: by 2002:a05:6122:887:b0:56f:1c32:bd07 with SMTP id 71dfb90a1353d-5760be3bf61mr15069073e0c.2.1779288706007; Wed, 20 May 2026 07:51:46 -0700 (PDT) X-Received: by 2002:a05:6122:887:b0:56f:1c32:bd07 with SMTP id 71dfb90a1353d-5760be3bf61mr15068786e0c.2.1779288704472; Wed, 20 May 2026 07:51:44 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:43 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:20 +0300 Subject: [PATCH v5 13/28] drm/msm/dpu: use new helper to set ubwc_swizzle 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: <20260520-ubwc-rework-v5-13-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1592; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=BQXxAsNkcgoIebP1VAZBuBHx3qvfk0HLeeYsTxoyeyM=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQxbvqfQKmaPnD4tcPvQi/baX73UhO9vQWK+86Wc7b6lcC b39c+u6TkZjFgZGLgZZMUUWn4KWqTGbksM+7JhaDzOIlQlkCgMXpwBMpPwL+//62KwDRyZ7MDC9 elu1cm20Y9Ck9SXx1xaZOd5WX7686XvmN+cG5a811sEqLR5b7FUKXjee4Jactidcj+9oREy7+Y6 voX/UHGpkVUSnqW6MVkpY2/hG1WiRGaOKusUE2f76zby8cjdC/vrxqDJquHOo74q6UWw0R+tIjG X/k3WM5t32mYfMsqR0Qq+eULBMeGl6zdVUmON5/hILVt0PM8/avYho91QJyVmz+oVLf8zfLas/P +sX898ueuzWF1m5BZp169J7L0185zDlzYE/C16vi5ujMeP0JyfeuC9+AnonLgk8W9cc5LNjR4+Q yKLGpXvybzGcqZ9cUyvuldHNtOBaSZluQMYKxu7c2tdlAA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: x8XIkf81jPpSZ8GdxT7hZOON31XajQza X-Authority-Analysis: v=2.4 cv=e5k2j6p/ c=1 sm=1 tr=0 ts=6a0dca83 cx=c_pps a=wuOIiItHwq1biOnFUQQHKA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=46QewcZEoJiMQYndSOUA:9 a=QEXdDO2ut3YA:10 a=XD7yVLdPMpWraOa8Un9W:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX0BY6eYkMwzk8 Z4bXKfYphSuzk9mC0xhzFuKRMbR/m/korBq3sn+dflDT7casv//7p/8lYx0m8r2xaD7H39rO/Zq lFEchcFLoIme/6Dg2l3A+fptFwvMgkukWqOTMk2XB3oxriY0NObqAO0PZirLHXeqxBvXIhmi5OT r/hlVs2i8WAxOoBMkyra6wxkEgmgPL2/wXEGlxJaD4bDs3fWm/DiFgooPvqjTI0DRGE5DXGaJ1t oTllZDUaTlcp69CRbkDA/0eLAPaxboWBRFIWQRsWOAb32BUdtaMQmSCqXQBYbyrVwxa9jZ9/eod 6vzgGwlAwfWStxPXWl7MRftLcjYTeHm0MUrGOqokZIj+VFBpkG+UxnXOhPw/sqYZyUQO+uEZ89S vj4ZOJm182G3IzBWv9yXEKeuu6LEvii6iuP+xOXtmrVCESPd+305FKF1xxRkLP8B9MveICkvzjS 3Wyzrh/IPwlI/ZOnquA== X-Proofpoint-GUID: x8XIkf81jPpSZ8GdxT7hZOON31XajQza 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use freshly defined helper instead of using the raw value from the database. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 d3da70009234..6089a58074ac 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -318,13 +318,14 @@ void dpu_hw_setup_format_impl(struct dpu_sw_pipe *pip= e, const struct msm_format =20 if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_1_0) { fast_clear =3D fmt->alpha_enable ? BIT(31) : 0; - ctrl_val =3D fast_clear | (ctx->ubwc->ubwc_swizzle & 0x1) | + ctrl_val =3D fast_clear | + (qcom_ubwc_swizzle(ctx->ubwc) & UBWC_SWIZZLE_ENABLE_LVL1) | 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; - ctrl_val =3D fast_clear | ctx->ubwc->ubwc_swizzle | (hbb << 4); + ctrl_val =3D fast_clear | qcom_ubwc_swizzle(ctx->ubwc) | (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); + ctrl_val =3D BIT(30) | qcom_ubwc_swizzle(ctx->ubwc) | (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) { --=20 2.47.3 From nobody Sun May 24 23:31:55 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 230C33F39ED for ; Wed, 20 May 2026 14:51: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=1779288709; cv=none; b=ePELx3K5gVz6dauVBMRQVbUbVaM0MrTkHqhYHwtb58gycckHEjFJKPmmasOFuly5/XTvxkaetTeAKKGnLshlYafol525RQU2tLm89Lv7DNd8CymtUB/uuhJFhWtjOuczuVjN0xoaWkbnJiCYKr2Q37er8i2cs5ypGGrV2fttdy8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288709; c=relaxed/simple; bh=6iZnedW4RBQxA96XKjwsTUc9JsPI83to3JJHc5dyQQ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L8OU6hS3a/+aj9Ld7BGjtZtCkRdcn48ww1BZRfNNbsQhL66DpUxVShKi0qHuVOnQnG6jvga5vGH8KUPQ6aE5ZqGNACZInFgzJj5Nnp/vg6b7FSEBUZFZNLj12+QiJ9QtyJES4JH0UrvoAMOKpaXES0znhK6MgH7KcwGWRIk1mic= 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=p5qpUd2C; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=dSA8Beoj; 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="p5qpUd2C"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="dSA8Beoj" 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 64KE2RwH826685 for ; Wed, 20 May 2026 14:51: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= uukH2Hr1fThFSWIyYnWWKO/3affNsowUSHW3Fd24TQE=; b=p5qpUd2C6y94tPDf 6yxDvXjGefICxM6EJ+OHuPYcNkzkG+3Kte9NEyReBe1St8LG0AMtZaBZDhbGBM9U GBY7TdsJlC94gyskL6DRocxmIJBkV5DRVYBbNEFHtpe062bhomzmDxC04OfneM8Z +lgDxGvfIC322lTWwAOYTN9Fm9oglxloxoekFZ5/aghDYbZX4sXTg1Ml6et9TkMm ti2Lx6SZ9R/+hvPrpZLbWR0E28BHP9OsU0eU/kbV/nQ44rAHGReL0xY+8SJQsy47 O85ojwzzRR2hfEMtEv3dPDaMhzlUAS8SYf/ilZBVn4lmkEzrPHjhFScNoRtgLZFt J5p5Fw== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ecag6fd-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:47 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-95fc647f356so8150177241.3 for ; Wed, 20 May 2026 07:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288706; x=1779893506; 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=uukH2Hr1fThFSWIyYnWWKO/3affNsowUSHW3Fd24TQE=; b=dSA8BeojCa0LHv2fOZJ9oXJJDfYCEQvcuSgsPIotRSidkPWObFQI7yycWbTSJM0W7f faGOqEFfjhRr/WXlNxhKXhzWzTl0Pn/I0XRYMKwJzlmnozXLTkFrqRfxHed36ELan2dE OuayBEEmR4exgpqpjq3QRjE9qP/RH4LzPPxVviCCJQtHaQ2ooc/VUixw9DR3zXccI/o/ QhnW6iqL01S3gSfHdGmbexOaNzK6vwTIRggNrOvE0prCPNguwJAfVP2utHY4i9NZvlPC uuoJR3fvhg4xcIH4cjwuXcY6h+c9c/Kc+8UzF7FZ2o1B7dQwgohwRCax1VbIoiduOyLx qdsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288706; x=1779893506; 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=uukH2Hr1fThFSWIyYnWWKO/3affNsowUSHW3Fd24TQE=; b=rvAG6IDqwMlmLD42EEqYvN6dgLJM59bPzUpX0ptv6EUhkh0hn50mbvVHo6/5HkEQkS BUZyA9m2J/weBDVlDe+w/l2MCkQqcYJdfhbO4qqqcIolmwRa+fLD8X9vVZhSElV1pmWH HE+jJBG3fAhRRBUWDBcTvllkL8RcenW7xkmafpzftDmatEQDZhRh3txUH0jgtJaBeJzb v1S/Q3Y60Ua/FEir46ylisvzM6oghycvL3e4KOd5J0EMXyeiLrY6YoiPeOyGr0B71jQJ lLnQkZu0uX4HpwwC2dnZ/jrXUO0qg5yabGrxUIWqEF2zuQgB8qbiuDmEkLA6dzfTTwlJ w1uQ== X-Forwarded-Encrypted: i=1; AFNElJ9U8pdhBZVlYahBCCE8EaVJ36sNYH5Uo/GliEFws9MlpBuntXGAnDNK74HO147nw9WnGBv6n4W/kKyZqzo=@vger.kernel.org X-Gm-Message-State: AOJu0Yyl5SkdpuNkW4i0ALiF/ghIlwzH2yfdTgwMxNWYDcGB5rt8dI2I 1isH5yphv6P4ouwagROo1JUahwZVy+KlEAf13juigbdgFotrj4+J27kKAtTF8+iIdgMhjmNBlGU dM/I5xDmaQoJLrknENUkTBlovUcCjfmPJuTLNCpGgo9lQ7WuhhtnYU1cvrLJP0uDAPYo= X-Gm-Gg: Acq92OH6u0f/BQQV8ypk0mJMWnKJCVEIWVwUXKqG2+kUHJUC5BARg7TxYn+kcKGGjqu vncOJwn42qsTPAizWuNPlkfGjQvvVCWmTQ4Rt+1o5h4VY6DNhSv4RpEHvxT8x6foQH/OELRJCb5 fct/UpAhxzlVZPzMz2A7SQ88U2HyeYBzjY00UrUIU18NQJFTJpwaYKptdCcq9rCBnhSUxA9fv6k mK/Ho526hGENk6uT7Sf9NILT/tZvyzu21U2PJq259+AF/KFA/70hGELnXSu40rzwVM/3fSHnKD/ 1m1kFrQM7xRS02CkQRmBswhNjje3XhYfEj4uR1yzLtmbKepxsPVqigY+IVgop1DEozkMDVtmA7C 6v128a1oLwXYbRQOohE+9fNJgoNgIPH8FmWQE9D7DHjHfPcWewHUC7cSuwdV2YwZst6tTcZcNc5 BMaaq6JWm7ixTiedKwoKxaeVvqvdn/K96sWB0= X-Received: by 2002:a05:6102:3a12:b0:631:23b4:8dce with SMTP id ada2fe7eead31-63a3da4cf2cmr13976387137.13.1779288706500; Wed, 20 May 2026 07:51:46 -0700 (PDT) X-Received: by 2002:a05:6102:3a12:b0:631:23b4:8dce with SMTP id ada2fe7eead31-63a3da4cf2cmr13976359137.13.1779288705989; Wed, 20 May 2026 07:51:45 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:45 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:21 +0300 Subject: [PATCH v5 14/28] drm/msm/mdss: use new helper to set ubwc_swizzle 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: <20260520-ubwc-rework-v5-14-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2044; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=6iZnedW4RBQxA96XKjwsTUc9JsPI83to3JJHc5dyQQ4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpo45jCHKUU8FKL8yZzfRFsDWZ3RYW8Il5rr 8DUbrPGtGOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaAAKCRCLPIo+Aiko 1S8jB/9BSiBZy04IfOOx6TAbeE1bNrsn3MwfEjorlEXRkkPZ9YrstTV2eRftuW5zWooGw9m5axV J0A91K6H24edalCcuU7o3MQL98+I8X+/4v7jIv7Nhu6qFTuXyvHRJCkm9223gR5P60wXESSEAnC cHTUjHzxzEOPO8ODKs41WwKOxiLwgYg/PlXA7u0L7sq6ptHMMRSeftn2GxD6Gx9OwlNmkbd2rIQ AEyp7oIyThZcDH3AEkBAHtyQnCxKZ4Wg0onYsI32Vrg9AtRvK5Lr0uDkly6v/1LpaS012KoXOef i0S+oG4k0lPxs8XYcLb6bBJWkZTnmRmIpfb+dMQtsxJodmaN X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: FQmRlhNcrCqfIlDgOQBrOvNdNe1O4SqV X-Authority-Analysis: v=2.4 cv=WqMb99fv c=1 sm=1 tr=0 ts=6a0dca83 cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=crYPmtHWi7n-_IQ59sQA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX6XeXdnmty5Sx gi1yhPOiUi3WasuhpbW/IRJiKzjWEp/oBGt2Hobedj4J84M2+OlDpYp1IdLCG1wRKoBpgVrXu2k CVfZv+7Tr3YyKItdhYW2NYyrRGkcUkHH6rUWqqT4yGFR2NNbVA5aQJpDvMdt7lc9U97oaw433cf DJI7F+36IkzR3jA9ls764c46V216/Qm1GzQ9uTLVHdBPWYxBx9CA6jl1E21rahOXZpy37c7lmYc XZFQyYN5Lhd0M4V12RNWMtw70yR5IHPzHvDgi0cMLgutygZIE7EoyVyyWQipgalfYblg/ZOuSyo seSK2iW5hSvF49lkLsJSXjBJrq6pJaJZXCBcfwvBgO2ZAmnnvv9i1mURzAWWKfKaGb73vICFEal s1EwWul6rGHhl69/quEVOjL77yBYHzQv1pNdak3SnNkBKzB18uUz6IK+VeCSw4KTq3GGb0wYCM+ OIfjJFxtylZfV/8PoRg== X-Proofpoint-ORIG-GUID: FQmRlhNcrCqfIlDgOQBrOvNdNe1O4SqV 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 adultscore=0 malwarescore=0 phishscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use freshly defined helper instead of using the raw value from the database. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index bf106d849dea..3c1f04f12c3d 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -169,7 +169,8 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *ms= m_mdss) static void msm_mdss_4x_setup_ubwc(struct msm_mdss *msm_mdss) { const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; - u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) | + u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(qcom_ubwc_swizzle(data) & + UBWC_SWIZZLE_ENABLE_LVL1) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); =20 value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(qcom_ubwc_min_acc_length_64b= (data)); @@ -180,7 +181,8 @@ static void msm_mdss_4x_setup_ubwc(struct msm_mdss *msm= _mdss) static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm_mdss) { const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; - u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) | + u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(qcom_ubwc_swizzle(data) & + UBWC_SWIZZLE_ENABLE_LVL1) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); =20 if (qcom_ubwc_macrotile_mode(data)) @@ -197,7 +199,7 @@ static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm= _mdss) static void msm_mdss_6x_setup_ubwc(struct msm_mdss *msm_mdss) { const struct qcom_ubwc_cfg_data *data =3D msm_mdss->mdss_data; - u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | + u32 value =3D MDSS_UBWC_STATIC_UBWC_SWIZZLE(qcom_ubwc_swizzle(data)) | MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); u32 prediction_mode; =20 --=20 2.47.3 From nobody Sun May 24 23:31:55 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 0D2753F58CC for ; Wed, 20 May 2026 14:51:55 +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=1779288716; cv=none; b=ikPu/SB4WT7xgepNZNi/PDyXrqpUnpAVMNu+IQTueswtHn+bctNmliQDWgWYNxfJBbKUZUGGbqNVTi2fYxxE7lRJ6KS6A1DqOgMVPqhDS5xDVf5F4hb+chCH4hy8IpL778ny0YNg/Am1BugNc4KnGOo5xLpiGicvbJ54Kt/S1g8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288716; c=relaxed/simple; bh=0CsJEQgFxj0TwGdynRcKHH8T3xjv2c9Vfkj1PubtikM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NWFhoo+C365c4mavH0yxQw/JNsjFw60xXmHl9aaFKuZvNx2ZKgFoxtHv1fcvLYBseihWgWxcv1++Tws13/KEbhHnccDMOSy2WXrYT4qUPtW9H1vpRS8XZcQkddMdNkWoFyBatZyodybZuXyU0Q3HIACmf7e8HvrO9GVJk+qB6qo= 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=RcCYMzXD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=C/PeFreG; 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="RcCYMzXD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="C/PeFreG" 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 64K9oWgc1178224 for ; Wed, 20 May 2026 14:51:54 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= xWNkreogDgXnJx39ZIn/sBhL4UymnLJVUI15wuXrdQo=; b=RcCYMzXDXCroQXtv CPT1j7M7x3kAbWnIPSPw30K9Nh8G4g5W4yl6SNkmb7qFAhoKBVlQuffR25hq+Pnf SOpx/4IFJuK4zVeMFtEr4nyxG+8bkCaOTgeu2xKXw0Ey9jHFWiL7yo6b2u2+dl7h VVqFzvlCeOsJEQPtAHEf+K7SbX4qnyslScjXWLjeQGmZnA4HTTjVCJ+rGvVsy59C niopaU2bNyWWyW0gL9ZAnGUBrKNV0CqrWR0XxdGL5WjzWdepZJiPaW+8ibHmRudz ccGCFizVvjSYF6BFy6gODhN+T6mRq7ZgcqvD4bGOYwEpZ53LDFvtpAmZvKsWPjS1 yZQzDA== Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ap6s3m8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:54 +0000 (GMT) Received: by mail-vs1-f69.google.com with SMTP id ada2fe7eead31-6314daf0053so2608350137.0 for ; Wed, 20 May 2026 07:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288713; x=1779893513; 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=xWNkreogDgXnJx39ZIn/sBhL4UymnLJVUI15wuXrdQo=; b=C/PeFreGc2ggGJ7wT7d57EFAaC0iNAbMUhXOxkr87+h10PNy0FzN5ShVidbb8BX/5s 0A9v9cOG3YgGPfQlrflTl3xrqAk+z7+CJM7iLV7uUw2wGaSRMr+f/N73+HIwsHKG4rPW 6YizWFd2jKgLZtBpbtg/SWKK4+i3loRrq+ap8616QIBJWj7c2PXyQp0aEt43xHC+2ylN M4nr1vFIjaDEL98YVJhvDCfr3WDP+Y/9Y2HyHoaaiq3EfDzKOou2ElQaN02ogqAIGzuc 6/Y/bLtQiwL0qF2HGJs481uAXFWEBfYptLqztFd/A4Dtl72uhmjeHvX8qhWOH1o8K5vK ulug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288713; x=1779893513; 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=xWNkreogDgXnJx39ZIn/sBhL4UymnLJVUI15wuXrdQo=; b=XJzIUgNUngjnn1HAFUk/OPbTV6EIBKGgqlZAqVgjwuEajReQW9SBow/lfSs8qtuyJv cg8YMpR2wZcfMQWK756bJtPRKT8ztJRfcZR9LxqWxwNRKQSPCzPg6otv4m8axVvLtLCg 6tKa2Dm1za8QPilw+Y5LItIxD0fSEiIYQyEjUbCLdu11EPHF8cPBJ3PuVM3BK5B9kL5h QaaPG+SDtY0NzVJmsOfOnU1sF4hH2uejYvVDhN3BloQLPV/cDKOg2plPuPcp5CMpj2SU N+eNbLGqPt8Nw39O1WnRCPsdUUzR8dBwxT0mFu6b76HMUBf2yNuDCOfcltdpLAm2t0Vx ppeA== X-Forwarded-Encrypted: i=1; AFNElJ+MgW9DokvB3N4qri9gk8V0uA5VKkQ+A2RJcp6uDVbmsRzepdbb5GbfAMNJsNllETIAOYrwCpgmv+2hgyE=@vger.kernel.org X-Gm-Message-State: AOJu0YzOexz/MniRrojmDkczp7JyVhC7fiHjAtghBqDbXnsRibKnr2g9 Waw5cFqE209pqhk65XCvPfIV3gbPREqKZ4N76Zpc4cNauQ4RoUgc6HwHf7J4mnZERVE0b5p/z03 V6UfRoh9aEccrZqdtkYo8EwJFHKfqDHapNoM8YRCmWfp43DX4bUFAsTbPuRqJCk0xIFQ= X-Gm-Gg: Acq92OFN01Tr7cxxI7y9P6vKz9eTEbZaydHKpn/r8KG4D3MStAigctnqt7sx0iTyBMq OpP6MMfsy2aZybVnk1k5YVVKVBRyfvx+QDP1uDQvCOHEaV9LIj3fxusRfqFSE1XcCGBQ5/KDm9J ABu/TqzjWDffNlOu3/1E+4kSbysDIQPPLZMN1VSx+IUOeLBvdZIuxSQC1xsithOIL6T5TkpCFzy 13iQfOog+JiLpKFdZjXJF9PLI3kBXVciyXyQJbAtTBODss/I/UTHKBVtX49NR8WoZNC04/ZQr55 rr3m+1PEaJnxGd4mNNrV7sVnqKphfHp4w+3U+6P/BRjI3wFNQTyeW8FF8aJw94QaO+fGJIOLn1d A5GFnnZc9Pur5A53sSW3ywQdrPDISkP+NGdDG/SgG1bYzsWC2H6PUv3JZOXTfll+Mow736ywPCT LOBsSQGf32v5+AgDOLpIng0kjbDE2sL9ItFwA= X-Received: by 2002:a05:6102:8083:b0:633:e67f:b7f with SMTP id ada2fe7eead31-63a3fb9d0d6mr10696874137.25.1779288708334; Wed, 20 May 2026 07:51:48 -0700 (PDT) X-Received: by 2002:a05:6102:8083:b0:633:e67f:b7f with SMTP id ada2fe7eead31-63a3fb9d0d6mr10696847137.25.1779288707816; Wed, 20 May 2026 07:51:47 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:46 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:22 +0300 Subject: [PATCH v5 15/28] drm/msm/adreno: write reserved UBWC-related bits 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: <20260520-ubwc-rework-v5-15-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen 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.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=968; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=0CsJEQgFxj0TwGdynRcKHH8T3xjv2c9Vfkj1PubtikM=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQxbvqYxadaG5io5X525UXejLoOa/hZE1rVbiauLq3teu2 r197Pc7GY1ZGBi5GGTFFFl8ClqmxmxKDvuwY2o9zCBWJpApDFycAjCRl+3sfwUiNkhGfZW9nvC1 4WhJ6uVtV50CWXpqXrAufiz85Z+y6vn04AmqL1slToXnOry7mOa59FiizJT93rvNn6Yk3fda2JV dITtb8HOWxbclH2Y/mN9SGWOql61gsS2Iqf9NzunvnKcPh1SctBR16/U0Pfqo9bSC7w2NyVbL0s X2WC7OZ7IXFXhpfspFOa5BYVrgzInxTxbwxVrsSl/ycgaj5QbZW+tOmDCvE/D5ecft7nrXBUdzs 6JSnIJ4fu+RvuyycdO/U5ozbaOs6xn6axazqbZfl9sVK2fkuNK6kDftrTBPpGLiLHWBVys3u9m8 2rbWcerRy+eC2G/mbp1slPKdffmH1r6Wpx6qMd/NyuQ1AA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 6cIgpO6eJKTKK8_bKY_R1ORL1CFzjPth X-Proofpoint-ORIG-GUID: 6cIgpO6eJKTKK8_bKY_R1ORL1CFzjPth X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfXxRyS9H5kvyES svYToa1vDiVCnLVfXgcIdZjKSD6i4oLnFG8mMYGIuLygJnsSIWWblzyh/CMk6GkdoUfoB+Cyu/y no1iZlyZ0qRR78yldD4z5IQeVULcbY8Rfl3eEL9hylCtgRNIZMxWb2r9bzwJPQrGH/EaA+TKjG/ ivrXPSNhn4j3S8WHhT/rD1L2oTX+geUubfOx2bezeKAWTbXkcqRC7f3JgzGM9HRBEzamBohORP/ Z+i8rWfD7KHV1Q53Y+I1GMy/S2mKh2IGbXXj24qwLtdLCLgwhopLz0BAUksYKZxrQsNSJJyFTxT SowS6L3OYHq2+elZuO789cWNsNA/xU9cxf5DQANtC088l2xViaeSmuPn/a6Cm9ln1Qzyyef8uJK acWBkm/tNZGl/vtUcJEVICXDcT9G1gWFCLZKBsRVyKB6uUXbyIi5jAworoNWlsr9XUFzOOXZer6 f8XHVZnzR/KT9+R6vHQ== X-Authority-Analysis: v=2.4 cv=FesHAp+6 c=1 sm=1 tr=0 ts=6a0dca8a cx=c_pps a=5HAIKLe1ejAbszaTRHs9Ug==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=jQZLqUlzLjo5U5EXcnwA:9 a=QEXdDO2ut3YA:10 a=gYDTvv6II1OnSo0itH1n: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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 clxscore=1015 priorityscore=1501 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 On the latest A8xx Adreno chips several of the bits in the UBWC-related registers are now hardwired to 1. Currently the driver doesn't write them because there is no side-effect. In the preparation for the refactoring in the next patch, write '1' to those bits anyway. Reviewed-by: Akhil P Oommen Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index 53def136e0fc..7a6223ddd8cf 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -288,6 +288,8 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) switch (ubwc_version) { case UBWC_6_0: yuvnotcomptofc =3D true; + amsbc =3D true; + rgb565_predicator =3D true; break; case UBWC_5_0: amsbc =3D true; --=20 2.47.3 From nobody Sun May 24 23:31:55 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 536113F4DFA for ; Wed, 20 May 2026 14:51:52 +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=1779288713; cv=none; b=WoxsmLgR2SRRKs3XD9OVStIF1hb6zrYwsSik0ym6vKq8QfN+ANo9koAAMZEUwRZ89zERtfkVrE7QmTKhCFEMHiYJ3ZQjFOrk/ZxgLyKNmv6SzREiqx+lox5UbbrooLGFOg6ISQ8BExIYsGsVzIW6XqTAZrDIplgRlnozBdCqv44= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288713; c=relaxed/simple; bh=UwVvsKLkUIORbtzZurFAWqIbbBEib65pVmAxe/wBnTg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rphHlS0MKKPMEqGK5CUPIswcCUpVa6oqk3EBfQWd/zYu64ARtM11iJoqo8R0rOoaRj+BBMdv/jhl+xGyg9oZKEwuBO6vFhAJB7nqo3/eE8wIcgMOQFwG/DanWTFeFDnigzduikbEwU/e2cwYYRZ289MhsVDuI7ohqJH8UCD0Rg4= 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=aHbdFFFP; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ZUdxJS4W; 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="aHbdFFFP"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ZUdxJS4W" 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 64K9oLWt1177853 for ; Wed, 20 May 2026 14:51: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= YeXGSGSeoUMRQKY4PjIJ+D/sVcYw4EfpKGdbvxvr2ek=; b=aHbdFFFP9TbmyrcL r51Iz+KGXnDnQz8LWjgH4KKhm7kHoNo/svoU8sxkInYfWPfOumROZkM+oh2wibel JUd4ws5jp5P7FE05LdiBOtguntJr97EWHebgVmO+B9Fbxq/qVrOSqyo8F9n5Ekq+ zCmlsz30QiMbkz2Yt1PHpTEHWO0btbP0M/bMHbbFH97eJpU178IUlCwBu1ST0osT +lux4Z90GbTYKamihMMkRzm4YuJeFyOoOyBclrSi4N/DEzzYIibHy7dkm+2r2dQh NGFK2dB/eUG0pNqzQr0yyJiCwjf5MSR7RtI3Vzrt64G+a3H3xXXFDkfgMP9+Jm8U ZkgJOw== Received: from mail-vk1-f198.google.com (mail-vk1-f198.google.com [209.85.221.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ap6s3kr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:51 +0000 (GMT) Received: by mail-vk1-f198.google.com with SMTP id 71dfb90a1353d-5751772dec6so11058207e0c.2 for ; Wed, 20 May 2026 07:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288711; x=1779893511; 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=YeXGSGSeoUMRQKY4PjIJ+D/sVcYw4EfpKGdbvxvr2ek=; b=ZUdxJS4W+xSuShlE6JDfOPTBi0wTDGMmtd4OB+t43aVr/AujSjXLF0fskZyxjUpcM/ ha9NkRhypS17NLb2zXIXVPxOlsGnTcCiH51dAAQpdpV68TYIDSoHuIqx1k1uZOqF0i6g 43/vooIQYlmGvT1xAu/Kr6fnWTNk6Ie2x807PPjs3uc+t2jDrmPoPQgWH9wnKbzMx7SD x1QQT3VLI04aV0r8PusbxWJuLeeTH9uuIujepVTvz5K+QXqw/zeaWouoGMQtZqxTTSAv WRmck/VII1Xox76UX1VxDRN9IUytZQQBY0qN0iO79+nC471sQVoyJOKVM1k+R1yu+BRG E5jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288711; x=1779893511; 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=YeXGSGSeoUMRQKY4PjIJ+D/sVcYw4EfpKGdbvxvr2ek=; b=pXGORnkySo3j+6dF0+NULI+V83CfyoriXJaCONU3Kz28K183M4b9sx06UwHf+FGe6k qSbXnuY+UGQ2FS83IKz6R8jF+nWzcfx5SDZCCOYxkJvRcCVrI/wCeUnXCDD07r1Y2L9w I/9ISQn/99BvHj1efTXmi6J5ZmZy+kImjOON7rS+r3U8l+9J9U+NR3AlGh79yGazeH3N Dv3gpjTa/y7odyBS45MjasuaY3U+ZmvX2bkIGT7qhY91Fyury37cQ1OXolYrTUT+ml46 6BV6UuXnTn+xqwYI3zphzW6KbwiLUQgtSRBWaI9nCQyUnLQgF03mowGTjHMNMWJCp+WV FiOw== X-Forwarded-Encrypted: i=1; AFNElJ+WnEiUVwKzYW5ezfhAcMzpszXSeo8hdTwC2wcRuM7TpHnwov56nKMfqDgivwBv1baDB2WgxTY85u5EVWs=@vger.kernel.org X-Gm-Message-State: AOJu0YyhwL+S/IGCttRocgz+AcTQJVKSLQDooOZAvDldDKFYM1WLBzbi qBGvlcfE8oYepzV3wzMaGk8enVagcmWRpoyxGH/7rxA2chmbJNPeRWTK0q7iyvxxkHUnUeZ9HZx TFc5zndI0waTsL+RZgbbgdqoVjHXAp/jCG9gHwGp80y6rk5zZdD9vQCBah2hjpzZaBrM= X-Gm-Gg: Acq92OFHliARLeU2gsjrukg6NLmwcYzTbhO73MolVwmSiSafURWEK1bIO/UEE2eyw1w IsOAWt8wNCprqAZyiqrq+trfUy+a7iZvlOJRyaU9QILHaKSV0cCMGAwcU0NZEcjkUY+ZTLYSZCl 5JCNx6V9vDvY1ttwcomOxYQZQA8oHCiqTbPu6/YvnEdqta2nZms+3AHoDiRFtmLc1XoMcd4/Xw5 MvDBuPUg6dGtYkgt9BnU9mS9QM2iPHylgJeKlXTPKaNnWFdFH2KcAkSVLBmgFU7179ionl88PJB aCtjhYin7gkN7mFke4pCv0mks9LV/ni/gu8ma9pK2NfkXeEsNe43Ma/Cbkw+ISQ31r7mkzW3kSb 8qpwNDxogOMg86I2CD7vJ8pTwVv4E7q2pciEw5OcjJBAFOw97rxYEapo8sSkSk+ujmZyBCKYocE 574OdKduEbpDYtga/PkxOKPpRSOl/QepxIIGY= X-Received: by 2002:a05:6122:348d:b0:56b:7023:1393 with SMTP id 71dfb90a1353d-5760c04adbbmr15005066e0c.11.1779288709955; Wed, 20 May 2026 07:51:49 -0700 (PDT) X-Received: by 2002:a05:6122:348d:b0:56b:7023:1393 with SMTP id 71dfb90a1353d-5760c04adbbmr15004990e0c.11.1779288709418; Wed, 20 May 2026 07:51:49 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:48 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:23 +0300 Subject: [PATCH v5 16/28] drm/msm/adreno: set fp16compoptdis for UBWC 3.0 formats 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: <20260520-ubwc-rework-v5-16-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen 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.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=801; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=UwVvsKLkUIORbtzZurFAWqIbbBEib65pVmAxe/wBnTg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpoZsoCoh4ITjYLrfP7D/p6oAmgMVaq2dyEI bBUkSILO6OJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaAAKCRCLPIo+Aiko 1fiSCACcq93Vxr0c5qkcZviyqS9YIR9v5nVgibape0QZdC2E8mWm0n7XbJVGelM/7pjRv+22goK 2bzp00kLkEOoBkGlWT+EpNoTd1v7+BDYYxD7S0vkF6LndQbgbh9qHLEMp/6IVXRMinvIlLDLsxa PFxS1AX1VUkUqoKhENMIc9kt3xPCwEmbWBvpaW9/cWTn/bZGuKA9dxew4mINUO4PY9cMmjtqTyz 6omgFgniK0OrO2XIfrmOhfmxx49QAK+B07xz9eF9+TM3rjoYgfAf+nf+fC0SwZVf+drK9HLZ3ss Iix01Ndu4hQ/U220XtaNaooOg10PLNeX99e0J3ZuGB1PzEp9 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: hn9yfp2-ExJR7TX7Onhc5GE-cpqb6hfW X-Proofpoint-ORIG-GUID: hn9yfp2-ExJR7TX7Onhc5GE-cpqb6hfW X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfXyUlCQDD4YbCp +78iJOmqj9iJs9UPOmVGppSxEJ/G06VcBjkVBk703bGXFqEXf2uFniCJrzGSBbLGCNKbB6ga1mN 3MgSGUIpck03mnPOIwC34NGa1xbldhzmyRQCYo4ZVXLIr9mk9oKIa+csVvtU0zH/XouS1AM3Rjy I5ipnJ3n6MdGPDcNxpCK8wVongYP0V0h38G94rXwUGlgz3l99kYyHm/c84NyYggMFGzJv7+L0KA 96upjTRxlYugO9vxncpxa23zKFoXH45+6CdNGDIoxTtBkJrbnx295TleSHJeu43SlHRN6vNMKJM 5t8O7KtAqC1IxJUu8bCSKKFBbsISfZDDL84icY9/FLf/dii8FmXmrQjfVY4nxoFBmZgT8/c94ml 3pW/h5GmI3hB3Ax+38374VZ8ab/mxidA+R3KuLU3tgQ80yerx+EsVlgUM8Hgz7m+Xi8nIJi4/YJ APLZ5abLvDHjE7NaucA== X-Authority-Analysis: v=2.4 cv=FesHAp+6 c=1 sm=1 tr=0 ts=6a0dca87 cx=c_pps a=1Os3MKEOqt8YzSjcPV0cFA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=CoZj-JnWnDGe1ZqNdgAA:9 a=QEXdDO2ut3YA:10 a=hhpmQAJR8DioWGSBphRh: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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 clxscore=1015 priorityscore=1501 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 The fp16compoptdis bit should be set if the system targets UBWC 3.0 format in addition to UBWC 4.0. Reviewed-by: Akhil P Oommen Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index 7a6223ddd8cf..867c7d05f670 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -303,6 +303,7 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) break; case UBWC_3_0: amsbc =3D true; + fp16compoptdis =3D true; break; default: dev_err(&gpu->pdev->dev, "Unknown UBWC version: 0x%x\n", ubwc_version); --=20 2.47.3 From nobody Sun May 24 23:31:55 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 B54CB3F5BD1 for ; Wed, 20 May 2026 14:51:58 +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=1779288720; cv=none; b=Dlc3EJDFoexycOSNYsLsQjJ0ZhIsoipq3xAfMK5BIVw70OqGVS3PsUbjSUNMpS9Ecnb+v1d3OaydDJpqda1Zn6H+UVHof/w7lCPWmNEAi/Z6ftrQpuWP/WyYPPdT54YVxrVvoF4EIG9ABhE0h0WEwWS6DxPjWW5qHAwfKUYM37g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288720; c=relaxed/simple; bh=BW3z4eXt9jEN8c9nQYgd/mUMJSPQ6cxnVEJl20A8eKk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jg2io11UAx1eDZnL61mrhw5JZMZgW1RuCisrMltc6DmpC0/BIeBRJcEC9tlCXOKsKgifRhQ2/6QYOBl23U8N5+7ia1w8NLXm9xIx81e1alSeJ8P3xe63vJvR6c3WkjyRjXAlu5opegv4gsUjoX6rVOdSLZoWlLmkeJJ3yUyRQMw= 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=HJz1z26r; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Iu2ohtWD; 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="HJz1z26r"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Iu2ohtWD" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KDXiOv1798416 for ; Wed, 20 May 2026 14:51:58 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= K4BBNxAe0Vo4ZyzoRvicUmzhc+J3e3nthdb1jV77IEw=; b=HJz1z26r0pEKobRh N5ZVpUabHoZ48+25h6+5EMBOAaB9UVxgU7l6/gozTd8Hw65fn4iX21+tWIz22xsm i/tqZ4yoaVgRfVCPQLaLsjXxvc8D9VCsDMmM5Ngk85K8/NgGgox6jXB+7big1CRt TDo4cGOAMzsTc+RGQAVwPbaCO/sjHthh6Bj3sZB9Jl4rHjTuf20DkMoVpXiykRF1 Ame4yb2et7bApPZVLQ/JIkxgl1T84QW4995QRgp1tEUNEa0aKU9OjoSpuBB/1CFL sDEr6dHQ9tml2LlzZGgKPfZ46rs6pnNJqdpH7C7qHFxdckRsrhbd+OEKClAeOmlD djriYA== Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9dxu0a2j-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:57 +0000 (GMT) Received: by mail-vs1-f69.google.com with SMTP id ada2fe7eead31-63144b84f14so8020590137.0 for ; Wed, 20 May 2026 07:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288717; x=1779893517; 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=K4BBNxAe0Vo4ZyzoRvicUmzhc+J3e3nthdb1jV77IEw=; b=Iu2ohtWDKyAw7qtZf+ymvT8C7zRPhN8GyuXIdqH7WXqmbeNw6g8njcEYk4ObU16BW0 b3T/uBFYhz5wweJYpKOY7xPB7B7SzyrdO6qiTr82iPh+H/IItWf+FBwT2pY+eMuYgKaT WczyGhrTQGBW52Esvkcvo/mupmRKxnSGi0qutV6zoWJpS271687oCemQ5Io6WYv2p8i2 dd401DerHTjkFL0Cm9wststQW3q5ePzkGGIqSOKZZE+jhVVHx/J8+6TpWLHnN+Lb9OzA 7dBZojbWUIUDROtSis9w6HJ1D7jaM+/SP6ct7TfmXjGPBeR7TCmkcwwlrCAIDhEbJklQ N7Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288717; x=1779893517; 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=K4BBNxAe0Vo4ZyzoRvicUmzhc+J3e3nthdb1jV77IEw=; b=A3+smUVIvXlGOwQ4UDLFL0t+p4TwmE9WJB5CSHu9SzfvOtul0ewleO3tahyrxlkOrx Un2h1Bjq0KuzKJG/C0RAko7i/zeF4O8I1j0kzPsZMXhiMiTN5sy45xiGLCAM/D47wPlI WkiL0z8mzFsG7wzis/k0LxVjYw/GmHUC0dpDiw1JhUXWbxgpYMgq/HpEe+Gg/KrHparW /GwXixU6FJHqbKbtdgipN9kVXUO0cwIJtEJJ+Zfsj2Ci4pWP8o05Jl/AqEsszW7lMwVF hWNdWvffYxM8UqKPIfeRDbHEi3pgF7v5ms0SHg/CCswVymVqqVeZOWze3ELuDnNK+OyI MMBA== X-Forwarded-Encrypted: i=1; AFNElJ8CRwt6aN4PI0Hbm/V4yej86e1Sk2yFY+3qrJI9DTVdngH1cluOR5J9TfEA0ba2zWIfRFdz33OnchpRlrQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwjIJM61bgvb5SAB0gfGnzLXijiKt2dTruDpbVHu09M6D44auGL ecTj290E0f2uZ7eGUrr+MaA/cLuxjJXgpToXSMugM4lSmeKurvD8UGnGV+jgYSfSm5ufTt7NciI PmYOV/C0TijCPu2qglYRgF9at4mC9BvbB2TSt5VbfGKn9yvw2XRjqbLWJk2A7oNtaRpk= X-Gm-Gg: Acq92OF/C6kBfRJF2gSC7U0pl5N0FrUeNPJ/Bzc/IO9aG0ADldXRsdMwAReOe5HFche jKZ1RtWEu5ejwsVfir1d6QNeQRufIRm0jZl5HfCF1OwYjpCXJb4qyHxTG55kFHQKq+U+8srLiz/ QseOZuYqZfLYF1PQXaZlbWddwoFJcdkWLfK3l4UGQZKDjx4TGHdwbzSbE9Mtsrux126CCwIhvxd AwOJ4K5a8ahimc0YesOUSkduemFCdL1OwpY6mYyTJ8l/8RUuLhF08PJjy1CD70Gnt6OcJ0SUtbA EPd5wuuFkXnrTeew2guNIdlYd9Y20iUu2pUJdCFgg/okCl5SI+LMLWzw5DLrFh8qLxKnzHX8ZfZ bhCNsVc279gp7ceq1bS7EQJx2tJUXfs10+mlZ4ImpLQuOikB7a3spn/BOYryisfsUvf1gxAS1l5 7JcT6QrY220R4SwPr+qyR8Ryc9cAk6Rc6UCJk= X-Received: by 2002:a05:6102:4412:b0:634:eb91:695 with SMTP id ada2fe7eead31-63a3c801a1cmr14222735137.5.1779288716927; Wed, 20 May 2026 07:51:56 -0700 (PDT) X-Received: by 2002:a05:6102:4412:b0:634:eb91:695 with SMTP id ada2fe7eead31-63a3c801a1cmr14222459137.5.1779288710884; Wed, 20 May 2026 07:51:50 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:49 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:24 +0300 Subject: [PATCH v5 17/28] drm/msm/adreno: use new helper to set amsbc 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: <20260520-ubwc-rework-v5-17-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2366; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=BW3z4eXt9jEN8c9nQYgd/mUMJSPQ6cxnVEJl20A8eKk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpoKycU3HSHYK4pK2svQbS8VRsMJsLilPiVC l+gehuZI42JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaAAKCRCLPIo+Aiko 1TPXB/4qS1tYjmNE0CLTAsPA24fES3n1dsid+JsBkf59+1D8nFIf+TrtzJP3DGCZKKTdHRlEMVH z6+AbIzKQ5cpst9ruJXHEw5yIPt5DYNdBVPJo8B3MYrc/IWjLLq+DQ9hU1HRrO5m55oh4PPLgJb gV9uvkLW/hqlVx6gVlriH1c8OV3XbbbBf9joz9+um+Lxk0LsB1I5aYEmjSft/bztemww/d98l0s rOETkwmvZqBa1ebqBovryUIMYYSGiJiEI7Uvmw9tUvs1tP1zT28sZJTuKgNfDzXqKSkbQoX3da4 TvAMgb+eOChd6NpKJr+8rB3QzNquVVlKLN3icZGOKXathLxT X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX+av7GTbMQXso sl1DvidiGozYewQFf6PKGQxeUfSKYe0JXa4CasYoxx5KsvFldTSA5yp79Y0qf7pVJzPBbc9y2BH ub8gFpA+rPyM8Czq8zSTwwCc590ezdy5cRueVF7rrdSlCpyB3JuGM5OeR4aEm1sma6DBJCTd9Gy lCVdcKmfw6cqOyt7kgODX2Rk6tex85+HM61i0FXb9FRT4AsRg1DlkUE44fTvRv4H+FlXV6Z5Rk3 rZ2jL39g2cS8WPWHHhBad+SNmlHUfUP/RM3ge7dcwF18W5i2PfumKXc1RrulpYmjay2WozIcL1a TS64IVjj/TXOSh5z9dPiLmsk+7zxDsRG9Uq411dsWQTPprOrARDKSVLK3grwcNaLT38rssyxCnc AI3DesVoiTc7sc4gstN/JNmzJ2cHOEmMcXyrfAUY/MscL8Crl725i4y7nQe1ReqqZ1Z3f1pwMLz oqMxIWKHkCXyrR8XSVg== X-Authority-Analysis: v=2.4 cv=Zckt8MVA c=1 sm=1 tr=0 ts=6a0dca8d cx=c_pps a=5HAIKLe1ejAbszaTRHs9Ug==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=ZxXxw7YCAI2S9HbMwnMA:9 a=QEXdDO2ut3YA:10 a=gYDTvv6II1OnSo0itH1n:22 X-Proofpoint-GUID: tf5yCNnlQ1FQiDgpHFva_f6EI3gHT_yw X-Proofpoint-ORIG-GUID: tf5yCNnlQ1FQiDgpHFva_f6EI3gHT_yw 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 phishscore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use freshly defined helper instead of checking the UBWC version directly. Reviewed-by: Konrad Dybcio Reviewed-by: Akhil P Oommen Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index e7a0d315e022..1c5ad3e83cc2 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -747,7 +747,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) bool rgb565_predicator =3D cfg->ubwc_enc_version >=3D UBWC_4_0; u32 level2_swizzling_dis =3D !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENAB= LE_LVL2); bool ubwc_mode =3D qcom_ubwc_get_ubwc_mode(cfg); - bool amsbc =3D cfg->ubwc_enc_version >=3D UBWC_3_0; + bool amsbc =3D qcom_ubwc_enable_amsbc(cfg); bool min_acc_len_64b; u8 uavflagprd_inv =3D 0; u32 hbb_hi =3D hbb >> 2; diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index 867c7d05f670..5c73a9ebb22b 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -279,7 +279,8 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) u32 level3_swizzling_dis =3D !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENAB= LE_LVL3); bool rgba8888_lossless =3D false, fp16compoptdis =3D false; bool yuvnotcomptofc =3D false, min_acc_len_64b =3D false; - bool rgb565_predicator =3D false, amsbc =3D false; + bool rgb565_predicator =3D false; + bool amsbc =3D qcom_ubwc_enable_amsbc(cfg); bool ubwc_mode =3D qcom_ubwc_get_ubwc_mode(cfg); u32 ubwc_version =3D cfg->ubwc_enc_version; u32 hbb, hbb_hi, hbb_lo, mode; @@ -288,21 +289,17 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) switch (ubwc_version) { case UBWC_6_0: yuvnotcomptofc =3D true; - amsbc =3D true; rgb565_predicator =3D true; break; case UBWC_5_0: - amsbc =3D true; rgb565_predicator =3D true; break; case UBWC_4_0: - amsbc =3D true; rgb565_predicator =3D true; fp16compoptdis =3D true; rgba8888_lossless =3D true; break; case UBWC_3_0: - amsbc =3D true; fp16compoptdis =3D true; break; default: --=20 2.47.3 From nobody Sun May 24 23:31:55 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 5D5663F5BF7 for ; Wed, 20 May 2026 14:51:59 +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=1779288720; cv=none; b=dYinJbVSCDGvbB6HTU9LuNhSGsaR78E02Y/R6diC0BrkBk64jp6UvEX6UyQ5wf72o/gMOZCfRIA/r6IAxMR0AhncBLhJAlnVCB+6XP4BJvjbqcRXiBHxUp1t8KabctJeRCez9WXjlttkvpyLoewztB/veTT7Tp77iA6YjcIBOWI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288720; c=relaxed/simple; bh=b5eNY9JoK4QxZcfpbnRgSnFL5p8K5UiGKR7ooENUrTw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cId089SFbWlXwb/CRLlEmFnh1pNSZ33XntaCBEhjfmY0qbi3UdXoFh1/RHflVDoRLCf10g4TQZesF+LEz1ftFRJbDXZOrgHAJYSw0La/28BYm+optQnH5PHIdSe4EBeNsbHrDhHBxuzN4y2hREbBDPpMD2GVkmmcyBVdRd6GLlk= 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=YroWFbLN; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=KlomTI43; 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="YroWFbLN"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="KlomTI43" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KE6Ser118975 for ; Wed, 20 May 2026 14:51:59 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= +VuVp/80e3hOAN8xb/50B+5XE90CwHDX5vu23WxKJHc=; b=YroWFbLNV2IdmH/Z lLlbiGgWekdNV+qhOp9QsaYlBg1Hq1hoPT3L/Jtsxk0dSt2Qd5qMkJ2evTksv9Ay 7HGV+e8z5QaRpe4Oh5UMQyw+WAHPkK1dUAqBDU2049uI2jR+HvlqKINGfbDzyZrU s/Ee2cjx7nXwNyvBvpqNqCOxm3cW1Usto3/pC+KXw2k+p+sh3C32q4XJlxmiwncX NV3Z6u4FHwFB/N3hnM2QoUje7V3zF/AjRlgvb1aaCjLfTHcpWhJklLRp47r6ryOD eSQhkLX24QIP6HgKYA9LpzZMq2lgoCZ62KUB+rSCNlNK5au0uO5q/8OJ/4p91JBh FoxTYw== Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ee886gq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:58 +0000 (GMT) Received: by mail-ua1-f71.google.com with SMTP id a1e0cc1a2514c-960476ee6f5so1922129241.2 for ; Wed, 20 May 2026 07:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288718; x=1779893518; 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=+VuVp/80e3hOAN8xb/50B+5XE90CwHDX5vu23WxKJHc=; b=KlomTI43Pv+2Gv7OsDHCZniDRyyJAbsAjDhL2nh63OxmrWFnXuxxuP4Z5LsvN0aTll 5qiwWoKqEWD2seM+Wru2O6RduQ5tun5NjKgUfsolNVo7rp0ur5xqs6qu3ZBM2aLHf+Vf ZDC1J7su0NPwIzgowsz9KjmGFGJZZhtvij06eYX1GllUpAKCYCSxVfKB1OJhuniGCaAv 3LOsLdFiCaJYbWnRlTRQbe+wtsoGEoJKWUmueg87LadTWhOMW0hsKiWJBwVTy4hxy4Zw TTF7oVoUx+vsRQaJCkmm6JE2BmbLUt9VF0tZQ8dGICThUmpA51WXWaWJ/Pyy0HyQXWvr QGOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288718; x=1779893518; 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=+VuVp/80e3hOAN8xb/50B+5XE90CwHDX5vu23WxKJHc=; b=dbmNkqKvKQDvCUh/GKFwBzfUKlwtctjpjSXR8i0JTBPZlKD/gWcgrNREQMlMLbrLBF jZ92TQyUCD6FFaPW8HbBIXZtaQ3LDMQiAKKEop6lTC9CZ9+8SGunF8B4EdyWM8DZ5m2e +XMSXW06/ZJlC78yMX303BvR/e9tgv2ABWFcTcG95s/tTpOdZUIjEhg8lJm/smaNDlNx 6Bme1bzX42t5Xv2+HB+k/gNXmCEz82s4zT3QLOPfoVeHN9Oj4/BXLfuJr7hNKls/g48I YX6Q4v8p2ZjE0ASUPwDwKZWkQspFfL8bdm35Zv4XKFWmdY3ah/6eD+HRa9YEeci+4gSQ bh8Q== X-Forwarded-Encrypted: i=1; AFNElJ/Krw0uenpm4R9Rgwemq3owPXtE0/dSZUImi+S9PtwX1y6Fa020Op32RsOYmdVCtGDElTq5RJsTJMIlIP8=@vger.kernel.org X-Gm-Message-State: AOJu0YxIdAlOxg+esAPZgf+Wk58UsmLNRF3OwdexZCQSnlrAa3pfoFOZ Y8kSNb8KQbneyRLt6KCc/5wXI0vbUIwtMJKdvRGy4Qd5ArINUFHisAoi+7vpHyhZJFJLHXQwHp1 e7LvgfKER6BnLGnodgE69BO2l3c7YdX3tVO6/cWXKqBTBB/34bD+bvCekPce+l4DUL7s= X-Gm-Gg: Acq92OG1ufgn3foLdibtj+djJgmzlV9f2I/BOmxL7g6NbGTWCLaOcPRJUuAYKFgepod yey2w/IIM//SDdVNNZeo39JN9H1IQ5MPvXKKSQPYxofFHdB1hedlXSHXXaJVHjT8Vp9r8j0GF5y tmLTHS+9poNwvsZjjlt/Fd4jjsc42NYS7ZpCp0YU0LgXbUNCXVRPxqlYRGkIuxB3IjJxjgZxdfK UqDZXYrcb+/NM29Qr9yy3NAY0YfWn9pOQm02SXHrcqOeq7PH8gp289hvjB1YO6qLV28OdjCvsYH yzkkuRLKGBZJc++Fm3IIIPwLEYHqMIBgWag/0bpwGizLuo757gOlS02OCTDWttaXEIyYtcYBiw2 tHmK98qmqa0Di8MDWTuff6V5kbaHoDCnFrOSOFONxDTaRSHihEjNyVY3BSjzFLABm8/GSIgVY8D EsCSc0EP0Uf+iQROr+8uaFuo43TKkCJ2K92Xc= X-Received: by 2002:a05:6122:3a0a:b0:56d:3b69:87d2 with SMTP id 71dfb90a1353d-5760c044d95mr14405247e0c.11.1779288717766; Wed, 20 May 2026 07:51:57 -0700 (PDT) X-Received: by 2002:a05:6122:3a0a:b0:56d:3b69:87d2 with SMTP id 71dfb90a1353d-5760c044d95mr14404852e0c.11.1779288712487; Wed, 20 May 2026 07:51:52 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:51 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:25 +0300 Subject: [PATCH v5 18/28] drm/msm/adreno: use version ranges in A8xx UBWC code 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: <20260520-ubwc-rework-v5-18-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen 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.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1692; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=b5eNY9JoK4QxZcfpbnRgSnFL5p8K5UiGKR7ooENUrTw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpo4M66Q9IDlF2Y439GVSdezd9GmSAQpdsjf bjph7hW23WJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaAAKCRCLPIo+Aiko 1YIaB/4oP/w6qzkzlHUuNHAX1Lq6DQTlEsOfN9Wm01nFB076Julinc+8W0hBMDNqgb15yZkuivm T/Bl2N0UQUaSd9GVoFB4ony7SX27YHl9ouAqRchJ+bB+svmgFKEiM7e05MafpP2vEivykaQebY6 I997ydNJeobdew6An1apuevgiUvOTYhi8mLzl9z1Nlg6V2DHLKBZTEFALSqVGmlnmP0YySxvSnw nP9L5EFvdgl7r0ATcIF9sP1NMezn3Ewsq+KarnpaStAHYxL1vBuraVc3sz1YKkJ4Egf4iD6I2wu wn7aOSapnx+cU8TslNzEI7iACiQCgSa3NDxXKTUD78nDBkej X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: Df7k5WanjUVBLfBr7awHYSO8QHYL4a2A X-Authority-Analysis: v=2.4 cv=e5k2j6p/ c=1 sm=1 tr=0 ts=6a0dca8e cx=c_pps a=KB4UBwrhAZV1kjiGHFQexw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=gyY6hpWVHAyQZ-18BSkA:9 a=QEXdDO2ut3YA:10 a=o1xkdb1NAhiiM49bd1HK:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX4wk83fEYHptS 0f9AFcVaY4VjFLH6g0bmiTjFLnQwLHIIR4P5hR86DWjOg5bOSOyLqi22C1GqJC4ZWG4vr0K4VSP eJcTWxiilZcn6uG/0lzEDmw6cug0TK0vI47/DOda8yQv8Tq0qekI/ZFAkBOPzeVhPKhx3izB92y APlD16LQ7pF4/rt9/ASP/91b7txefhmDJ4RwHkVjG6vABwvST8fOSt60x6tMgJ3bUEKwPr9p/13 Vgb05TGtYHSb16Jm0DQXB5xbfgQyx+G+dXs1+eX5MbtoIGF0rMFbgROK/sgBFbwGi3x16Bog5zE wQsypGVN1tk0lc2kFtvLzNeYxD1Sky74ojmwJcXZ2e1K3gsjU7ZQiId4aAtXwaAtddnD3KTIZts g9/AvbfUDP8acUi0x830If0qMU0z6ZavUj6E4KwicungodgBIQhiHhLzRFWj75cpMRPF5vTy7Oy R30aIipTJdVtFwGjSxw== X-Proofpoint-GUID: Df7k5WanjUVBLfBr7awHYSO8QHYL4a2A 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 In order to simplify handling of UBWC minor revisions (like 3.1 or 4.3) use version ranges instead of a case switch. Reviewed-by: Akhil P Oommen Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index 5c73a9ebb22b..29d559fe4683 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -286,26 +286,24 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) u32 hbb, hbb_hi, hbb_lo, mode; u8 uavflagprd_inv =3D 2; =20 - switch (ubwc_version) { - case UBWC_6_0: + if (ubwc_version > UBWC_6_0) + dev_err(&gpu->pdev->dev, "Unknown UBWC version: 0x%x\n", ubwc_version); + + if (ubwc_version =3D=3D UBWC_6_0) yuvnotcomptofc =3D true; - rgb565_predicator =3D true; - break; - case UBWC_5_0: - rgb565_predicator =3D true; - break; - case UBWC_4_0: - rgb565_predicator =3D true; - fp16compoptdis =3D true; + + if (ubwc_version < UBWC_5_0 && + ubwc_version >=3D UBWC_4_0) rgba8888_lossless =3D true; - break; - case UBWC_3_0: + + if (ubwc_version < UBWC_4_3) fp16compoptdis =3D true; - break; - default: - dev_err(&gpu->pdev->dev, "Unknown UBWC version: 0x%x\n", ubwc_version); - break; - } + + if (cfg->ubwc_enc_version >=3D UBWC_4_0) + rgb565_predicator =3D true; + + if (ubwc_version < UBWC_3_0) + dev_err(&gpu->pdev->dev, "Unsupported UBWC version: 0x%x\n", ubwc_versio= n); =20 mode =3D qcom_ubwc_version_tag(cfg); =20 --=20 2.47.3 From nobody Sun May 24 23:31:55 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 B08133F5BC9 for ; Wed, 20 May 2026 14:51:57 +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=1779288718; cv=none; b=btPNnSQKlPMI33HjS1AvE74ppZ3S0XACaImg70FvyIP+imRJmH7MQ5ceAtDhVb3a46zsp0RDnKmJ9QNeCM3+wt6Fx7PYlRdLiPXeY/F6PwpuJXuK/OaArAs3H5aPkvRXKOaU4XrnkmWvX4IypVpKpqYJ4hZ7hm9Ev+26HKQYUaY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288718; c=relaxed/simple; bh=Thp/IJnKPd7xQIcLEgMC3qoCNBhsyqRUJiNUBJx6MWM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XCaBJR6WCUBTj+I8GZOraMblcUgBTLFsRMRCLcZBQxe4DzlDScGv8Y2cRAl9aLDJYQxcWaCi0P4F1c+N0infuS2nVULivePEHu/BLKisj6zSjTBnPtyAn/bTE7tToCsSudZ9aurGN0mXFuCJEFmYAQcY/wlLpDyBN1tTsLquKi4= 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=H7lGl3pm; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=W+3jFeX4; 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="H7lGl3pm"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="W+3jFeX4" 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 64KDPxon1725756 for ; Wed, 20 May 2026 14:51:57 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= i/qLGSxqXwwwVGUcv6G1OqxzPF06V6e0wxfns8XSMAw=; b=H7lGl3pmZ7DeVKvR t3KyEof3XnqrMGQhsI32Y2hv86/XWqFckrOLv0sG7YiftZpm16D2NnX3UspeXRPX jf/Ca8aTn+nfMJDz+zo+WQE57IsGXW5CHm+Dh2NWxORBA8mfkQMvCBF0nKerflDQ zrI4ERZvF3jkxeJA3UswS8zfR0o0UhTTZmLOAcMs9hGaSAPFjd6d4I8h2/8HHI3m NxRiqQr4c5VwcOgD2mXHcpNO/2gTg4VCZZ02QxhXlftK5SYcc3BXGIpnCQU5bPXw Ch5ciyQizL4qXzelVhm1OfnEsVIKnaMGLx2tJgkOdA3W2GOUNcMA2+KjBRObzpZx YzEjQA== Received: from mail-vk1-f199.google.com (mail-vk1-f199.google.com [209.85.221.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e8t3qn8x5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:57 +0000 (GMT) Received: by mail-vk1-f199.google.com with SMTP id 71dfb90a1353d-57536338b89so3691887e0c.3 for ; Wed, 20 May 2026 07:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288716; x=1779893516; 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=i/qLGSxqXwwwVGUcv6G1OqxzPF06V6e0wxfns8XSMAw=; b=W+3jFeX4AVi9fUqa6k5IxvFO9AkXSdKUf6XY6iEojIptZ3neQBJOHiBEATa99yFqVl rX5Js9WKxA4jJ9UHnM2sSMapxNpdYVS3MIlewDjmHdKh86YIw1n3b4C35i4gAF2wqdG+ bVMcqOwFHsMMStUIQzLk7oNeNy/jyPhq6+zrnSF7ulHX/WinJ2IM/Pe/0mRhyxBrzUWE uL3nFzZEiKABl+8nDvIgaM5BHRbkilZnQOyzSRTNwEwSFc4Iq9UK1Vo85sPH+7ZBToWd pcilAiqDWkYbX58t8G6v7Pv/y+8mVPtw/0JsgVAJEzT/kzgOz0Zv4UWMNIYqeToiXKNf qJMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288716; x=1779893516; 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=i/qLGSxqXwwwVGUcv6G1OqxzPF06V6e0wxfns8XSMAw=; b=cXLAYEVz9hwOJWrJraIjIseVlc/x8Ip2CL+HHOVM/ALe/RZrQFyc5GBo5ZRgcQbhPG BkM5K/jExbHOSBx/dCaQf5k0OCPPEm1ATxdYnRyu+8XhooV3X2FThkq+MneFKWL8PLLD ZanEs/t0T5SYzNCqssOq9E3rNMOWbW9DFPEM+HfbcHhGxG80UkFJYdSZM9gPeWGLiQPQ ar6rWYI8+QxM8/M9VlZlKL9OUk+YGqtA+TDKfPDA7gpbGSnF2EMKsy9NT6+TB0Dyq92W HYk1kUrzsw3DCv1LKKpCJ7gxe0mjuPg18YljPQI0/4IP/Jyxf+pLkPUkK5/H7AJEnSdg lIqA== X-Forwarded-Encrypted: i=1; AFNElJ/HSzH8aJIiH3VLr6T8pCNnC+/InOOKc8LvThiFG/6ChVlOP4fc9YGjzga/jiR6WVStM27Lm2UphOdyhZg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4QD7MRZOo7TfPPltoowBodgzpriQtimaJVPHBtfVoI7sbaSmN szaESqRb9/h78ihZ0m1TN0UmxlVTU634CihQYF97dzUX029xsFMMEQsmV2ugkTIUdhBEobzwuLs fY2ZVWoKdipabXAuV1RM6nGd2tJjqK7Pk2uaPhEbGe7qaCmUKUx+CoDUoOglFUFPgsS0= X-Gm-Gg: Acq92OHy0TBjnd6DIwszmJ5u+PFF11zhtWL/QKYccDH6vRaqwheI/Ihy+rfeG4b4Ex0 XcILc4OvP2pBo80PS9Z4EoHg5YDO7k96ywfKHTR/uMOIYtyTBYw9zMWTs/scUO3TG+f1mae981j BbALbnzPXAe7GSR4gAlRIIBiOo6+x225pFn36vG0sP0TktodTG3FQX0bhx+83VYZ8KArjiPE0BQ iR0vRIdtl8uOhm0guW8J4lrUm2gCjJx4S4TGIfMwv8r7v45lpKQqy5sTQsPoGcYxmVUOMUEDbIZ Y1dLE2YhCDxyg6F9O1xMzi0xW8Dwi4qy0qug1odarfccyrLTHwfoWsvsHTW9rQkEiREbp9NYB+O sK8UFyw7WF8NTdgXaXGezqMi4qpGw+eeFxIIbJBkELjvW0jw9VyTP2hjF118fFZ6zFEdKEVtKUv J103/aBmTW375C/Xt+TVIaU9342E2UBKkCcTQ= X-Received: by 2002:a05:6122:4006:b0:56f:b2df:1791 with SMTP id 71dfb90a1353d-5760c043936mr13265751e0c.9.1779288714758; Wed, 20 May 2026 07:51:54 -0700 (PDT) X-Received: by 2002:a05:6122:4006:b0:56f:b2df:1791 with SMTP id 71dfb90a1353d-5760c043936mr13265675e0c.9.1779288714078; Wed, 20 May 2026 07:51:54 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:52 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:26 +0300 Subject: [PATCH v5 19/28] drm/msm/mdss: use new helper to set amsbc 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: <20260520-ubwc-rework-v5-19-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=892; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Thp/IJnKPd7xQIcLEgMC3qoCNBhsyqRUJiNUBJx6MWM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpoFFRI3WyfXSK9O95QsuMY1666C12cCQb7a cD/xKpr2YyJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaAAKCRCLPIo+Aiko 1THkB/40gP3ZEmrupD44oloIguqfQaB2fi4+QLN1aH7nBjip3cOq11gm87Vp0WFIBe+F9Dbr2ik RVv6dOM4i4vQtKJ9cTcnnrpUDyQFZHq5Pad+CeWuo2vAD8Bt5haj/ZBFjchASZelUuXKl8PUXfu zpy8U2ASXM+rLmn2kHEpIXkGHzy7b8fQVUfVOU4yPB+HfwVdM8QbMEOnURihVImmq7/QS4Jz3R1 EEz+7h3zF6EYtcNle3X1EFHhOE8f0aH0QgPr++PbXeLi4HkLc1qUMkc5Sx2yc8r2c65k6HOOSFB Toc+jMm2Q6gSRXpf/0kW3+gsX4yScm/XS7COufOKU7Kn80IR X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX+VOCz2gV1CeJ nvJuHh1aouZ4TFBm/TS5fIiYt+9X7tLlwb6ibFkM4i7CiWcIzxABVEeiQmuIsOSfXX6jVQ4nsRY CagiUqkH7k9qUzXS0/4VkUHV3F7Te1us5E34e4rKN16YVxNJn5TgNuOvj7VTXI88nl4NPk4D9Ao zZni/SXX/M2X7uikqdK8AtqN5WOoqOc/qTjWqWj5iGOOtrwneyqr5DChHe5TtuQg6xJXh/CIgqc FS5MVLR/lCr2UqG0I+DuqQOIEFB3gH74a0E2puW7qdrGrjFXa3XNEZKUP5RY3Hcv2M9U4tUS1Am cWjY3vQgo6b+9/VB1zXqPSKkpOJgKB7VmcULi3ySBCfLEByWDQ8mjiJPsGvanZxeZrwiasV0dHa 9itj2aN28/kic3L6slRTJY/+LHqEkennULQSH3Zggu94v5xgSe8LW0BTbeOn9YMtcuQgyoM88zP U4Am/zY0durI6Tq+8TA== X-Authority-Analysis: v=2.4 cv=N9cZ0W9B c=1 sm=1 tr=0 ts=6a0dca8d cx=c_pps a=+D9SDfe9YZWTjADjLiQY5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=o_KNKqYLTMeQBHdYLnoA:9 a=QEXdDO2ut3YA:10 a=zgiPjhLxNE0A:10 a=vmgOmaN-Xu0dpDh8OwbV:22 X-Proofpoint-GUID: DPlSL4PQAURdpdSvVLGQYazFtuy9fcHT X-Proofpoint-ORIG-GUID: DPlSL4PQAURdpdSvVLGQYazFtuy9fcHT 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Use freshly defined helper instead of checking the UBWC version directly. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 3c1f04f12c3d..4b230868ed90 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -188,7 +188,7 @@ static void msm_mdss_5x_setup_ubwc(struct msm_mdss *msm= _mdss) if (qcom_ubwc_macrotile_mode(data)) value |=3D MDSS_UBWC_STATIC_MACROTILE_MODE; =20 - if (data->ubwc_enc_version =3D=3D UBWC_3_0) + if (qcom_ubwc_enable_amsbc(data)) value |=3D MDSS_UBWC_STATIC_UBWC_AMSBC; =20 value |=3D MDSS_UBWC_STATIC_UBWC_MIN_ACC_LEN(qcom_ubwc_min_acc_length_64b= (data)); --=20 2.47.3 From nobody Sun May 24 23:31:55 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 C1D713F65FF for ; Wed, 20 May 2026 14:51:59 +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=1779288721; cv=none; b=nZXyxzC+ODSUMBYU+Z+9rjKoUBuHBrJSuzKkgMJ66Nro2YaV/+ps7xyZFdUJaRrUfCF7kUQnsbAEArLZvn1Qr8Bvq5MHRu15nstP07BAq7lXRCn2pE0vqlI6m0xEKTvFhIRps2J4sJh675dHARlMsxc1+zOeSJgSmF2Yku38vZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288721; c=relaxed/simple; bh=eWTJTWUL783ux158sDIK3D1pfEZ6TYiZyg3QZi3K7zQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AAqXbFOnd0tnOm+aE6wmJ4N+d30DyTLcmjJ6xeYQO3PkVznXUlW9rHkkmfaIEincNBS3/gyddNqGfAGkvfj90IZaDagqhnwP9da9AT+1VZ3XL+gCVt43/l+EkNF8VLYKZE3M+p0Vb0US+PvOuZXDSQi0I9GMDGIxYOZw+q2vwSA= 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=P7hMz+vA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=V5NzzVeZ; 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="P7hMz+vA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="V5NzzVeZ" 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 64KE2KtE826523 for ; Wed, 20 May 2026 14:51:59 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= JAOFJSnWiBy82M4+mbUAjlJ2kFgTEHkTViqywRBPv8Q=; b=P7hMz+vA3NCsGsCE 4QC3v9I6qxT8sAHATMHWvOrvJMFnEWziB1H+yhPYMRUAOAqazWkM8rsKHtFtpX9P BG3/X1tvFnGkuG9W2meU7Tbb8GWh1SYI9eNUE2NWZkPpLbe788fPKp5K3LzUhk1a cjw2wiTNrLfMEtQx8Tjs7h7EpChyvprVJ1SHvLmmXpLR0Si3hZb3f3CE9obGQi99 jY1+OjZPvPtcykUNCvNOrF1jg1bnnanQNClXQFm7NfUPMx+s1UNJ+9F1as9SwXrU GwENKOFp912pWhVVNEDobRd6GMrAwGNbBc9QpSjn98faSWh7mF+Al4RjfcdSpJIy A74D6A== Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ecag6gy-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:59 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-63302aca17aso2594607137.1 for ; Wed, 20 May 2026 07:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288718; x=1779893518; 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=JAOFJSnWiBy82M4+mbUAjlJ2kFgTEHkTViqywRBPv8Q=; b=V5NzzVeZFM04eAxWQfm0YHov7gkgZLHr5Lgff1vLGIHiu0ci9sRzRmBf36q5bkBi62 JOY51NvUK1MnruWsbaVNKZ9AGxsoeu2OYqpCl5ur2VbWw0OymkaA/3EleIsfz71w5DCN 5O43spmDQ9iX0GTlWCiRpdNpw0FRxvZ7GpoZmAkK/WONN1j6t5MmeHhIhOxG3tnleumg qCaG0fYMG5rY+NykqmseDtlsUIyNyP7PapC89qHaZQdsFQjCXw41gRBC0KueLJ6fcowB bKx1WGXjs1eBVsyKcxI0kc3/7PLAWCKqu0vnIMTI3/clBYHhnONb/BurG1YfkI4zOzJk EJfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288718; x=1779893518; 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=JAOFJSnWiBy82M4+mbUAjlJ2kFgTEHkTViqywRBPv8Q=; b=f/DO3UM+igZWQWQrdjg/wBeTa5WrJRxK/YC39wR+5bPdFPKF2sy7KOyirOyVjXryl7 JacJEa9U3+HCZSrw2jlgI5ADmRTTWcvp0h/fxSv3G/Ws2XF3WMsidlJB29lWHkILkQKC jyu4wQpwWENIQXkdiCdF3J+mXjOx2myPnqMncyY1dwXNP83HT/ks44CA/76IWFA0wf9r d2cHRVrjQSA3955vjfC1Z85FBRIse1oBtaQJpCrhAcOCSvsFJAT68SSjn0Knk8RQXDd0 a3Nt5p7EFcKpui4nQeRRHKOsQAWRXgjKsHJ0AXLzvuDxKYjyWbdTDAWJRsw7BHZD3div JNXA== X-Forwarded-Encrypted: i=1; AFNElJ+CMnqgGDhQe6uDiOoPM8MWajfg9QQAjuo6exmAmzlWI10nFYtkEeA4Y3LN/NzhmYcPq58N1gSPMbdyA9E=@vger.kernel.org X-Gm-Message-State: AOJu0YwTByIy89doUNUrqTVJwAh8X3PrDBz5LhIHKnumbGp3vq9U6Pal 9fsSz1U1t5HZFGuDuEVt0LWiEjP046/DJM7+bhANou5Fl4Nldyx/OafN8GxtdV4wdmixHZFAcYz e3FCYmqaFPe3LJ0goz4vXVQ6nuoN469ASMtjKqHrNRyPckNHHSAGo4i7SztGGDsEgtvo= X-Gm-Gg: Acq92OFmUI5jXeGS8C+WmYY4rO9XmU6Yy3ttpHjdolVvh5eP0V0kpBEe8zyW+4eypja WkScLsDZ/4WkRqPcmO8/aWloAj3SzkPRRQj2hm1l9ZR9W0u4rDwgfUcFPdH5We3MIyiAmPlxpCj n2r044kOoN/pLE6DYkvyl+O3UhIuuingtgtSD7MOv7TNqTwZV0xfnvjxfVVeRTHxEAV5Tc5Trmj jtGfISfGCW6dR076D3OxLD3Q1w3SazVJtvofSYG2a7RtbJXB+dRKENxNyu+TWuDw48Nz0znoKhT JTqyICrcb/otTin4W8+2htwS3QGQ/vXawBWEDwisMIp/xVIYfn7nDAmyPoU65tqCa1Ehcu1dPtb Vmy40gXzoOYxz+JKJR+sOPLRgAODcaWTSnHP4sSKUCrEPDiH6B2MqqFx21ARUEEL5yguymlblLw xrgo1ufwCpIPFyj7YQaiaWJNvTm8yluQrIaM8= X-Received: by 2002:a05:6122:6093:b0:572:36f3:e792 with SMTP id 71dfb90a1353d-5760c099739mr13100965e0c.14.1779288717304; Wed, 20 May 2026 07:51:57 -0700 (PDT) X-Received: by 2002:a05:6122:6093:b0:572:36f3:e792 with SMTP id 71dfb90a1353d-5760c099739mr13100753e0c.14.1779288715950; Wed, 20 May 2026 07:51:55 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:54 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:27 +0300 Subject: [PATCH v5 20/28] drm/msm/dpu: drop ubwc_dec_version 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: <20260520-ubwc-rework-v5-20-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1131; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=eWTJTWUL783ux158sDIK3D1pfEZ6TYiZyg3QZi3K7zQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcppsllJZkno/Skw+O4wXgaexZO7P5t6Q9FGk TeypT/FPneJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaQAKCRCLPIo+Aiko 1VKcB/9Hjas/KBnLvigl5vj5BzZ3aiHBgOxosDr6Q+pF6sULggHYWAQjWwib85XFMGQ2E+WC4Pz PM2oCjrVSvtZLyp92KZLMGkKifHVRVdSNea+ntU1JUbSOddLxu2skeykUmpY0m9Yo2MUMCFOIK8 UpUEk/fYYWDhF5TurMBWGg/5uZwLZd+KDwaQyOW0wuJqg0vwhQEpuxcDOD1q60dsUDRKLb8kDl2 p0iOuqIsOCYaKdWId9CPJeJlD43nMvuT0x7pvghYA0M5RyfhxWZC5xue04BtsokfvlZbfyQKha7 7cLiAKeRAWuLlr0No17R0ODdBo3VEjJ3xRKlx6M20T1HKRvx X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: saKwogf_-jkz-FQa3z96GLiE02l-G6sB X-Authority-Analysis: v=2.4 cv=WqMb99fv c=1 sm=1 tr=0 ts=6a0dca8f cx=c_pps a=N1BjEkVkxJi3uNfLdpvX3g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=OFVxzADIxEWc22agC70A:9 a=QEXdDO2ut3YA:10 a=crWF4MFLhNY0qMRaF8an:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX93hnJ1SNquhi EYa2PgVXr4XX4HAdk+yesCJacqGubIHVaM8//wx80N0nCbejjAIwM6bT2XtPyuZhj+ZAg9hnQcm h+pSwMfNLXMlGvA23BD78qfKN+DrWFa69+ixtu6mtBMrD/6L+lVhzWIZ8P72CmTFNQ2AiBbIrJo veyd5X7WmqMu7Blg9ccFo0ounGobpJck1j/5shwHwtSygVhbSt27nJpQlfqb29YT7T8na/4MMxz 9sesA8yJ//by1Q/WKWWHTQXX0ErzuQ5QALUeVjzYeizSKz3H5lujQoQ8RTernKZUAlsV+DiM3oj Di25XXmczQNpgYp/SnXpsNDtZ5aoxgSU5BAiSeFy5xrZXK6JBlMqdBoGTIh9rIgRkc1YvEW+kdo BzAtn5o/YtknzhkJfzMgXNR8PVtjcUKjiiSUUmzlJdwJT5Rv+9VAm3C5BoFLt5hufMCszVFYEho 9FpY+yFLEdvDfhM8+sw== X-Proofpoint-ORIG-GUID: saKwogf_-jkz-FQa3z96GLiE02l-G6sB 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 adultscore=0 malwarescore=0 phishscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Stop using ubwc_dec_version (the version of the UBWC block in the display subsystem) for detecting the enablement of the UBWC. Use only ubwc_enc_version, the version of the UBWC which we are setting up for. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.c index 5642f3bc3568..7b92082d35a6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -1781,8 +1781,7 @@ static bool dpu_plane_format_mod_supported(struct drm= _plane *plane, uint32_t format, uint64_t modifier) { struct dpu_kms *dpu_kms =3D _dpu_plane_get_kms(plane); - bool has_no_ubwc =3D (dpu_kms->mdss->ubwc_enc_version =3D=3D 0) && - (dpu_kms->mdss->ubwc_dec_version =3D=3D 0); + bool has_no_ubwc =3D (dpu_kms->mdss->ubwc_enc_version =3D=3D 0); =20 if (modifier =3D=3D DRM_FORMAT_MOD_LINEAR) return true; --=20 2.47.3 From nobody Sun May 24 23:31:55 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 050793F6619 for ; Wed, 20 May 2026 14:51:59 +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=1779288721; cv=none; b=d0VAinM/X14JrknVrzcnD5umWqhmRd9+m0LVcr97YrcJvBhuMLNMTGjSF4wk4csUYMVBHmOv3taTtwocJDQLR0+o6MF5QSZYo+tmi3CbCpjnmmdrkuTGfxqCtuf+i0QdPgFDK5vCyKlwmBIQM9lOUneqQH5eFXKDUtmPDJiDTWw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288721; c=relaxed/simple; bh=DoG4I3IZOv3niHJgYIouUp5Khp2qZBqtf+51O62ZQvs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cETNh/0DHvDn/KmUcgPfm9xRutrbJ9V54no6YzXE+Nf/cxafqIzW0E4DwsYiGCDVeEFPQ6P7nf7kJTvzubckAgYzb9I6Gs+6XaAzFSQ6plqB/ZyIkFXquwx2ym4k8Na+tDwAWvgIOpAcI/4jiUGABvQO/xGtvUZN2Re6vLA9eXA= 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=cXlx5bvW; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Opadq/sf; 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="cXlx5bvW"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Opadq/sf" 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 64KE2OMI826609 for ; Wed, 20 May 2026 14:51:59 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= 65lXVsMjORBSo8yjl1njsl0vBunig5XThYQyN3YvEAg=; b=cXlx5bvWQP/FaW+H rTU6D5GCOT30CwedePsc8rCs7R6wQSEuhOy64TTDq5OlNr6csAvSNWnwNTcXMWvd dy57QdsDIpw5mQ8b/orVq0rnF/nvskN0CMe7e5pEmuQYNCdqXpc8zlCUFlSS2JUA peCDmfoRpGOqiZuYA92eQbrmI4z1/zLEQJq/hsy34xxZsZgIq+c2RCj1Jynms49d 0W0hyVw1Oj5VoplGvvDnsnz9mOxL9I1OgH5z/FvycOFlPcRygjbLbdeSzHz/IqQL 3VkrnGyjkqmSmAkKA+9Bys8mSyB6gY/Tu24sLk5xmdQjBmf1ZcdCuu7dEjT1FsYy qM7Scg== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ecag6h0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:51:59 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-63309595daeso8740225137.2 for ; Wed, 20 May 2026 07:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288718; x=1779893518; 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=65lXVsMjORBSo8yjl1njsl0vBunig5XThYQyN3YvEAg=; b=Opadq/sfXvNK+nS0JqzTkdIcRsFkWETnW6cugVNIB619NquG372bsupdIsVccbH2hr 3rDZ1g7KTptEc5oMpN4MNXMzD4uu04VHzqT18oglftn9rkrr/IIRMcAfvsLqCk/B3FfS IsqvdfKG6p3RpxsLSSXbPb1U7X7yOIwEORm2vLGsApE0ScRgl87iByNvi3ESPKYXPFHi zc+iQvY8sar/2LU9E/fwGf1dhtlmcKhuNz0POR3vXtOJmFdSnYjWWmP/e575EoJQz3tM BatopXmZ9hV6Qnuc0uQiDJtYmM0RP8PnTOxj5ii552wglln3IhF+UQ5RR/R6+QMRiJMO cyng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288718; x=1779893518; 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=65lXVsMjORBSo8yjl1njsl0vBunig5XThYQyN3YvEAg=; b=cI93eqLjmDMsfgD+3zH7IUZxZ2P6jST7HL6XDin0JDZpLJAjDgXehhq8K+/NjSlkf4 ThpfyohrjcaM6MeKBs9jPo/TbwSR3MNEE6xdCWszN3tEr5xR8mmOePK5Jh0vNzjGs3vp Bylqr60wmSiLXtz+BqFmk975jXDINIMsBklilKyo75skfZyJDkm9MTXeddqnI8GzhbWU VX+F9nxbPpcUFFCnO249dKY8E9sFEB0V5r2fxQUD21hzb7JecIpb5qeIbomm6qnKl/yb kLsRiuv19XsXucDbvoMRxNnFEwa3zMxN+RgNhpOGGpl/ghweH4GkGR5sS2xwXUjvwpMB QRfQ== X-Forwarded-Encrypted: i=1; AFNElJ9aBE+Z55AeVqQ88UuME7wD6X3HNhdxWDUEeUqDUqOV+3uWPNaFfQmZy7IhhjBheQbkyjDlvXVKGqO7j3w=@vger.kernel.org X-Gm-Message-State: AOJu0YzwUCXZsKlSxt3T7AGO8riwDfW9TBdNT0RQKTsCS+IODUj1UmWX KauAGTmfE818jbeY5ztq+eTDy6iUsm3jeI8JkmSJeEIymm3qbaLgqDl2wrnKgguaVz4menSi+3X HZo8aRAhaf2ng+EcwqajPblK2xd+jOH0IvrH1a8Ni/VCS6IM+ZJQQucZ6e/MX1ybJTJQ= X-Gm-Gg: Acq92OFJmrFR5FuGajjgC1vpgcjnQq3ykSsQKybtDXnFAxH0dm7yfI1PA/Y3DSvkrrp zHbhHSG0MqKSZwElAx/SxyMGpVLnBKlNIGZkTC9ZfnBMYKq2fLRcUphuidkxXH/HDU3Rr2dWWud WH3jLpn4YELQP1XYMTJ+wzRU29QHHvrnQk4qx0lL4zYB2+BVKD7S6jg9S3IesVhppRPFLo7RTfy xC7w+2c20ilTMdHRc8vMnlCLoFZo4RW8pAnbKQFPTmQ5UpJ7ABhM4Q+u7B5R5XlwCY32XfCwGTS Uic2hO0UDQahpfZ/XxaMeIghqklWZuZfgtQ78txFsZb8Pzzz2iKh7FpDpX99gSsbLud+fSTy362 IAqftviICwdHxH+A1EvGQZwzO+C4yiZJMOYN8kgo4BFzjbLvjI/ZsOz+KA/f+egNEOpAtG5Co+m e9ci7smz3f/0obEJPUoEF3aos2rjaEfzYGzqw= X-Received: by 2002:a05:6102:cce:b0:633:4d1a:65e4 with SMTP id ada2fe7eead31-63a3d6345a3mr13574211137.12.1779288718117; Wed, 20 May 2026 07:51:58 -0700 (PDT) X-Received: by 2002:a05:6102:cce:b0:633:4d1a:65e4 with SMTP id ada2fe7eead31-63a3d6345a3mr13574174137.12.1779288717500; Wed, 20 May 2026 07:51:57 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:56 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:28 +0300 Subject: [PATCH v5 21/28] drm/msm/dpu: invert the order of UBWC checks 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: <20260520-ubwc-rework-v5-21-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3192; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=DoG4I3IZOv3niHJgYIouUp5Khp2qZBqtf+51O62ZQvs=; b=owEBbAGT/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpp1kI2p6oY/1w1wnwOnWK9lPhmL+zMvJ1IF ViErCstdcqJATIEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaQAKCRCLPIo+Aiko 1Wv6B/j1W/lfX0HxKR/gmLivHaUYDny9v75ppJUh/a4v9ZuUk3top9SOIjhHp7Jm+dE0c0GXM/H p0z4wob8iPEDk+u23KORPShQ32vu/Tyz9ILfvIog6v1Fr7HQb6cMCmygsCKXba923BERKC50l36 fUf8wDRDoqr2forNwRkjcTJOfnkbfsKthVqehFD3nXQPYuZYTYtZrirPEfPyBzX/ym1JGPJUQh7 dGIwvaxqehrQEpGmu31gCTyk/YvY1HfduYiZj7MaUF2IVcPBBkNJTa8L33DfFM8kYpZpEDxQSx/ wzWxK0oPdajdA0C/jZL8ZOnqCFXDbFhp7XAwO4t3UcVt70c= X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 877DEjZLK_4WT3NxzJwicUibB7FLmEUy X-Authority-Analysis: v=2.4 cv=WqMb99fv c=1 sm=1 tr=0 ts=6a0dca8f cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=l4KHnsLLE-ungWRp-RkA:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX4LzEPo8bECYw q4gAYGHAXLr+T5iaROOd5PYEG8Iuv7r/5P/BVD1kYCssfFLhrD7mevewFXtfkWnEA/Q278MnFXl bpg3w8CdKkWz4lQBRbkn/WbHxEx3deaK0Uuul4BwIoCVL+VRm1JMV3j5xeZsWPf7Ue3IRiJubdT dnPgW4MJCE+3eZTPICXWfwu5OoxRkMt60wDryOCnLjnFKboR78sMhcO3g22A9EEcW2QYz6XJj7h Lp7RgzgYCjrTwFcm9eBruswSYtFc6ZB3rdA4ZEul/L3sHDcauQ89DmPcl9PI8aiKbfxVkSutmSZ cAP6eA82bnBiPOPYamOO0g/k8gVggHSR4AKjjgn1FFPGIAieT5489xf7gjFzKU+IRzxf1ZEur4n D8Kb9hbiEgld9io+eU3z2C0KVbPY45NZRi7fEfICzvUVauX9XHhfolYCUfaGEXZm0DTXAAr5/oo hAbxGagEbMh7OGkBWdg== X-Proofpoint-ORIG-GUID: 877DEjZLK_4WT3NxzJwicUibB7FLmEUy 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 adultscore=0 malwarescore=0 phishscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Unlike other drivers, the DPU driver checks for exact UBWC version, making it hard to add minor versions if necessary. Invert the order of UBWC checks, letting the DPU driver handle new minors transparently. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 36 ++++++++++++++-----------= ---- 1 file changed, 18 insertions(+), 18 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 6089a58074ac..b5e50fc1916f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -310,35 +310,35 @@ void dpu_hw_setup_format_impl(struct dpu_sw_pipe *pip= e, const struct msm_format =20 if (fmt->fetch_mode !=3D MDP_FETCH_LINEAR) { u32 hbb =3D ctx->ubwc->highest_bank_bit - 13; - u32 ctrl_val; + u32 ctrl_val =3D 0; =20 if (MSM_FORMAT_IS_UBWC(fmt)) opmode |=3D MDSS_MDP_OP_BWC_EN; src_format |=3D (fmt->fetch_mode & 3) << 30; /*FRAME_FORMAT */ =20 - if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_1_0) { + if (ctx->ubwc->ubwc_enc_version > UBWC_6_0) { + DRM_WARN_ONCE("Unsupported UBWC version %x\n", ctx->ubwc->ubwc_enc_vers= ion); + } else if (ctx->ubwc->ubwc_enc_version >=3D UBWC_5_0) { + if (!MSM_FORMAT_IS_YUV(fmt)) { + ctrl_val =3D BIT(30); + if (!MSM_FORMAT_IS_DX(fmt)) /* and not FP16, but it's unsupported */ + ctrl_val |=3D BIT(31); + } + /* SDE also sets bits for lossy formats, but we don't support them yet = */ + } else if (ctx->ubwc->ubwc_enc_version >=3D UBWC_4_0) { + ctrl_val =3D MSM_FORMAT_IS_YUV(fmt) ? 0 : BIT(30); + } else if (ctx->ubwc->ubwc_enc_version >=3D UBWC_3_0) { + ctrl_val =3D BIT(30) | qcom_ubwc_swizzle(ctx->ubwc) | (hbb << 4); + } else if (ctx->ubwc->ubwc_enc_version >=3D UBWC_2_0) { + fast_clear =3D fmt->alpha_enable ? BIT(31) : 0; + ctrl_val =3D fast_clear | qcom_ubwc_swizzle(ctx->ubwc) | (hbb << 4); + } else if (ctx->ubwc->ubwc_enc_version >=3D UBWC_1_0) { fast_clear =3D fmt->alpha_enable ? BIT(31) : 0; ctrl_val =3D fast_clear | (qcom_ubwc_swizzle(ctx->ubwc) & UBWC_SWIZZLE_ENABLE_LVL1) | 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; - ctrl_val =3D fast_clear | qcom_ubwc_swizzle(ctx->ubwc) | (hbb << 4); - } else if (ctx->ubwc->ubwc_enc_version =3D=3D UBWC_3_0) { - ctrl_val =3D BIT(30) | qcom_ubwc_swizzle(ctx->ubwc) | (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); - /* SDE also sets bits for lossy formats, but we don't support them yet = */ } else { DRM_WARN_ONCE("Unsupported UBWC version %x\n", ctx->ubwc->ubwc_enc_vers= ion); - ctrl_val =3D 0; } =20 DPU_REG_WRITE(c, ubwc_ctrl_off, ctrl_val); --=20 2.47.3 From nobody Sun May 24 23:31:55 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 61BE43EAC8F for ; Wed, 20 May 2026 14:52:01 +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=1779288722; cv=none; b=janBs3qa6dubCYFLQNU4hQiUIIvZ+kyx0ZluWmTg2gM87vCxGmR6xAovG4WEWpyNzIyT0GHSgRIPt3qfcaT2kTboluWmCdqX6qxqkwybcOXFfT/GJntBr4NsANE6imsiviMHZlF+y5PYucPyih7MEr8/CibqyC/QyQ6lAGMcNvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288722; c=relaxed/simple; bh=Nxn0ECja9MOevPIO6hY4R3LL49hKUqZQoSFEB/QFA80=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g7foScZeax3bMRUhcMXp2uEwRhIYD8lw9QlAQmuQHqrCHK0QkhWQRiKDTFAeo/hyLWP7SReYlOrSFlDGgLLkQRnVyJM3XKizKEHjwLQPRv/HPNMGbQFb5R9lmgh8RRfwmhUdg7R0//00Y+cMFZ5lwFF/lakVRErmEVmdCRhfwts= 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=b/kLwfly; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=U1s6q2ob; 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="b/kLwfly"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="U1s6q2ob" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KDXbgk1797936 for ; Wed, 20 May 2026 14:52:00 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= HGml7biXVVWjOOR6Y1Gdb7Ld32RnBgrsNfRj6o0i/eM=; b=b/kLwflydCkC2Ciw kFMu/ey2k8Bi8oimviQ7NY/zbR+HX3YKUz+cruiz6XGpmeauU25S4o0DIROda8RN CUbSeVFt5XjXJjAWRogUhATQdXZdz7cyjO0tNwQBCs4oXlcGxwz3G1eEMp8M1/b8 PrLo7iK8xCg1W0WxqyxKRzWuIzr+ZNMUhcbTt/6Z2E8cJbHq3ldimJTwoE4wHDFl VdeFLfcuB3/ojPlRPVHcQRsyieWG0aQDb5iiV9Zs1Q5XXHMRlTegcmInTyh8jWMw lvdrBGUZz5MgfumJleaZ991y9hAHslKoqvECKl5iGfFtjJmp1Jwevaxh3nefnqaE yTvHug== Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9dxu0a2u-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:52:00 +0000 (GMT) Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-632ad092bc5so8997979137.2 for ; Wed, 20 May 2026 07:52:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288719; x=1779893519; 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=HGml7biXVVWjOOR6Y1Gdb7Ld32RnBgrsNfRj6o0i/eM=; b=U1s6q2obyNl2u+l1jnFHcD3qlp0KWgCEenO5i+owALTXuKYI+Anl72Xc93OoPG1Z3H 2jUBzsFm/uDTpjUDZo7atbKsKfXcE01amzaxo8XSm9el3Locd4fovbxBzb1Ju81tcqiJ 84GTj9FEsBdo5A9y6RbLYmXkMjylJP+MvOUMft1pJ15Zl9Lj9JQBeslWP0TQKd//jndl oJhu7uNl3K2sDRzl53PQqmFOAyusgMmgfsxwnxlhZlaoU85Kd0rrMPbt2uaaDSLnAGdS HlCNbXPrSQ6UVrsPSRXIEnY0nPPNBuQgSDGBtuyHImLj7drVK7OOXEDWxcF5EEa9NV0D dr/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288719; x=1779893519; 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=HGml7biXVVWjOOR6Y1Gdb7Ld32RnBgrsNfRj6o0i/eM=; b=emjFShBu9Eacc8rddI6Dv35sZ3ZFwvgIGHSBFCEFfo65CdI7lmPm0sHsALdUjXEBZC 7ZsFdy4XZffQyDzO0i5n4gi72ck8y4OkROIlesynSovdwlZIqd5y/+CNNuZY2d5Wn6aQ Vlm66IFGRK49y2h4ViUjg3wlMgoTNr2+2xjlO2jus++r2NwDtLCVES7E+/v1JRWbSpCp qHXdpoCUDtu8YcAVw/QgS+V665xdk0dCG4r0bIGdAvxdzqm9N/eUJoBQxgCO57tfZTXq MEZMgoiTVG8NoujdmlU1fSijT8Ki7b4jeHF2Deo/6c/FsqKMnWvOhrROk17i9qybAKyo Lw9g== X-Forwarded-Encrypted: i=1; AFNElJ+G5xqYzzp+Ct+SycVGWE5F80aWi0YudcIJr96Biy6ZUEGXytv94Jb2HUfwGnByWB04vqdVYl7yvblMbHc=@vger.kernel.org X-Gm-Message-State: AOJu0YwQomCouHl+3pApF38me6O2bUIMB8kBUEcqz1VZmqSChTQFqEcV fsFFFOvN+mnlsxOHlRWCg0IBX3uaKFb4tbjoA1Vomz8XE9/oAoGMdj6SOu/FdpebARwhphtDhKQ L/9ljz6Pad5p0KYV0L4+w9Bk3KXTDTlZGFL9B3S2E8RUUyCduME1p5cOwsvydCBjE7X0= X-Gm-Gg: Acq92OEpUbZS6+5qQOir8E+HqmsLvF0PCU+fdx9FKblV/60DqrECaXmZw+SdoCdMisW pPc4TdDUIZdltPiPP/5OLJKK+aLOL7/JEEqTsU9jg44PeOkliia2Pxi6xgKGwl5sX23WclMWG6c TwC+hYDpSTuZ4P/jTjzf7OVFaIUMJBGZt6PTU0+c74g/QDKx7ZNNs4D2J0LR3ki7VLTjcoEQia9 eQ8KwX0vD5frX1o9pEXkexItxOMmG/+Kb0poPzR14/0Lfr2UanxzJC3AO7NpPQDxnPYnnCTbALy Ky55LnvaPj+GwMmlkxvnMysZ9Yv39M45qdSGT2o5TmrRZcV+8xpnz3v316LznUoZ/OnSGHkxWBf J7M3dsYvvZg9470ksCg0UHKN9T7HD3J/qFO9+OA0UNTyup1Pgl26whXWxXpPiocWSclXQxpHPeP bwz3P4uvf+//cmWs7ZoGCBe/hog7jAmrRHT0s= X-Received: by 2002:a05:6102:441c:b0:631:ff40:22b2 with SMTP id ada2fe7eead31-63a3cb14138mr14252022137.2.1779288719512; Wed, 20 May 2026 07:51:59 -0700 (PDT) X-Received: by 2002:a05:6102:441c:b0:631:ff40:22b2 with SMTP id ada2fe7eead31-63a3cb14138mr14252000137.2.1779288719051; Wed, 20 May 2026 07:51:59 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:58 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:29 +0300 Subject: [PATCH v5 22/28] soc: qcom: ubwc: set min_acc length to 64 for all UBWC 1.0 targets 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: <20260520-ubwc-rework-v5-22-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1469; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Nxn0ECja9MOevPIO6hY4R3LL49hKUqZQoSFEB/QFA80=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpp5YODtCBqznKGqIh3vbdpzCU+HnKI2fzOG sBOSSHiqomJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaQAKCRCLPIo+Aiko 1XyrB/wPZk4u1D78C0EkXEYvIzbh2sirhfwGmTOoja7BN5lMmcbDZmvSOThKitFA1FvpJIzwfFZ hjtVqthVfZ6PKFhTbyOhmpgHRGyq7Sg5qOyZEjy2O+0Rhu2UU8NgXycWS7bpx4pDkKcYsESvdT3 v+FOmROZRLCrHQFv56m25SjMDLHfCbtKzjhQEfCfJtnMpIIhAvlXsfFv9tJxWySwNfGUu4KFjAZ jGgFgLIN8jPfon00rOT1gEr8OJc8FYLVynBUMu0eLnfls7Se2JuS4PrWnU3EEeEKd5c8kshKzA5 4OKE0Zvs7JGXGcLh2niaxGF6llOjt1xuhCc7HGwW8tSFoU/3 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX54uBCPx9s7Zm 61UA+Ud7FYSWVnlcnpFUX8PE2O2OshJTrXAUuUUOC48dAy+EvT/3himhz50qXn0zm0LXdbtiX5Z D2FY0pWRA0ISkakyQrHVOnNV0V4K0Lp0A6sq0g7BSktSKB6sT7DGFz7OY983MTQa8Hf8VdFv6Yb vJDt1fesn7jqK9qbKklJnjLClg0eALM7pJ6D5yIhC8zw3boycyA0bcXyhArqaogbbXGCBrx25NX ZVmCOoG/JmOvhCpbbvIPx00/nC7ykc1ReYQJPZCnh9tS9DjygM3YBiZQ5qGPkZHZpbepsRd9g1L 3MLsg6sqv5MvFwo9ZV06+LMSyAB4jMoXvPXsORv2ZD8enbB74SgX9E/SxSb2et+pGvlnlMjqhgI 0B2wtHYoUbaoNIEeFU8dRGUtWcy17b6WyGDRGlh/DC/TWs2tcW7M7O+u/j89hwqIYLi+KCf8q7A AHhRBlgcHQHulHa1esA== X-Authority-Analysis: v=2.4 cv=Zckt8MVA c=1 sm=1 tr=0 ts=6a0dca90 cx=c_pps a=DUEm7b3gzWu7BqY5nP7+9g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=5ZsywSmvcCt_NWGkcqUA:9 a=QEXdDO2ut3YA:10 a=-aSRE8QhW-JAV6biHavz:22 X-Proofpoint-GUID: X0msLq1XcSNxEbrxxvPiBXWTR0AhDCnj X-Proofpoint-ORIG-GUID: X0msLq1XcSNxEbrxxvPiBXWTR0AhDCnj 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 phishscore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 According to the documentation, the MAL should be set for all UBWC 1.0 targets, no matter what is the version of the UBWC decoders are present on the device. The helper comes from DPU / GPU world, where there was no separate bit to control MAL before UBWC 2.0. As the helper is now being used by other drivers too, correct the helper to return the correct MAL value (Iris doesn't support UBWC 1.0 devices for now, so there is no changes of the behaviour). Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- include/linux/soc/qcom/ubwc.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 83d2c2a7116c..0b5aa9d0343b 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -75,14 +75,9 @@ static inline bool qcom_ubwc_get_ubwc_mode(const struct = qcom_ubwc_cfg_data *cfg) return ret; } =20 -/* - * This is the best guess, based on the MDSS driver, which worked so far. - */ static inline bool qcom_ubwc_min_acc_length_64b(const struct qcom_ubwc_cfg= _data *cfg) { - return cfg->ubwc_enc_version =3D=3D UBWC_1_0 && - (cfg->ubwc_dec_version =3D=3D UBWC_2_0 || - cfg->ubwc_dec_version =3D=3D UBWC_3_0); + return cfg->ubwc_enc_version =3D=3D UBWC_1_0; } =20 static inline bool qcom_ubwc_macrotile_mode(const struct qcom_ubwc_cfg_dat= a *cfg) --=20 2.47.3 From nobody Sun May 24 23:31:55 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 C29F13F928F for ; Wed, 20 May 2026 14:52:02 +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=1779288725; cv=none; b=MpjnEOQKfCS3+PXaGTpZAM6ThO/hsmhqiZjiK+GHtMb9tD4TIyjWabW3Bk8nGztZuhXoEVXej6N9x1+9r9HHGxwWJI9qaQAK2VaShmHuy8+8M1j/R4NM1UJdeNAMHAQXjSHL4qhA2SkaQveCmPj0y7AZeuOpBhzsStjgFCdZk5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288725; c=relaxed/simple; bh=GaD3OADWseoOG5QeHpQmN/nkA6MzTACq4ooKbr03Zf4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KlPQ8DZmh4VH4CqgckQQLhQy3ptKAghC8l7ATFUJUdU/LZutoialS02ow1xf3Jxhz1zBAzkZZBb3y1mHveBdLEl7kgK6sYbo84GFWnqijY5tECY4jVleykT4reDrBUFHc5896OZ7aKugTHKQOW6Z67zRK/L+O6b238RF+7ShfaA= 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=eeWI98GI; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=NhkE5sCJ; 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="eeWI98GI"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="NhkE5sCJ" 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 64KCktNL1725708 for ; Wed, 20 May 2026 14:52:02 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= VGf89U6GYhkUCRMDjtnMSMgOlYsB5OBRKvGiOBHGpas=; b=eeWI98GIgwnCxGvY I6JQkkEoPMLkCWm/7UShBuPtK36ii08I+qJl8UzNJGl96RW/R3usc4pZ88MMcSp3 9j02mJKN6BhWU5ERZ3qGNSuM2vLW45TXZa/qm2FB9fDLGA8g0TFedb4tMDM+w8C2 2DqWANcAVc7SOSty46Amuvr9r3no58Pugkvuwbg7cDmRL+7DApdGlfczjl/5N5DS MAsPczOw8Qu1kXDVF9Rj+NUOoWV7ZKj9HHTiIe4zUc+wQPRxLbllrj2rKzCTyHVi Pv71bRXHyCkpx0yUuCX9MSESFSaWniDz3Ze9fi5XJHOhKkEvt7M7IYG87XBCyYDg VswmYQ== Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e8t3qn8xp-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:52:02 +0000 (GMT) Received: by mail-vs1-f69.google.com with SMTP id ada2fe7eead31-63cbb164b37so11339433137.0 for ; Wed, 20 May 2026 07:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288721; x=1779893521; 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=VGf89U6GYhkUCRMDjtnMSMgOlYsB5OBRKvGiOBHGpas=; b=NhkE5sCJvce04CcjGm8qcXiVjrMhqy5kPHct45ulqfZmHJy0HrBMeSu0jmhAzJpeZ6 NQEWPeUN5urnKFfHfqHWZE3E1Py8NKzVpTzh2MammpuT5kZpQe4fVhoT+6QEA5VX3fnD km2I9ckEtyggR9i7nvdE39J0hZL6ZDxr5Qw5DrEcasjdXmh/CtwDSFCQO5XCpFtS6JCV Rt9oaTdRQEdGGB7Q8vs/UFhr5Aa+HM3khFDdQIm/8Mzjn6JuBf4hoJKE2MUXVEkF4G0e 8p6wd5baaAcqRU9Phre+uV8/zBFXh6BUKraH2TuNbZO7VJBNyaNiz+lAUePHfPJ50Dm9 MXqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288721; x=1779893521; 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=VGf89U6GYhkUCRMDjtnMSMgOlYsB5OBRKvGiOBHGpas=; b=IHhnhwkM6sDmMBk3sPkp66tUIk4z/PRlxlLeZo08DhieF+cNCT4/8G84eVuWQwX7Wk UEVa6PkgoVqp1Y7ndY1DsxBxVCOcFQaPhY5Nr72y7I65oT5dWnk1xg5KhHT3OFpZTgyQ 7hy9fXrqAAuBqbF4JuWWYV0iukhG7yfmlepw8gMatGLRPdLwVUkwlDb4XYhZZOThJf5V jkr7ssPf6tmhO+qtON5XOw7gR9xC1+NwclYgTkCtFP2mpWBI13rNO1HLwz04XWbzqH8G pKCovUh6HVuQYBIBH5V5Bn/no/1o7vwHiixUFJimSoATKeGwpjEFySJanRaS0Hvb2sWt ZnfQ== X-Forwarded-Encrypted: i=1; AFNElJ8y6hMOUJmUiOpkRAhUHsa2esvWf8Iw1UUcubZ7vOzZt6VwEGzxu1bzoS4k6F3MRXcwgpz3E56IrrsoibQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yxvxf63w5ne/A+/jSsriUsUhW7ilwTM6BjdDPC8y4BGFNHsOUcD 4ED79gmNsmQngjEiiiFBRy6tTDljHFBMmtvXG1tuUOuGL6tt4UyYDYtPh2KPErh6G+Ctg3ElwTy yw+ZSLJCwevcYFfYpA9fx53dNt0WKuDtrtu8grGP9Gv8vmihguQkkf5ThXqs5oEBIoU4= X-Gm-Gg: Acq92OH2vQsRzwohpcWTsLDZgqw0CA1gPLur3CaTIGYoeFqm65bloK0e9QkAcI4Y9QF IN7g5/qTyZoE0Ak3/Mlhz7rNNflZhmKq8cKK5PeNvmk9K7djcd59VcWXleA9xPluAMpG55V2jUC 5nW9nePFtje9iSFXhCgfkDSJc8iu6fT4Ktlr3XTXLJ/lUU1F95k9/1u24/QAXcxUIaOEdS2D/Lp U09s8rl5cqUpEgw+LrRGVTwM7auJiRalWfId5Tn/YiFoS83eRpAWnWNCYXbOGI23Xzbxrj9Blhn 9fAOKQwYUNw42dGzedLYlYp8ZUCjRXL0lHY2bY0py4Z8u0tFw4FlcByBxGcosDSr2GYbenVIDzG i9ec/wFaSRq5+vwShjBwNtSiNwB1KHPAH1cSDD53ok8hFSPvU6NPjhtqOVXVRCjnl47D/RT8nyi uEB6Z+0YmUE7DwRBtyjhuGXFOp+zaMf8k7iJ83Sxhl/3ORZQ== X-Received: by 2002:a05:6102:2ad5:b0:631:31cc:e3ef with SMTP id ada2fe7eead31-638b7bce28emr10836746137.17.1779288720910; Wed, 20 May 2026 07:52:00 -0700 (PDT) X-Received: by 2002:a05:6102:2ad5:b0:631:31cc:e3ef with SMTP id ada2fe7eead31-638b7bce28emr10836726137.17.1779288720423; Wed, 20 May 2026 07:52:00 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.51.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:51:59 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:30 +0300 Subject: [PATCH v5 23/28] soc: qcom: ubwc: drop ubwc_dec_version 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: <20260520-ubwc-rework-v5-23-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=8355; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=GaD3OADWseoOG5QeHpQmN/nkA6MzTACq4ooKbr03Zf4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcppazzmFMZGx4Xv1t+eKUZjtt90xnyHtodIg DntymwMSQmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaQAKCRCLPIo+Aiko 1YO3B/9PA2rwOTvV4BBcAi/pXbQ3DpD3NoXApZ+T0/yYtpyyujBJH+9/SDOjHhk8uHMXhb3C634 S1MQHalBlNevPcSDjGMuBA4uvF7y8qUKhHvO+M5XACGHYdHHZPjZTxJhJb9I53UpUY3pzyek3GL /3awgs/l3FrX+nImCwBRK2Nh8ylaYMGLMNscHR3lDHa6IGrz9twNRR9XhiJlLazgosF7jf12zhI DYr+P4Fq34PPy8JOjDPon4+ZdKIeWYtt0S8LdKGDzbu8BJ7nfjnv4QYjz+mNM2Skdul41TtC7Jz fzj1vMSl44qb7txXgD9R6NKEwyZataIpM9ScFz43euQpWGKA X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX/hMyyc1ChokZ O1xsG9Rls1TfapIcixvcTDoFcHxSJr+CMl3U4eeiWO8hSGXxb1OTs7SqWCbmxggfrBx6Q2plsXW BIl+4D6znw/4lfoML6QYb7xPtN+2krImczWd3ys2Sj/OzocJMxKYHAuBUbPZpnw5uLCfZlNKtHd DRvDk+ZxrIq/0nmt/Bs+MJTxAT6qTh3sx9Nlang5G3QvAjrmkB9sA241HBUoQlgqM8EpAkDbXI5 jzkXN6twG+4khG63c5mMzNHyK4CkQZXx3tWEOAyYmmAMyHGFZp49fBPjypQXgEieNR1N2CF8uss xlQ7tv11c3SwciLuUtg02sTe7XxmUHMRY86JH9VksxfGBJB3nIsJPYp8aF9bJoj/4d8IVXl20l0 xw6TEPsBap36ouLqL+CSjgnm8xxVHvU4fhT+dHrkPZd7nYY+y4vDtpQeOXHK1zNf+Ec/OXtyg9m qav6FlpcYaV0vgz4vLw== X-Authority-Analysis: v=2.4 cv=N9cZ0W9B c=1 sm=1 tr=0 ts=6a0dca92 cx=c_pps a=5HAIKLe1ejAbszaTRHs9Ug==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=BpkRCZfudPv80oEIFw4A:9 a=QEXdDO2ut3YA:10 a=gYDTvv6II1OnSo0itH1n:22 X-Proofpoint-GUID: UsJdX7PsKc_LmeTsUjjA-WfNGy1FnZMB X-Proofpoint-ORIG-GUID: UsJdX7PsKc_LmeTsUjjA-WfNGy1FnZMB 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 The ubwc_dec_version field has been inherited from the MDSS driver and it is equal to the version of the UBWC decoder in the display block only. Other IP Cores can have different UBWC decoders and so the version would vary between blocks. As the value is no longer used as is not relevant to other UBWC database consumers, drop it from the UBWC database. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 23 ----------------------- include/linux/soc/qcom/ubwc.h | 2 -- 2 files changed, 25 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index 3fe47d8f0f63..1344cda0fb75 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -18,7 +18,6 @@ static const struct qcom_ubwc_cfg_data no_ubwc_data =3D { =20 static const struct qcom_ubwc_cfg_data eliza_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_dec_version =3D UBWC_5_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -29,7 +28,6 @@ static const struct qcom_ubwc_cfg_data eliza_data =3D { =20 static const struct qcom_ubwc_cfg_data kaanapali_data =3D { .ubwc_enc_version =3D UBWC_6_0, - .ubwc_dec_version =3D UBWC_6_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -39,7 +37,6 @@ static const struct qcom_ubwc_cfg_data kaanapali_data =3D= { =20 static const struct qcom_ubwc_cfg_data msm8937_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_dec_version =3D UBWC_1_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, @@ -48,7 +45,6 @@ static const struct qcom_ubwc_cfg_data msm8937_data =3D { =20 static const struct qcom_ubwc_cfg_data msm8998_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_dec_version =3D UBWC_1_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, @@ -62,7 +58,6 @@ static const struct qcom_ubwc_cfg_data qcm2290_data =3D { =20 static const struct qcom_ubwc_cfg_data sa8775p_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, .highest_bank_bit =3D 13, @@ -71,7 +66,6 @@ static const struct qcom_ubwc_cfg_data sa8775p_data =3D { =20 static const struct qcom_ubwc_cfg_data sar2130p_data =3D { .ubwc_enc_version =3D UBWC_3_0, /* 4.0.2 in hw */ - .ubwc_dec_version =3D UBWC_4_3, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -81,7 +75,6 @@ static const struct qcom_ubwc_cfg_data sar2130p_data =3D { =20 static const struct qcom_ubwc_cfg_data sc7180_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -90,7 +83,6 @@ static const struct qcom_ubwc_cfg_data sc7180_data =3D { =20 static const struct qcom_ubwc_cfg_data sc7280_data =3D { .ubwc_enc_version =3D UBWC_3_0, - .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -100,7 +92,6 @@ static const struct qcom_ubwc_cfg_data sc7280_data =3D { =20 static const struct qcom_ubwc_cfg_data sc8180x_data =3D { .ubwc_enc_version =3D UBWC_3_0, - .ubwc_dec_version =3D UBWC_3_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, @@ -109,7 +100,6 @@ static const struct qcom_ubwc_cfg_data sc8180x_data =3D= { =20 static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -119,7 +109,6 @@ static const struct qcom_ubwc_cfg_data sc8280xp_data = =3D { =20 static const struct qcom_ubwc_cfg_data sdm670_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, @@ -127,7 +116,6 @@ static const struct qcom_ubwc_cfg_data sdm670_data =3D { =20 static const struct qcom_ubwc_cfg_data sdm845_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 15, @@ -135,7 +123,6 @@ static const struct qcom_ubwc_cfg_data sdm845_data =3D { =20 static const struct qcom_ubwc_cfg_data sm6115_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, @@ -145,7 +132,6 @@ static const struct qcom_ubwc_cfg_data sm6115_data =3D { =20 static const struct qcom_ubwc_cfg_data sm6125_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_dec_version =3D UBWC_3_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, @@ -154,7 +140,6 @@ static const struct qcom_ubwc_cfg_data sm6125_data =3D { =20 static const struct qcom_ubwc_cfg_data sm6150_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, @@ -162,7 +147,6 @@ static const struct qcom_ubwc_cfg_data sm6150_data =3D { =20 static const struct qcom_ubwc_cfg_data sm6350_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -171,7 +155,6 @@ static const struct qcom_ubwc_cfg_data sm6350_data =3D { =20 static const struct qcom_ubwc_cfg_data sm7150_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_dec_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, @@ -179,7 +162,6 @@ static const struct qcom_ubwc_cfg_data sm7150_data =3D { =20 static const struct qcom_ubwc_cfg_data sm8150_data =3D { .ubwc_enc_version =3D UBWC_3_0, - .ubwc_dec_version =3D UBWC_3_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 15, @@ -187,7 +169,6 @@ static const struct qcom_ubwc_cfg_data sm8150_data =3D { =20 static const struct qcom_ubwc_cfg_data sm8250_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -198,7 +179,6 @@ static const struct qcom_ubwc_cfg_data sm8250_data =3D { =20 static const struct qcom_ubwc_cfg_data sm8350_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_dec_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -209,7 +189,6 @@ static const struct qcom_ubwc_cfg_data sm8350_data =3D { =20 static const struct qcom_ubwc_cfg_data sm8550_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_dec_version =3D UBWC_4_3, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .ubwc_bank_spread =3D true, @@ -220,7 +199,6 @@ static const struct qcom_ubwc_cfg_data sm8550_data =3D { =20 static const struct qcom_ubwc_cfg_data sm8750_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_dec_version =3D UBWC_5_0, .ubwc_swizzle =3D 6, .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ @@ -230,7 +208,6 @@ static const struct qcom_ubwc_cfg_data sm8750_data =3D { =20 static const struct qcom_ubwc_cfg_data glymur_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_dec_version =3D UBWC_5_0, .ubwc_swizzle =3D 0, .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 0b5aa9d0343b..c3f9efae5db8 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -13,8 +13,6 @@ =20 struct qcom_ubwc_cfg_data { u32 ubwc_enc_version; - /* Can be read from MDSS_BASE + 0x58 */ - u32 ubwc_dec_version; =20 /** * @ubwc_swizzle: Whether to enable level 1, 2 & 3 bank swizzling. --=20 2.47.3 From nobody Sun May 24 23:31:55 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 EBBBA3FA5FA for ; Wed, 20 May 2026 14:52:03 +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=1779288725; cv=none; b=FDS/MGS5zMSA+gBv59l72lqHwGNG+gah9+k9zgkTvnAEPCUK2xbfWOL3TJtOGyvbglpHxa+eRqp5TjnnxQLBz8Y/wN2wklKT6QJ0cGCgb4AYx4kBg2ZzsYsoA5r43tDOTFFVl8Kh3EH3HYI+mnQ8DXFRzHQof2/zfIXiu2FwyHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288725; c=relaxed/simple; bh=ELfSfo30Xq2szDKMHs49lszh5EmDwoOzMcxayrSn7iI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U2A85nfFwH+MCBDCnHcZ1pqxM0V0N0mZFsOWyBwJbS5FWYfprymokaE13ITKeqMDgw49RxssKXZs2S/QmMVqHAjcSy2Y7yOCjKPKJBTMqWNhIDRlVwjrCGlnfxWNfmPCbtkBasU+iR2jl47R7SJep9mcj+sToQc+V9DOUtmgyUs= 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=fmEo6olU; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=kBdOrHl6; 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="fmEo6olU"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="kBdOrHl6" 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 64KDJuRZ1725453 for ; Wed, 20 May 2026 14:52:03 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= 6pPTtabF6OA9v/5Dtpi3YOgqhDzAT72mJRYat9rS4JA=; b=fmEo6olUMDysvtwI cCrt8wUhd+GQgkDWk7f6yAUEhUNoESb/anppSzypW9MVC1Z2w6WC9YkTTrhQvUl2 wrEWtBck0x6xOY+unNEl3NEbvzTJyljSNI/WM1DzaPk47a+mvYOzsWB3F6YE1hxc 7/TTGeq71YgZwoiciIH0CCDB9h12wv15j//S6CSZdLcZtvlZ01tnDDZpHKcGGUzZ 8Ns7Bs6vzpDV3qOzo+nhdFOgkZepuOuwTNnXyqDMAFmp1GWr0QrJ/+dkU6rfua/K 0d0sjvkZe+rAVGpVqdVLbuP6IMNNL91rfuGBspnbdjrFBgfyvzQf8zuV7+yVlpgs XZJzzw== Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e8t3qn8xs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:52:03 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-6326fc1256aso9100843137.1 for ; Wed, 20 May 2026 07:52:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288722; x=1779893522; 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=6pPTtabF6OA9v/5Dtpi3YOgqhDzAT72mJRYat9rS4JA=; b=kBdOrHl6wOkgkxRQl2HdOq5R95ejIfdmX08/vek18InfDV2godbGbD9O8SBKd+qJ1q e6//vcIUf1lvQY0yZ7xdSyuwUoqVFBcHwthqLF5v6a1AyUkSFJaApoxrJ6PCDwXbRJgA wkh5NzTpd1kjsKFPUuxQ7EMvtwWlZ2Q6M6SBkuVx5w6RO3f5k2DcHBf494qfkBYrax5g 2NDPJ3ic6b+iQhiwlhLaPj3/TlI87FR5SObWcaVv/I76CuY9maDMwDJ+M8xyIFSJOrDQ iG/Cmc3wo6tNTqCurV48G3xdPAipXiO+csnUW743gU5ztgb8g5ou0J3TMF6i5GI9fALa B1QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288722; x=1779893522; 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=6pPTtabF6OA9v/5Dtpi3YOgqhDzAT72mJRYat9rS4JA=; b=UkOSLx1aTfYpKqxRLRm63y1ccpeeknz0m3GGLdTtyfHH84HNJhULS9kzd7J+uXNmaw 5TcSASZdE3gy26qIDL4csEt538+pVUbvM91jsgvbfrhfe2S+5C5qXzZ5l+iRdNwAh3KV LgqtcgPLL5FRRtCkqbXTliE71HODCa11HPGWqiiwx/voB+As52yk2CLVeiRyJ7qqUef/ ngC6byl2cztpNVA4zGPVyZJURI8mnS8FYnjSX98PA/E5YcTwnTjcm3slaolA+1Sq/71w /vw7sqP51foko7gf5eNssrpBtQiMPGjiL9wuDXhZjDzm/fniN08Avreqnjps7aBSJA+g yEgg== X-Forwarded-Encrypted: i=1; AFNElJ+OKAEqTxyovE6WbFyKO6IG+idoxUl7zVWQqNTygmRg5kMKqhBgkdUoHl7Jc8VWgVXMUhCxoB0jJn89FjU=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4buhaVcYMtHwokGLuobnXVAhtIdqG03B7q3oRTssuGqzgtzlw 1m6SA8KfISEcc7Q13pDgEnOmHVwwLDxVtNfgD5mDe8+gW85z37KvY7sx9eA4ufW4XcKJoabXHS7 3CFQQBerIAb6LT8YqwXPDNLm6zG3fWjP67tfl+N75HFoG/2XwB1+ZOzBpWqx1YTtBt/g= X-Gm-Gg: Acq92OFBQsnMH8pakMSBj55QfMuMP7LtxRYemlvJb7ThLNmaLBDDJkmI2hx6yCnI/U+ cONdTaQ+jifPUcUVQMslrYtqcMc1nPouYDaiLA4HMFTG8jSWC5BG+/MfuV+QGgu6NZpE20EKfUl sr8wsIoBmvciP2exzQAlbAtq1Rhoxl3j5Ac/8uyGy+VnG3wOHMtI4k8v86K1spCNYLGbz9EaqtP 3D0ylLTt1FZA8DMIKj7FEtTYqPj9E24XI3p1nw0W4YggUfZD9OZYYvSEH53UiqFySDwG0FLjSzO zFruQZ2lu7cDIYFvRSPNZG4tcQHQkOm6mTc5rxbcQG/tpabgWAsYn8ERXE+WLxaFn7bL1p8kuR5 bRygm2n+Hnup1HG98t/8JRVX77arJB4cyAjWArVJqDdnNg1VxGlLoCVL4tPci1vv9SsIDEKEOrr jG82GmiCbGpYa5p2mW46nwISS16JcPP1/ZjBA= X-Received: by 2002:a05:6102:808e:b0:631:4e9a:ba3 with SMTP id ada2fe7eead31-63a3f28c288mr14430966137.21.1779288722301; Wed, 20 May 2026 07:52:02 -0700 (PDT) X-Received: by 2002:a05:6102:808e:b0:631:4e9a:ba3 with SMTP id ada2fe7eead31-63a3f28c288mr14430935137.21.1779288721797; Wed, 20 May 2026 07:52:01 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.52.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:52:00 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:31 +0300 Subject: [PATCH v5 24/28] soc: qcom: ubwc: drop ubwc_bank_spread 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: <20260520-ubwc-rework-v5-24-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5607; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=ELfSfo30Xq2szDKMHs49lszh5EmDwoOzMcxayrSn7iI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpp4I7RvK2HILsybRcgfmEkL+/9WfJirTkYA jDZw6s3r+WJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaQAKCRCLPIo+Aiko 1ZJtB/4lsnTD7zdhZblkKl3eH/4SO3fLhhOuwa4VE2DtFikTLo1feLEogub0Xnbt7lFGtEF2rnU ykylJ7mH7bAfx+pxxBKKLKZNUUtlOcALJUQNoxjBl0vVv9eBn7z5opObMqTIxHwpV1o+7FS24+E FXiZJbcNJecaCNnQ0Gx0za3x4RqGSrJHHTkPCyJ4ScJdGthN+hU4nNiqZjuDF1NuIM8Ugyvlx4J UcCdw6sBFejsMj9X6fsPTrCfaBc4aXE7tgPEDngnGeTPX3AVuak3VcXQlro2twryZVLFxwPNXZY ed1JltJJfETWGoRF97wvd0bg15A0pKvuBdE/Y/BJNao25Mbo X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfXy7gsK8VYM6J7 U4AmvjJm6LrUrG0Bh7yRMTNYwdP+UaZNFrroiR7EJp1BlA/UxqOGty89ux3Pd511XZ26vyN3XZ+ v0aJ3fiaijX0Ib0BAjnexhPH5vhXRE2lo5td9Yr/imCnuvmIimNSUIEbWM0vKykWkkTh9ksMgAX bdhydn/z3zN7/tASwp7oajv3IGJpT0HwrLSicgih3GkbJqY4zeVmF90gvIMJ5/D3EeGA5cFyrQn YzxuzReBmoxIuvvue7S9As/iVJVxEpVni3oYaNUsEJGE+i1fMjtW31z/w8WfLKqAHw1ZGqnzLaU YVyLkgjyAMTZqt/fNDfkYY5A0+PQb8myGoxmSrpcR+TDCqUttuDnr19EvqkreoMsg97Siwt++8T cM7qaJe5gaFbFHFLUlqvAB3xS+aheOv7dCqTsGzkyzmEFvEB9On/x/EBozJcAoDfod3MiDVr08n cEcuwM+Q0ggywSMO0Og== X-Authority-Analysis: v=2.4 cv=N9cZ0W9B c=1 sm=1 tr=0 ts=6a0dca93 cx=c_pps a=N1BjEkVkxJi3uNfLdpvX3g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=VGmcmSc_WkMUHOMtpCQA:9 a=QEXdDO2ut3YA:10 a=crWF4MFLhNY0qMRaF8an:22 X-Proofpoint-GUID: vXHi0yUIOsd9WwwpRLgf66chw87JFPRE X-Proofpoint-ORIG-GUID: vXHi0yUIOsd9WwwpRLgf66chw87JFPRE 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 According to the documentation, UBWC bank spreading should be enabled for all targets. It's just not all targets have separate bit to control it. Drop the bit from the database and make the helper always return true. If we need to change it later, the helper can be adjusted according to the programming guides. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 14 -------------- include/linux/soc/qcom/ubwc.h | 3 +-- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index 1344cda0fb75..35cde4e9a238 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -20,7 +20,6 @@ static const struct qcom_ubwc_cfg_data eliza_data =3D { .ubwc_enc_version =3D UBWC_5_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 14 for LP_DDR4 */ .highest_bank_bit =3D 15, .macrotile_mode =3D true, @@ -30,7 +29,6 @@ static const struct qcom_ubwc_cfg_data kaanapali_data =3D= { .ubwc_enc_version =3D UBWC_6_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 16, .macrotile_mode =3D true, }; @@ -59,7 +57,6 @@ static const struct qcom_ubwc_cfg_data qcm2290_data =3D { static const struct qcom_ubwc_cfg_data sa8775p_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 13, .macrotile_mode =3D true, }; @@ -68,7 +65,6 @@ static const struct qcom_ubwc_cfg_data sar2130p_data =3D { .ubwc_enc_version =3D UBWC_3_0, /* 4.0.2 in hw */ .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 13, .macrotile_mode =3D true, }; @@ -77,7 +73,6 @@ static const struct qcom_ubwc_cfg_data sc7180_data =3D { .ubwc_enc_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 14, }; =20 @@ -85,7 +80,6 @@ static const struct qcom_ubwc_cfg_data sc7280_data =3D { .ubwc_enc_version =3D UBWC_3_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 14, .macrotile_mode =3D true, }; @@ -102,7 +96,6 @@ static const struct qcom_ubwc_cfg_data sc8280xp_data =3D= { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 16, .macrotile_mode =3D true, }; @@ -126,7 +119,6 @@ static const struct qcom_ubwc_cfg_data sm6115_data =3D { .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 14, }; =20 @@ -149,7 +141,6 @@ static const struct qcom_ubwc_cfg_data sm6350_data =3D { .ubwc_enc_version =3D UBWC_2_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, .highest_bank_bit =3D 14, }; =20 @@ -171,7 +162,6 @@ static const struct qcom_ubwc_cfg_data sm8250_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, .macrotile_mode =3D true, @@ -181,7 +171,6 @@ static const struct qcom_ubwc_cfg_data sm8350_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, .macrotile_mode =3D true, @@ -191,7 +180,6 @@ static const struct qcom_ubwc_cfg_data sm8550_data =3D { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, .macrotile_mode =3D true, @@ -200,7 +188,6 @@ static const struct qcom_ubwc_cfg_data sm8550_data =3D { static const struct qcom_ubwc_cfg_data sm8750_data =3D { .ubwc_enc_version =3D UBWC_5_0, .ubwc_swizzle =3D 6, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, .macrotile_mode =3D true, @@ -209,7 +196,6 @@ static const struct qcom_ubwc_cfg_data sm8750_data =3D { static const struct qcom_ubwc_cfg_data glymur_data =3D { .ubwc_enc_version =3D UBWC_5_0, .ubwc_swizzle =3D 0, - .ubwc_bank_spread =3D true, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, .macrotile_mode =3D true, diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index c3f9efae5db8..254721f5ea3c 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -33,7 +33,6 @@ struct qcom_ubwc_cfg_data { * DDR bank. This should ideally use DRAM type detection. */ int highest_bank_bit; - bool ubwc_bank_spread; =20 /** * @macrotile_mode: Macrotile Mode @@ -85,7 +84,7 @@ static inline bool qcom_ubwc_macrotile_mode(const struct = qcom_ubwc_cfg_data *cfg =20 static inline bool qcom_ubwc_bank_spread(const struct qcom_ubwc_cfg_data *= cfg) { - return cfg->ubwc_bank_spread; + return true; } =20 static inline u32 qcom_ubwc_swizzle(const struct qcom_ubwc_cfg_data *cfg) --=20 2.47.3 From nobody Sun May 24 23:31:55 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 BE1433F5BF7 for ; Wed, 20 May 2026 14:52:05 +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=1779288727; cv=none; b=V28YpHyQ4cxt59lN5Tc7GT7JlovDxXmp6jvVwikhhSlEw3Y+2B536cLWJCzlDY8TVlTgxiV0SQSX6Eiq0Oocz7Gzlokc5T5vN2LHwcHAAgMRsbSh/LmfPzClpmKqvfjVmKvkamY7MhGbVWlKjslaIlG1xdY7dAhYItNPNVMfSQM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288727; c=relaxed/simple; bh=H0u9J4NpHkoALoZnkr4HzilolgHdpafpbEfxO94JORk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MS+OonSWWU8Sa5oh1Q3FFRHOVG930X8mPxxmE3xnV4vGG6R2gKiQOBAdifiBnIa5+Mh/x7uuwNpIOWFiPqmk72dXZwQNiH47u3dSaOfap3Xn4621qzs6jcfJx/wcJy2JxG+1mvTz4nTdq0YvIiqSZNnnmIJERZTPWlcTq5e9/1Y= 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=Cnkxh5Ra; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=eddyu0FS; 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="Cnkxh5Ra"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="eddyu0FS" 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 64K9oaHb1178279 for ; Wed, 20 May 2026 14:52:05 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= xm0vNFmSC6On7sSlFzQL1hlJJzBLrMhRxyzus5igF6c=; b=Cnkxh5Ra7I9FJHHD K9yx56yLhwuX1AZCGbU6zkM/Z5w3X7HIvbLPeDcRCmrtdg6LH6KhJIYZMArEksrM be6kJEvLRZsUwPQiXm6m8DpnR0BD7L7pQxtsvBNTy+RfQvXF3SDPB4C3q1BWY6+3 4ui0sddovD0apB6jrUntKWVPyN7iWN9UhFv6JeeJneOboaIn3eRm1blPPrejuWwL 9RUm32+nX/aqDN+hks/APwgCF2Q1fSRRu99GHsNMWviRASYv4sN9e6v0kwu5Fr3H 9pHVNHhJrBQ/pwvUkAp9jPAuS2UgDwJxTc0Gmz6eCsddZTlEBrmCY+P0cyqQzgTO c8fPUQ== Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ap6s3n8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:52:04 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-631455685c5so1473221137.2 for ; Wed, 20 May 2026 07:52:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288724; x=1779893524; 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=xm0vNFmSC6On7sSlFzQL1hlJJzBLrMhRxyzus5igF6c=; b=eddyu0FSEZ9GzNWA8OfuYfiUZUSWtXsH9rT3gtl2CS5AjSpX+VM5Gy7tQruVUdojSJ QD46XkUX0rLcjtUgEBKu/u0N5Dg+kgKYqZgce1trsoAUeQDJ4IjYVH9yt3SVu3jr7pOH b14wXXiw8ZVz64ae0iMMG4DxS2kI7o4+LowMTunZZkv5kPz6Smqird0UzYCwKdEEDxT2 jHbJfEbvCnNghy5dPGIHK/y0lPmW+K8d4O1FEK86jaKNS2CWLnQGgAaIEOCpTakiSvVw cxA/ocs1vqSA1FsuwBDsIjrjtoUSVtnm+E+vR7WM7rYzSGrKOFupTTuVq8bKeZ1dtKJ4 t4tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288724; x=1779893524; 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=xm0vNFmSC6On7sSlFzQL1hlJJzBLrMhRxyzus5igF6c=; b=cvy/77MW7lxgio1yFVHQicxQoK+WpIXwthXRrLND7R1kwFYVTYbj1ZjdJCHUyZxBbW WLPjwuaxfXp1tlo3U3kyitGC/mirJwZPJy8A93CPaUwZCVnK0s5OmxGsfRa2EKO2uvAU Cf67v4vnIA3+z0A4WWDv9UtchuYUbk081V7WpjzsI6l7VbVTWt+Ax/0Y9IcF7WVQ+ekt HSfiZ47GmT6t+eKTUtJwYXgFuEixx15t1qCsmeDDY63WLjeR3IyykhlLx5KArYiaV/Ml zsvWqbXiR/sMX5eiBvUUmS/DxnEpnexfrRolMJdWCMuBqBaEK536DAvBANSlPQPc0tsL DV1A== X-Forwarded-Encrypted: i=1; AFNElJ+E7uKUxrPowd7Ppz1UaCKvtxCDQApDzzSS9+cOS6dXy8eSs4F90P+yoCPbOGqyUXuY/urs7J3QC5xNiDY=@vger.kernel.org X-Gm-Message-State: AOJu0Yyan8nGSCrOsKx5GN/AnRveBZKgISugJyTqEaUxFTSq4OU01mvW Nz123rgm3z6njAjIJYwa2zYUtVCbq9eHxc9kbUylXq4vuQ5RoxclTHZarYgCia62lq5YLn58t70 I//ZeNPTfUx3H+weeIS7wl5LOHDujFrw6+b5NBh1nJ6XU0ARIC5NtbSOnLeKxLV1YnTI= X-Gm-Gg: Acq92OETgSCz94HNQjee2j2oYTymifWYnX+9g7DSASEU1A58J/IOOxs7bmDIdkyQCfJ XgUSyvlSOLL3xAuOehJFju1xkP0PeLcu+hFOt8KqdXLi9t9HVnmjGxcY0ja+yZVp0XlwJAmgTL+ WVi3M2aTilHPlaVUamIAMPt9kthHp+dCAMCDqolkSeWio5fwf6I/7iAPxEg3o9Y36MEnSt4NzNL h8LuPiXmTl0BKxZjIfZgTefRUuq65PwpbD0pMFT3fxfV85Dq5X60nvT3Enb4gnisapXTlOvgniu yLaIuanlv7jcwctHu5OUCB6WQjW/lukaJCimRoYAPMsw9qtyW9xHdHEP2KPxTMB+GWx66KbPswT 8lOpTkDr6wAr/KSz/vLTfBdPt8EEOZ7i0+qbu6rvq+QAqz+LpFEkY6Yt20Poj/cZ3/IR2AJkoF9 Xh2H8t6fbfnT1M/zlN0e+HU1v+odg34UtIQ/k= X-Received: by 2002:a05:6102:304d:b0:62f:2f1f:599b with SMTP id ada2fe7eead31-63a3d21f6e7mr12724996137.7.1779288723796; Wed, 20 May 2026 07:52:03 -0700 (PDT) X-Received: by 2002:a05:6102:304d:b0:62f:2f1f:599b with SMTP id ada2fe7eead31-63a3d21f6e7mr12724951137.7.1779288723180; Wed, 20 May 2026 07:52:03 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:52:02 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:32 +0300 Subject: [PATCH v5 25/28] soc: qcom: ubwc: drop macrotile_mode from the database 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: <20260520-ubwc-rework-v5-25-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5497; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=H0u9J4NpHkoALoZnkr4HzilolgHdpafpbEfxO94JORk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpp5Sb3LBHh+2rpBKEPah7kJGpYSpLI6Yojz aX2WLcqljSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KaQAKCRCLPIo+Aiko 1b3EB/0ciDXMWMsPPlje7FI4s1MFvATWI/xuJnxAk9fzWaN3Doq0OZdFsE3dw1i25WLHiEqjhFK 1Y2B6pELjE7EdcTdT/wKz4oLhNAoZZNvfMd3lARKS4HsW7qO4CfNFg3txZxAaXrBrlYJ3hTWA2i WDgfHKj5kxEAGVkpXkLyyA8NxnmJANmQy5rzeSYHksymm9CUAMlmtmOz2zaT7Xwa4T6a2ePlE26 8pwEnkq9XO077+KQpU2nJT2/JS6RxOOEsHImnCVq6ae10YhKBBeVtYxKixPn4kHWIEbPR1GUqKA mzc7YyAi0Vov2hwIWqRe5SxMtr+qJLb+PNMOTBihxdZMbDUz X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: LG05cD2gNQIiNTmF6MvdEXF8TOoqG9xL X-Proofpoint-ORIG-GUID: LG05cD2gNQIiNTmF6MvdEXF8TOoqG9xL X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX8vTpZPJKswxf CfwInxCFURLrFhyJ6OlntThUH/HyOvoPzHGUvErTIdUdVdce/yWQQ19gJZSx69ZETpTS5laDxjo Ot64bNdt9SgT6gWSydTfVDyht0NBO45s4V+fjxV/4IarBT1ALuEXD6qXxLbg7AfwxkefUzBevhS T0e32yAEuPMdIj3le4wo0sKq4pY4Qru9E6mC2DTKW1q5EcYLHIvXAmVHnPF6WpSqiq0+3eykFGi VRzKzNK1x5VIGq0ymyWSwt3KyylZhmEXMtY8VM0GDE6qrNIL7PaOH/G4CCBmxuQ6eF5fK5/EAAP rr+fmq/an0Q7sphH+8efuPN233tvCGx8c3IvnDNDDxHLqJk12wY2zTmb+RprP53gj/vSbtMRkk6 p5IN4LVG0m3CcufaEVX19q17zGWaL/BaI39DfTduPedHqZuHl3lls+v3xVJER4nGO+b4+U8ybMv UwOWECHVzkmstYTnx/Q== X-Authority-Analysis: v=2.4 cv=FesHAp+6 c=1 sm=1 tr=0 ts=6a0dca94 cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=lOjMx_-Oxa8n0LcNG1gA:9 a=QEXdDO2ut3YA:10 a=ODZdjJIeia2B_SHc_B0f: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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 clxscore=1015 priorityscore=1501 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 All the users have been migrated to using qcom_ubwc_macrotile_mode() instead of reading the raw value from the config structure. Drop the field from struct qcom_ubwc_cfg_data and replace it with the calculated value. Split single UBWC_3_0 into UBWC_3_0 (no macrotile mode) and UBWC_3_1 (with macrotile mode). Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 18 +++--------------- include/linux/soc/qcom/ubwc.h | 18 ++++++++---------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index 35cde4e9a238..8dd91d0b3974 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -22,7 +22,6 @@ static const struct qcom_ubwc_cfg_data eliza_data =3D { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 14 for LP_DDR4 */ .highest_bank_bit =3D 15, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data kaanapali_data =3D { @@ -30,7 +29,6 @@ static const struct qcom_ubwc_cfg_data kaanapali_data =3D= { .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data msm8937_data =3D { @@ -58,15 +56,13 @@ static const struct qcom_ubwc_cfg_data sa8775p_data =3D= { .ubwc_enc_version =3D UBWC_4_0, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 13, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sar2130p_data =3D { - .ubwc_enc_version =3D UBWC_3_0, /* 4.0.2 in hw */ + .ubwc_enc_version =3D UBWC_3_1, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 13, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sc7180_data =3D { @@ -77,19 +73,17 @@ static const struct qcom_ubwc_cfg_data sc7180_data =3D { }; =20 static const struct qcom_ubwc_cfg_data sc7280_data =3D { - .ubwc_enc_version =3D UBWC_3_0, + .ubwc_enc_version =3D UBWC_3_1, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sc8180x_data =3D { - .ubwc_enc_version =3D UBWC_3_0, + .ubwc_enc_version =3D UBWC_3_1, .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { @@ -97,7 +91,6 @@ static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sdm670_data =3D { @@ -164,7 +157,6 @@ static const struct qcom_ubwc_cfg_data sm8250_data =3D { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sm8350_data =3D { @@ -173,7 +165,6 @@ static const struct qcom_ubwc_cfg_data sm8350_data =3D { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sm8550_data =3D { @@ -182,7 +173,6 @@ static const struct qcom_ubwc_cfg_data sm8550_data =3D { UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data sm8750_data =3D { @@ -190,7 +180,6 @@ static const struct qcom_ubwc_cfg_data sm8750_data =3D { .ubwc_swizzle =3D 6, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct qcom_ubwc_cfg_data glymur_data =3D { @@ -198,7 +187,6 @@ static const struct qcom_ubwc_cfg_data glymur_data =3D { .ubwc_swizzle =3D 0, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, - .macrotile_mode =3D true, }; =20 static const struct of_device_id qcom_ubwc_configs[] __maybe_unused =3D { diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 254721f5ea3c..fee778360ac2 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -33,15 +33,6 @@ struct qcom_ubwc_cfg_data { * DDR bank. This should ideally use DRAM type detection. */ int highest_bank_bit; - - /** - * @macrotile_mode: Macrotile Mode - * - * Whether to use 4-channel macrotiling mode or the newer - * 8-channel macrotiling mode introduced in UBWC 3.1. 0 is - * 4-channel and 1 is 8-channel. - */ - bool macrotile_mode; }; =20 #define UBWC_1_0 0x10000000 @@ -77,9 +68,16 @@ static inline bool qcom_ubwc_min_acc_length_64b(const st= ruct qcom_ubwc_cfg_data return cfg->ubwc_enc_version =3D=3D UBWC_1_0; } =20 +/* + * @qcom_ubwc_macrotile_mode: whether to use 4-channel or 8-channel macrot= iling + * + * The 8-channel macrotiling mode was introduced in UBWC 3.1. + * + * Returns: false for the 4-channel and true for 8-channel. + */ static inline bool qcom_ubwc_macrotile_mode(const struct qcom_ubwc_cfg_dat= a *cfg) { - return cfg->macrotile_mode; + return cfg->ubwc_enc_version >=3D UBWC_3_1; } =20 static inline bool qcom_ubwc_bank_spread(const struct qcom_ubwc_cfg_data *= cfg) --=20 2.47.3 From nobody Sun May 24 23:31:55 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 41F613FC5A5 for ; Wed, 20 May 2026 14:52:07 +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=1779288729; cv=none; b=pYeQlsz2/M1qtJB53qjTxWFu8jOlqHclQIA/GV0EhMdbDCY+49JtRH53claYMDwC2SBR7njwKLv2Eeu+MhzSmrx5peMqzrzN71aT5Dsk6NvHHulOzFMnDnCEM0zesPwMWAtj+3QjSv2m9hn2yIsfWanBZTRbKKFfpU3OScZ0uXk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288729; c=relaxed/simple; bh=o9JUkbRpVoaqtqVf/XyHTRO9fA3cJ05Ua+3YfNy0bNM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=u9P08geklfbTQgWCoyzP2euOk/ANx47PaIEJ+1tsx37aLvcU6cRnejl4ZlyOXlEOMs2wjMKCwAU5VpuvBN0zD9N3DfwDGtTRdanznhQCx+gvwhUrZ//Lp4oDjb3ucyHUerpPabHHMSCgjbpM6qlQld9PJGse8bskNWiIx7kynFw= 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=XauMLZbK; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=C/PPkfzz; 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="XauMLZbK"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="C/PPkfzz" 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 64K9oTVs1178134 for ; Wed, 20 May 2026 14:52:06 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= Z0x04teL0xC69U692R2wb4fDmKgXpTUZPxuDE0l28kc=; b=XauMLZbK+tvHEEOd Mhfa3km3kT2M/q/iIOv/2nvbN2R0sX5KQDn0DX9aSds5dhtbuVejXWxQTv+fqnIC Y+4IuVHFMHvdu93zpQoOdYC6TYU9F6w6s905d/mnebhC1cAh/Tmc64oQX7xb45KL 0Zv/j9lgKNrlzutDgq+s1bf24UjddICwJhefey1siSg966/zb2H+tNT8HIFHNVZm +ly4kOpTR5L2RhpZNykyUsGyLIL4IWP+sU18wuR69TaZoVW2U0Dx+4FNhRs3+cVx 5r1+KHlNGo7GU107DTYI3mtpQh2i2kXYSxYM15c+ggqi9ptviDaEUtnmEzDs+6+v oenbtw== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ap6s3nf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:52:06 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-516879bf1a7so130513031cf.1 for ; Wed, 20 May 2026 07:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288726; x=1779893526; 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=Z0x04teL0xC69U692R2wb4fDmKgXpTUZPxuDE0l28kc=; b=C/PPkfzzMmdjb8dqEaQbrLsqqMk1vhuIVXPFn0IUcCpnIvYqge+VCN5s7/FmS0Rsri 7O61K3f+DdoJaz6rlpRS1hEgV1FAVTu29zeJ1tdKsVkBmdvkkVRL2qHsW6HTBZQxMh0s obPHzEIwRc5vOtXmJ8EWsp5Fl/doOpUhFPYilOKi9v6Nu3wTcKjhJYwjtocry+TLP9MN xZ/8JOazE6s4kjo6/t5dB+YntB6UMcQ8VouH2k4tw0CmIJSiHkmFW0Oc0WwxeBD1gCJj KMS/z5ET+hXZflmGtd1woxQgaHUCR+AXwVeF6pHlqwaa5ptriWhfn2/BdnoDNo8sVnoq 94fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288726; x=1779893526; 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=Z0x04teL0xC69U692R2wb4fDmKgXpTUZPxuDE0l28kc=; b=n7vs6xCtzRpzP2NdWGUcc25ys7ZZr4SgehbrQodokBhlRKJsOwB4DUiwd5/i+hTiLP 8VhRDC3JJQxRj6l9lw/d55t87KsiBpb85hSNA+YWVMff5HtJhJL0cGcl0+/ctHCvj8zA bTUV8nK4njDYTpGagDVEqIiu/m20rQNQ8lAMsuC8UudN1a5lAAcS7w7IsFxpgDNy4USH qhOzEO8Z1yxLb1MEXZmKQi7fndYSZ7aBswh+FsnlX8heRV1GCMIsZFYtYD8kkG8nji5m ibT5S19p68tsvBeGw+/UnIRQ1j1QR9NujPvGkTAf7PuWJ261VuDLYC9EHJxjfz3b8AP9 HiJw== X-Forwarded-Encrypted: i=1; AFNElJ+s/2QStcOCl+MD01Kqk/vDr0YGvkSCm8TzLVxOY0ob0r0a/JaZDRX0BlNOzIV6AMoiOyEsyFcOpd2n+nM=@vger.kernel.org X-Gm-Message-State: AOJu0YwcYzSfRTU+IzPOIUX2bJ2+wbUE4X6rIxhzKowVaKRYMSHvbCxR 1PxXvWuGW5HXub+vix1nCtubUcXC5Cdz43FesCMFkpHoDXwmu9ws/z/XKFnN5WMLWVVkrT6I07k 9vYs3cyjh9nvbqE6WgdybW8jRYWOzWo2ieWPSKmBz7JCScUUQEPTx8LZHZW1JaQeSaAs= X-Gm-Gg: Acq92OHTJaekscfDc0nI0iZmHd55W/8M7cX1u0CBx6xPaF8StITEQ5CEQFlnJfzW/g3 emj980WyPeSVfNSb8N43A0w29XErZ/Q+5Eq/p6CDWG40hk9VVJ9xZc9aWbAqbDmZgZKWPfhl7Uv +zdDE515uvHhYObPGv0DysziwX1C4yvUnvK23XybagOH2Oj19xb2eVgsVkshi55V5KzJtodPqbC YLwSYUblr3VKNcoaSwiRqS6URsmGwttW1PTmvSdLuR+4PgfViGIoiXTBC4waTFx64svdgVPggu0 cSfgK8/A78i+DKXjzL9FunSbumQSp9441UDeHTYJ0jpqerI89XgbbGqC/uRTx8YzSPFPR+bN6Jk YfFZ7SyYDx9nS4a0xIBA5kzr9BDb1WUwcWSNOK0U9ZCDa0tihMk7mvQdcNtY7WQrnbTfvD/0aQD oY6EhMZ3HIdV0stug8TR4flOnPjed51S7tB7k= X-Received: by 2002:ac8:59c3:0:b0:50e:474a:47e1 with SMTP id d75a77b69052e-5164159e60bmr355622771cf.10.1779288725371; Wed, 20 May 2026 07:52:05 -0700 (PDT) X-Received: by 2002:ac8:59c3:0:b0:50e:474a:47e1 with SMTP id d75a77b69052e-5164159e60bmr355621971cf.10.1779288724620; Wed, 20 May 2026 07:52:04 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:52:03 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:33 +0300 Subject: [PATCH v5 26/28] soc: qcom: ubwc: use fixed values for UBWC swizzle for UBWC < 4.0 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: <20260520-ubwc-rework-v5-26-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6082; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=o9JUkbRpVoaqtqVf/XyHTRO9fA3cJ05Ua+3YfNy0bNM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpqYITPjDh9VNzdWMyu/0fkcO66YkZx3DHdb dOvhzBt2l+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KagAKCRCLPIo+Aiko 1R98B/441iw213VarJMVAPKJ8r4uxxPpk/28lve6J/XN4YKQQTo5QusuGTcB2CM5afK/jeAEBy7 Nij//lLLSlUdmI4tlFDJoVQEO0vU0EIARxdeRHXzYkYAgM8TnvKkcqfmdShDXR1EGssQdkdKf+2 N6Di8r+b5Zseqyk8z6LYUCVcbcDXulF7QWznDyiCptiCe1cZeDJL1DddEh9xF3417i9Ohvnz/o0 w+sqM0E91IMR0kqSZPrwxnWxW3ITcjMagxd5GqoIri6i8Rjet4iVXt6TVIeiXjZ5R0o7GsRDYsY mRLYLE9yBfSVQrOOlnBKjePFfYi5PIiCUoQwbcBRGU3ZHbx4 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: K1Fy81wn7Y74JAqBg-PAaiKJpVw8I4r2 X-Proofpoint-ORIG-GUID: K1Fy81wn7Y74JAqBg-PAaiKJpVw8I4r2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX8WnMFLICaljO 6Hhdlk7fCmnUQVT7g2Q/dSzSdloa81zQfIaPRA+SEAyEFXLMuaDQukWGjuaFwdCAG4RD1CqXdbf Dj9JGh37maINBDr2I1ZGItb7mgYlOk3nOYzcI6p1JhkvVwuF4/RsKaAz/4QeFNdDcbuGHmTpEKE 29iyeRnCZo8bQwZJjKZefkRtwDruy/W0gsuhW4SorUKV1GlaaeTjTA84Zk1PYhd8mPkFOLb8Fgr xvN4eJsMQP7wnP27AO9btg9Z932VnT9npDyyQ00xUP37FuVbGpyxfQszwFN5RNrU7t4nfE+LjeQ +e37aR6LGOWcSMbGVTqnMWCmjq42X558K1sRp2arCW4Fpf2veZGrYemw/PMMH/ZarvlBJGsQQLN MCTaGLaJLS/K/uCKg6Zf38U4dccRIC0rJscQSFJ+A7nX09n4rKw8oleWarKd2yqf6ikeALu5d9j VLTKBPP5ucvDWl+azLg== X-Authority-Analysis: v=2.4 cv=FesHAp+6 c=1 sm=1 tr=0 ts=6a0dca96 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=8a_ODPMxA7UucN5sxwIA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU: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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 clxscore=1015 priorityscore=1501 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 UBWC devices before 4.0 use standard UBWC swizzle levels. As all the drivers now use the qcom_ubwc_swizzle() helper, move those values to the helper, leaving UBWC 4.0+ intact for now. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 34 ---------------------------------- include/linux/soc/qcom/ubwc.h | 33 ++++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 43 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index 8dd91d0b3974..7e321389a399 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -33,17 +33,11 @@ static const struct qcom_ubwc_cfg_data kaanapali_data = =3D { =20 static const struct qcom_ubwc_cfg_data msm8937_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data msm8998_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 15, }; =20 @@ -60,94 +54,66 @@ static const struct qcom_ubwc_cfg_data sa8775p_data =3D= { =20 static const struct qcom_ubwc_cfg_data sar2130p_data =3D { .ubwc_enc_version =3D UBWC_3_1, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 13, }; =20 static const struct qcom_ubwc_cfg_data sc7180_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sc7280_data =3D { .ubwc_enc_version =3D UBWC_3_1, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sc8180x_data =3D { .ubwc_enc_version =3D UBWC_3_1, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sdm670_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sdm845_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 15, }; =20 static const struct qcom_ubwc_cfg_data sm6115_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sm6125_data =3D { .ubwc_enc_version =3D UBWC_1_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL1 | - UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sm6150_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sm6350_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sm7150_data =3D { .ubwc_enc_version =3D UBWC_2_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 14, }; =20 static const struct qcom_ubwc_cfg_data sm8150_data =3D { .ubwc_enc_version =3D UBWC_3_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 15, }; =20 diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index fee778360ac2..7c9506741001 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -22,9 +22,6 @@ struct qcom_ubwc_cfg_data { * UBWC 4.0 adds the optional ability to disable levels 2 & 3. */ u32 ubwc_swizzle; -#define UBWC_SWIZZLE_ENABLE_LVL1 BIT(0) -#define UBWC_SWIZZLE_ENABLE_LVL2 BIT(1) -#define UBWC_SWIZZLE_ENABLE_LVL3 BIT(2) =20 /** * @highest_bank_bit: Highest Bank Bit @@ -55,12 +52,7 @@ static inline const struct qcom_ubwc_cfg_data *qcom_ubwc= _config_get_data(void) =20 static inline bool qcom_ubwc_get_ubwc_mode(const struct qcom_ubwc_cfg_data= *cfg) { - bool ret =3D cfg->ubwc_enc_version =3D=3D UBWC_1_0; - - if (ret && !(cfg->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LVL1)) - pr_err("UBWC config discrepancy - level 1 swizzling disabled on UBWC 1.0= \n"); - - return ret; + return cfg->ubwc_enc_version =3D=3D UBWC_1_0; } =20 static inline bool qcom_ubwc_min_acc_length_64b(const struct qcom_ubwc_cfg= _data *cfg) @@ -85,8 +77,31 @@ static inline bool qcom_ubwc_bank_spread(const struct qc= om_ubwc_cfg_data *cfg) return true; } =20 +#define UBWC_SWIZZLE_ENABLE_LVL1 BIT(0) +#define UBWC_SWIZZLE_ENABLE_LVL2 BIT(1) +#define UBWC_SWIZZLE_ENABLE_LVL3 BIT(2) + +/** + * @qcom_ubwc_swizzle: Whether to enable level 1, 2 & 3 bank swizzling. + * + * UBWC 1.0 always enables all three levels. + * UBWC 2.0 removes level 1 bank swizzling, leaving levels 2 & 3. + * UBWC 4.0 adds the optional ability to disable levels 2 & 3. + */ static inline u32 qcom_ubwc_swizzle(const struct qcom_ubwc_cfg_data *cfg) { + if (cfg->ubwc_enc_version =3D=3D 0) + return 0; + + if (cfg->ubwc_enc_version =3D=3D UBWC_1_0) + return UBWC_SWIZZLE_ENABLE_LVL1 | + UBWC_SWIZZLE_ENABLE_LVL2 | + UBWC_SWIZZLE_ENABLE_LVL3; + + if (cfg->ubwc_enc_version < UBWC_4_0) + return UBWC_SWIZZLE_ENABLE_LVL2 | + UBWC_SWIZZLE_ENABLE_LVL3; + return cfg->ubwc_swizzle; } =20 --=20 2.47.3 From nobody Sun May 24 23:31:55 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 6DFF63EF0C1 for ; Wed, 20 May 2026 14:52:08 +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=1779288729; cv=none; b=WFqMzlpDx3S1dCxoS7mksxd/zE0GjVo+8RFizNged6PKoKvrUjq+Z93jp6ViZ13YAyPeT99dggLTnIR9XaYF0MSWrT1trvYlHM2f8Yxzpd3kHYEhaVSVrX7ATDmPG1G1qytTLA4mdogHTk1DDDHEbMlvUJUuzBOT1Exe+LNNxcQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288729; c=relaxed/simple; bh=U6uzzgGbS8qZWP3kN5JzxaiSGepe+XDiW2H9yAY88hs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K6bRuhR8xqiiblJ8nD9KQqDyKEA58/FSe1D1CXdMP8YjG/QA17AGUchiMeRdLjvsU150N12mNV2BonnoTUmVJf4+j7jWwMGNfp1z6TpkL25QSptwgzuuh/FbZs5O3lCfryNKQq+UNzs15j0YoXG1/q9KHA9/p47cpz86zKlgp5c= 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=HzLKe+vl; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=TWBks9Hf; 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="HzLKe+vl"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="TWBks9Hf" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KE6cIt119131 for ; Wed, 20 May 2026 14:52:07 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= EeHTbSP+g4o90DbKwuWwTMbeBF1qG02mPQpIYK/H3Bs=; b=HzLKe+vlJOGdZFCb PsUFvUy93hCDj9crUMpbjlJd5sdNZ3Pp4WboHxbc7KXc3X5F6RGLaPiTan8Aqz7F hEpips7DK+NAcbYZ075BXGNz5xIzH1K8/YsueZVKCf3mBw8ySqYIx/2TN+1xK+rj ubFX08/gdi35SZYUlykbBrk19XhijWNVqVygiEw3RN4tHsL4rY4AQfxEdSyvPOEA dwggpGhmqxz5yM20HLB0zsHvzF/p9WyKLsy5c5PI5+K+S4/zZPSp5IBhcm3Oscw0 YyfI6AwlBEBAqh6yzuT9AopqGpogJZ1b3AkDjR3PaSJ/j1PA1lF9yWvxoa/r+9Rl VhJcqw== Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ee886hj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:52:07 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-632ad092bc5so8998547137.2 for ; Wed, 20 May 2026 07:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288727; x=1779893527; 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=EeHTbSP+g4o90DbKwuWwTMbeBF1qG02mPQpIYK/H3Bs=; b=TWBks9Hft+RT5kC3D3NZaA09NKctD5USxCJr0D/R95v4YW2rz5c7HjDbMX5AJ4vFti 2T/X1SEIYjfiH4IeKdG8gQIgkRE7SPAQxSwcB0plS6AAv4DExDdvEmx+TK0rSFVt5NL9 SKmb0j6oneEnzLgnP9ZKL4x2FY268Jw/3s9zDP++Q26qkwIAwO37qkTJHnl0fPboxF5A fXe/lB9sXTb07Rw/9Ig7fz3uHmbXXMU9pRKds/Wg0UxXxur+QspXEme0l2QXrkt1+ogS AAkiPjECN8F0xsHWW7f8qOHm2MC5CB8W73wSn4f983hQR3qPUBJO/+ZuVpRfE6jVklrB ZQ7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288727; x=1779893527; 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=EeHTbSP+g4o90DbKwuWwTMbeBF1qG02mPQpIYK/H3Bs=; b=TepxbeR1ubqqo/RU+mSkESw7Tzmua9JkOMqfIEBJLyY8AKPuCnYfELGoJKCGWOiTP/ M7WX/rav9yBtw/5KOc/bW55zfF+mANNPBwjLb08ilbzZ4MdQ+eMRp5Ixs5Ilv9TGZyP0 rw4ObUdTq11Ganc6Y1UCi1qhlgQ2mORl3GExTsgsZOsJY02NaCGBJMUAAZ2LFdpk3LZA 1t0m1SUB34glKOJGukGs0oM7kdKZ4yLIHKlOm5dZjjnua1yIM1UUEha9ftuWkXOvs84I FzaD49/xlu3dZtDIW5CU6FdgWGYMCvZm9En/cfY8Zj1JDLRaOP+DNHS2GvoSBYG4FzYZ PyNQ== X-Forwarded-Encrypted: i=1; AFNElJ9zbkuMJLmoHA2YJOyjngJBIhU1wYIVghK/e1mwPPnEIqGxu0YlhDlueYcKzJWvIe+sNR8CQ+9Rcri1upQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyT2n29pJNapKzbbJH5nV8hz7rZ5PUbBaNZsP3caz7o5Jk3W3Iw N9n6JETPjyqKqB3LDGZiM2jZF5d0yiP62FFmUvHgI8PpkGFKhhzRkOK3PRaAyV211C9UUIhZlxZ TRvjYF5CHcRNCNj/k6thdIll0mgAiw8MpJG9z8OWYy19bmPgwt7Z/ka8F1KEWHq4Zk84= X-Gm-Gg: Acq92OFa+n0sEME4tCwzdvsxeWJvYC/rPUYeS8d6Vx8vDva186URf0J2YeTkqPMirzj xNJKf+UiUUseU4ffm+bhdTgN0dIUIde0yvrSo1GMs4V8VpQaA6WB+0OPL1xyEL6iH4aDJmhWmdY 5CqOQUoaQs5k7XsR+V53G+hmYZqMvJxOTPPAqIF18bN6tmnKr2aREJpQnrHHZyo+ilUgK6nFfqA xQT1h6liXzTZsBWSEaxr7TWmSzvuJ6J2WyXJ4Ouom4Fv3GoylWPzUaZEMgFjUk7ukwdK1NwzPyo JYwTtkxC7KVHzfmsMROx3lH/eFwUwXmHK1ewL18NkAZrpb0PIJkWUPdUi1L9pk19tBmsbXCN4PC xVHkhRxwf9DnwBcMLR6wv15B3LF8iwT6AI2EmFeFqlqTVY6+zaVRhp6eHIWJujsZJ+rXq60RpzD tmd1FNym4rGuEU/iExP/drJbkB3/lLN67M8Uw= X-Received: by 2002:a05:6102:38cd:b0:631:ff40:22b5 with SMTP id ada2fe7eead31-63a3f38e58dmr13009433137.21.1779288726547; Wed, 20 May 2026 07:52:06 -0700 (PDT) X-Received: by 2002:a05:6102:38cd:b0:631:ff40:22b5 with SMTP id ada2fe7eead31-63a3f38e58dmr13009406137.21.1779288726059; Wed, 20 May 2026 07:52:06 -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-5a90f10c78csm5128907e87.14.2026.05.20.07.52.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:52:05 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:34 +0300 Subject: [PATCH v5 27/28] soc: qcom: ubwc: sort out the rest of the UBWC swizzle settings 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: <20260520-ubwc-rework-v5-27-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4424; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=U6uzzgGbS8qZWP3kN5JzxaiSGepe+XDiW2H9yAY88hs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpqm9uACE6Obeqjp7N+IiijUm9UF0rYlM7Og kL3bWw+u/qJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KagAKCRCLPIo+Aiko 1ZMgCAChjWiZb+ZWT89KSax71gE7IS+zhHDqNg2IFQHu3tGtb7ho93TAWmauYXh4ZBykYhPJZ+F HQ75JL/YdzvD2KRT0/nBZmLRI9SR/4yTetmbqNFshgjVv+oCtmKz9ICnVyIedeb438Fvm2XjwJX i3Ocz7kbB3A4pzMyFzLflInl3gX768nK7vgQTfn25FqxXL86kuOGn1u5TgkMd1IucIveAqwheDM fhVZGCiVGhCgdOl8+7AeYw1sqhdt/J2wQYuoor+c11U+yTQMHxh2GywwO/B3DKUvNgX/EkI8gxz UTxtzEmD2bwf3Ypo4B0gPr3LDpqpqrsOB0QaaTaRsSQm5ecP X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: DLXQG4AcLw3Olaas3TJAvYn7yLUWHpt0 X-Authority-Analysis: v=2.4 cv=e5k2j6p/ c=1 sm=1 tr=0 ts=6a0dca97 cx=c_pps a=N1BjEkVkxJi3uNfLdpvX3g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=3htL6sknLGLhwEng4zIA:9 a=QEXdDO2ut3YA:10 a=crWF4MFLhNY0qMRaF8an:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX7eRGOvlraMWp 8l5gv9/aQ43xsKv31/Rj0CeDzztVkUauNz7Aq97ef83vABWo+WUDSYNQux2+uB7ao+fBfFEVa/P LL9VhN/Ha2VUXGVRLWdm5vOpcC9PoxXGr89Cc558nstGuGp71cvjgNow4kXoozpknYvf3w0xjwf Y4L0FtxiSdh3SZWblTXsrBP0Y3IOrsoiOQqQv1twKGG3atH3/FHyHxWwuyMFzyxLCjPtnrEmmKc k0etk1QS4CrrSN1AQv4lmnMuHrM8/8nJN6VI8zmJERK7OW1kX3syWAkyMb16PtxeLteo3P3NQZg zAi+6FVeq7G3mKocZlZXRYXS0B7EXF2NFvG3aAXe3IMrVzi+XoqqcmpTUZ3e7OKA0EbormmPugk MZZxz5JtK8Ssy91ccX6eQv6XnU5ft+eGBIGEHG+hGaE7BJVayXOFRNdWuGAu8HpJby7tgUFJzG7 K8vN9frmA5L5dKvZlag== X-Proofpoint-GUID: DLXQG4AcLw3Olaas3TJAvYn7yLUWHpt0 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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 Sort out the remaining UBWC swizzle values, using flags to control whether level 2 and level 3 swizzling are enabled or not. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 16 +++------------- include/linux/soc/qcom/ubwc.h | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index 7e321389a399..f27440d5c06f 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -18,16 +18,12 @@ static const struct qcom_ubwc_cfg_data no_ubwc_data =3D= { =20 static const struct qcom_ubwc_cfg_data eliza_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 14 for LP_DDR4 */ .highest_bank_bit =3D 15, }; =20 static const struct qcom_ubwc_cfg_data kaanapali_data =3D { .ubwc_enc_version =3D UBWC_6_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, .highest_bank_bit =3D 16, }; =20 @@ -48,7 +44,7 @@ static const struct qcom_ubwc_cfg_data qcm2290_data =3D { =20 static const struct qcom_ubwc_cfg_data sa8775p_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL3, + .flags =3D UBWC_FLAG_DISABLE_SWIZZLE_LVL2, .highest_bank_bit =3D 13, }; =20 @@ -119,38 +115,32 @@ static const struct qcom_ubwc_cfg_data sm8150_data = =3D { =20 static const struct qcom_ubwc_cfg_data sm8250_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sm8350_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sm8550_data =3D { .ubwc_enc_version =3D UBWC_4_0, - .ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data sm8750_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_swizzle =3D 6, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; =20 static const struct qcom_ubwc_cfg_data glymur_data =3D { .ubwc_enc_version =3D UBWC_5_0, - .ubwc_swizzle =3D 0, + .flags =3D UBWC_FLAG_DISABLE_SWIZZLE_LVL2 | + UBWC_FLAG_DISABLE_SWIZZLE_LVL3, /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ .highest_bank_bit =3D 16, }; diff --git a/include/linux/soc/qcom/ubwc.h b/include/linux/soc/qcom/ubwc.h index 7c9506741001..a7372d9c25fb 100644 --- a/include/linux/soc/qcom/ubwc.h +++ b/include/linux/soc/qcom/ubwc.h @@ -14,15 +14,6 @@ struct qcom_ubwc_cfg_data { u32 ubwc_enc_version; =20 - /** - * @ubwc_swizzle: Whether to enable level 1, 2 & 3 bank swizzling. - * - * UBWC 1.0 always enables all three levels. - * UBWC 2.0 removes level 1 bank swizzling, leaving levels 2 & 3. - * UBWC 4.0 adds the optional ability to disable levels 2 & 3. - */ - u32 ubwc_swizzle; - /** * @highest_bank_bit: Highest Bank Bit * @@ -30,6 +21,10 @@ struct qcom_ubwc_cfg_data { * DDR bank. This should ideally use DRAM type detection. */ int highest_bank_bit; + + unsigned int flags; +#define UBWC_FLAG_DISABLE_SWIZZLE_LVL2 BIT(0) +#define UBWC_FLAG_DISABLE_SWIZZLE_LVL3 BIT(1) }; =20 #define UBWC_1_0 0x10000000 @@ -98,11 +93,16 @@ static inline u32 qcom_ubwc_swizzle(const struct qcom_u= bwc_cfg_data *cfg) UBWC_SWIZZLE_ENABLE_LVL2 | UBWC_SWIZZLE_ENABLE_LVL3; =20 - if (cfg->ubwc_enc_version < UBWC_4_0) - return UBWC_SWIZZLE_ENABLE_LVL2 | - UBWC_SWIZZLE_ENABLE_LVL3; + u32 ubwc_swizzle =3D UBWC_SWIZZLE_ENABLE_LVL2 | + UBWC_SWIZZLE_ENABLE_LVL3; + + if (cfg->flags & UBWC_FLAG_DISABLE_SWIZZLE_LVL2) + ubwc_swizzle &=3D ~UBWC_SWIZZLE_ENABLE_LVL2; + + if (cfg->flags & UBWC_FLAG_DISABLE_SWIZZLE_LVL3) + ubwc_swizzle &=3D ~UBWC_SWIZZLE_ENABLE_LVL3; =20 - return cfg->ubwc_swizzle; + return ubwc_swizzle; } =20 static inline u32 qcom_ubwc_version_tag(const struct qcom_ubwc_cfg_data *c= fg) --=20 2.47.3 From nobody Sun May 24 23:31:55 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 18A753FC5D6 for ; Wed, 20 May 2026 14:52: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=1779288731; cv=none; b=Bodnd1u75uCmfsRwN7fAOjlAsxDk+3GjtoBUbJaJgsM+oooGhKuQGDBJkKW9Z26QD1DwLeY66FfoiMOCqTaFRnREJKpDXrBsclN1tXBiwvrD35wS4W8QzWfPTxg/eo+Df8t8tZ2WZ9FFCAr6RXLApXpOKZr8eziHPC9vSlBKnzY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779288731; c=relaxed/simple; bh=7QAzgQCKghkMJSlTASwV4qFK8Or9Ebb07E1C+n2779c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Mci4xaZPJJyR2N2OhrH44g3CqYXLp5OdU1IPQMDhbyMIppq7I9pegDtGPJaefngHCL1X6Fjj3WmKL2Ny/k8ctshU5mTHRPPifyZzNXCID4POTXIzKitWw1JtgW3qHqYhaNiPNsOuJ9Up4FCwqFj3ep8HuJl6Es7ocVdgGy2g1UE= 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=og5KHyzs; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=JZU4pXdL; 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="og5KHyzs"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="JZU4pXdL" 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 64K9oc331178288 for ; Wed, 20 May 2026 14:52:09 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= qTpfvQmHC1O6sfmESwNnfLVFbxTN4AmdIuk7ii2SPpQ=; b=og5KHyzs3y4W5BY7 n9XHxpkVpLY9YoB5rUQIn44v81HCB0RhlMj6k6sEwC949N2cvk9JmLCF5ZJuJIiQ Jx8KBYMNmMYZsrzq8dhkRQI68uiO6hzuxMVwLQ2amzaUmlhGV80hvlkURC1aIiRT LfImx+v6Y74ZPa0AuAl4/JV3lg1iipP3vT94Pom8URvQmU7LmDsRwJIeYxlI5cqU x4DVevW7NBRbDbsKAeWuBgbf+rPQXvpGZBvnKaHbXD+fvS/qyd+8OyycB9ivhRyj HcrtClFOiCZJFpY/eq0KcaIReLL7hzAgBXCcuETn369PZ7V7+WwoQnoEbgrEolA2 aI5Clw== Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e9ap6s3nn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 14:52:09 +0000 (GMT) Received: by mail-vs1-f69.google.com with SMTP id ada2fe7eead31-63308aa427fso2749051137.1 for ; Wed, 20 May 2026 07:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779288728; x=1779893528; 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=qTpfvQmHC1O6sfmESwNnfLVFbxTN4AmdIuk7ii2SPpQ=; b=JZU4pXdLl5/sQyO/sieLBK/yznGqL95rgk52N5cYQPNSejqneXype2hG2YDJPF+1Ih use1jnt51OqEHhVIikD+t6MgogoMxki0X+0Gzuk699p2YN3c+hpDDJm5HOECJ+MGJRIP 8z+X4tbQv+Gi2yXQ1DdMuOV3jybXbMGsfJCQbMlIeg8Jr3iTlcj0UzUNi3FWmfHgIPu5 P4LSbfFmdQEYxx/PGENwDY1BsaoqbMeyfREhwpYNjDWTNZonpkb36J1SujxgIQEnJHAv PtcBRhmLBiNxUW56agcsnyF5j8ld0cEKp1cq8oN8/N+yhpop3ao8NiUqIDFwXBvKt0kg CvSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779288728; x=1779893528; 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=qTpfvQmHC1O6sfmESwNnfLVFbxTN4AmdIuk7ii2SPpQ=; b=XSwgoXA4Yrw2jU85pVjGeXV9Rd2AaFZ/DB/Ta40GUF+A8GK54ApcglA5S6bozP/ysu wdSngr5KOC1/HpHEjPjN9ch4G9oB6GmTtgTnsHWScL3e9gkoz4MFWBDCjzgvJ1AGy+yC OoZXLVHkrUWed3lFzD8rmoljy7l5dXMH7D+5nBpIXBSjlCdwtMKUQYPM+PeA7wnNriPy +NS3LlXCTR8c+vDU3FfJ166pw+PwVHnRTQ2Fok+c1Sg2w7dl+7R7U4np8EN1LN3K3FSC 8298VjHXIexNG4RizHovwVo7ms5nhTgPkuJ7j6mNea3/Cd71dsOBAhukMRZSSAHxSsGT ApCA== X-Forwarded-Encrypted: i=1; AFNElJ8AF6rsx6CVJXoLsprG0sv1cHcS/ODb2QSpUslWfF0yantPcsmhW6QdUQ4SbibfhqC0ZkC/pjPazM+AGSE=@vger.kernel.org X-Gm-Message-State: AOJu0YwY6AhcjpQpOJp9HDByCH6dYnJ8EZQByoOAb4B8Tfps+V8nkWA5 44sr1tww4661fU03IYD4DW0568xeaRCOiNbjCvvVT9eIKk4v8re9hXsFQdeAYqjixvusUUTfGMX ooXjqhFaR48QqvWUleOrIwCKgaj7d5rFSbg19w3khLKR3pG42/vOdL5SwtKK56ejZlXvZnUOgcd w= X-Gm-Gg: Acq92OF5dbvi0wHS3YTEdgwm2RSXNgiQmk6F5r6MO1aPzgxvasnMRb/rSyPLzHE9G4H MFJu89DTimWPoir/BWkT/22hAoE6Y1U3iJMQyoYUhmpCyDTRTbIC8zoutAMoTPcw/QWLisDG3KL UTuU6HxquIy5ft/n2khis1HE5w2M6rIs/DAHLvHTFq6PJUJfvSlCsJ63zHq9wLr29CpjZSJyjNV LisoPsEIccotlzuoc8ntjF1n142CkLX+u6tW98NKMm6BOJ8KWwF7Lrl8Z7GQyaXpk3NNsfvxTXr TOWN3OjMHVfXLArhrR8gtDAT4SdHv1naYhbNKosG/Z2RjUpCVO/JRg6HiEObZjUt7lDM51IyUcz WEHaJf9YmwcPJMJ4yQWCj3jhGUY4Q4JSAPQn7qpCCcj5raMEk6xqg+W+QDa8cCpLWkHY+UHAYWi X32fIlEmk23KhEKaZPEBHTMbgNbOQRkjEAiV4= X-Received: by 2002:a05:6102:3a12:b0:632:425e:85eb with SMTP id ada2fe7eead31-63a3fb8f7d9mr11822748137.21.1779288728034; Wed, 20 May 2026 07:52:08 -0700 (PDT) X-Received: by 2002:a05:6102:3a12:b0:632:425e:85eb with SMTP id ada2fe7eead31-63a3fb8f7d9mr11822711137.21.1779288727496; Wed, 20 May 2026 07:52: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-5a90f10c78csm5128907e87.14.2026.05.20.07.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 07:52:06 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 20 May 2026 17:51:35 +0300 Subject: [PATCH v5 28/28] soc: qcom: ubwc: deduplicate UBWC configuration data 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: <20260520-ubwc-rework-v5-28-72f2749bc807@oss.qualcomm.com> References: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> In-Reply-To: <20260520-ubwc-rework-v5-0-72f2749bc807@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=11634; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=7QAzgQCKghkMJSlTASwV4qFK8Or9Ebb07E1C+n2779c=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqDcpqblli44p3O+JdL6m0+GZ/bSS3IYHZ/QYJK B9GyjT0eJaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCag3KagAKCRCLPIo+Aiko 1RC7CACDx2T9yR5Sfjt6lijFQ2qhZI5joMoC7pKUu8Zvlc1xmwBt2qkldEAJ2V1j7tpwnyIF4ri o7X6CoCaYqzkAg2JkWXlvuNTMllBaOpMT9WpJuiOXS889PoW78c1YMLok1xopuVoW8x7hjWCbC4 UgGif1lsEgOE/ZVhPwr17x11TUe/Upi4rNHEw3bdyIVpsP9g0oEzmCMQ+rNblJjy7s0jOKFI3G6 dQHGhjneSXsF8GmCoNg3EPSf4ZOu/XCZes+10yZgChvhPiTFCHrrPEb47f8CczIOKF02188R4n/ wPBqP9Jmqi2RsU70lmtsGu6b1BmKPg3HsoYU1IiinRi0sY4k X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: t_cvCJHXOkU1WvqHP7G_CXFTIh8uktns X-Proofpoint-ORIG-GUID: t_cvCJHXOkU1WvqHP7G_CXFTIh8uktns X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE0NSBTYWx0ZWRfX4FlwsdoQ5BXM DDCb1W/CvBFip/X5Kyx4vGV8V1zjY5o8J2XlGUwLKB+i+Xljf+qZac7pVTz1/ZnxLw/JGOQoYFP k4gahhzlYxqAtWqManXNk6+V/dGwt3Tw874pKDHxnjndSLqCoAVRSI8hrR2Nb1UXSh+tHHavLpr qMorBYo/jQw4j/Z1xoxcCn7CVELQzy/GnRM/9yAALQ4UYly3fU4jMCnGjs2WDRr6vKEU+cCx6DN oPPx7PNrDG+nlmWyev6ySRvU26yHQjSdgFoGOAm1mKpNPUqqGZNJqFiPtcU1Ffp17Glpas+hA1P S+xD0GowMR+IG86e/E8ARINATTbzmkqFUXErH+R+65NABz9W/1hTld0j7XBVHf51Vq7yIULeW33 eow1qsDdKlPwkntMH0epQp/DEJfpD3IQAoslao3kX4brUyRDx6oGIiG8D2YoboVVTHsH8lkBGXN HPHxEaHtgCN1K9gvVZQ== X-Authority-Analysis: v=2.4 cv=FesHAp+6 c=1 sm=1 tr=0 ts=6a0dca99 cx=c_pps a=5HAIKLe1ejAbszaTRHs9Ug==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=EdS0WidbVIiCbvCQNVEA:9 a=QEXdDO2ut3YA:10 a=gYDTvv6II1OnSo0itH1n: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-05-20_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 clxscore=1015 priorityscore=1501 phishscore=0 bulkscore=0 suspectscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200145 After removing all extra entries from the UBWC database it is easy to define generic entries, common for all machine classes. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/soc/qcom/ubwc_config.c | 196 ++++++++++++++++---------------------= ---- 1 file changed, 76 insertions(+), 120 deletions(-) diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c index f27440d5c06f..4eb115a7fc50 100644 --- a/drivers/soc/qcom/ubwc_config.c +++ b/drivers/soc/qcom/ubwc_config.c @@ -16,125 +16,81 @@ static const struct qcom_ubwc_cfg_data no_ubwc_data = =3D { /* no UBWC, no HBB */ }; =20 -static const struct qcom_ubwc_cfg_data eliza_data =3D { - .ubwc_enc_version =3D UBWC_5_0, - /* TODO: highest_bank_bit =3D 14 for LP_DDR4 */ +static const struct qcom_ubwc_cfg_data ubwc_0_0_hbb15 =3D { + /* no UBWC */ .highest_bank_bit =3D 15, }; =20 -static const struct qcom_ubwc_cfg_data kaanapali_data =3D { - .ubwc_enc_version =3D UBWC_6_0, - .highest_bank_bit =3D 16, +static const struct qcom_ubwc_cfg_data ubwc_1_0_hbb14 =3D { + .ubwc_enc_version =3D UBWC_1_0, + .highest_bank_bit =3D 14, }; =20 -static const struct qcom_ubwc_cfg_data msm8937_data =3D { +static const struct qcom_ubwc_cfg_data ubwc_1_0_hbb15 =3D { .ubwc_enc_version =3D UBWC_1_0, + .highest_bank_bit =3D 15, +}; + +static const struct qcom_ubwc_cfg_data ubwc_2_0_hbb14 =3D { + .ubwc_enc_version =3D UBWC_2_0, .highest_bank_bit =3D 14, }; =20 -static const struct qcom_ubwc_cfg_data msm8998_data =3D { - .ubwc_enc_version =3D UBWC_1_0, +static const struct qcom_ubwc_cfg_data ubwc_2_0_hbb15 =3D { + .ubwc_enc_version =3D UBWC_2_0, .highest_bank_bit =3D 15, }; =20 -static const struct qcom_ubwc_cfg_data qcm2290_data =3D { - /* no UBWC */ +static const struct qcom_ubwc_cfg_data ubwc_3_0_hbb15 =3D { + .ubwc_enc_version =3D UBWC_3_0, .highest_bank_bit =3D 15, }; =20 -static const struct qcom_ubwc_cfg_data sa8775p_data =3D { - .ubwc_enc_version =3D UBWC_4_0, - .flags =3D UBWC_FLAG_DISABLE_SWIZZLE_LVL2, - .highest_bank_bit =3D 13, +static const struct qcom_ubwc_cfg_data ubwc_3_0_hbb16 =3D { + .ubwc_enc_version =3D UBWC_3_0, + .highest_bank_bit =3D 16, }; =20 -static const struct qcom_ubwc_cfg_data sar2130p_data =3D { +static const struct qcom_ubwc_cfg_data ubwc_3_1_hbb13 =3D { .ubwc_enc_version =3D UBWC_3_1, .highest_bank_bit =3D 13, }; =20 -static const struct qcom_ubwc_cfg_data sc7180_data =3D { - .ubwc_enc_version =3D UBWC_2_0, - .highest_bank_bit =3D 14, -}; - -static const struct qcom_ubwc_cfg_data sc7280_data =3D { +static const struct qcom_ubwc_cfg_data ubwc_3_1_hbb14 =3D { .ubwc_enc_version =3D UBWC_3_1, .highest_bank_bit =3D 14, }; =20 -static const struct qcom_ubwc_cfg_data sc8180x_data =3D { +static const struct qcom_ubwc_cfg_data ubwc_3_1_hbb16 =3D { .ubwc_enc_version =3D UBWC_3_1, .highest_bank_bit =3D 16, }; =20 -static const struct qcom_ubwc_cfg_data sc8280xp_data =3D { +static const struct qcom_ubwc_cfg_data ubwc_4_0_hbb16 =3D { .ubwc_enc_version =3D UBWC_4_0, .highest_bank_bit =3D 16, }; =20 -static const struct qcom_ubwc_cfg_data sdm670_data =3D { - .ubwc_enc_version =3D UBWC_2_0, - .highest_bank_bit =3D 14, -}; - -static const struct qcom_ubwc_cfg_data sdm845_data =3D { - .ubwc_enc_version =3D UBWC_2_0, - .highest_bank_bit =3D 15, -}; - -static const struct qcom_ubwc_cfg_data sm6115_data =3D { - .ubwc_enc_version =3D UBWC_1_0, - .highest_bank_bit =3D 14, -}; - -static const struct qcom_ubwc_cfg_data sm6125_data =3D { - .ubwc_enc_version =3D UBWC_1_0, - .highest_bank_bit =3D 14, -}; - -static const struct qcom_ubwc_cfg_data sm6150_data =3D { - .ubwc_enc_version =3D UBWC_2_0, - .highest_bank_bit =3D 14, -}; - -static const struct qcom_ubwc_cfg_data sm6350_data =3D { - .ubwc_enc_version =3D UBWC_2_0, - .highest_bank_bit =3D 14, -}; - -static const struct qcom_ubwc_cfg_data sm7150_data =3D { - .ubwc_enc_version =3D UBWC_2_0, - .highest_bank_bit =3D 14, -}; - -static const struct qcom_ubwc_cfg_data sm8150_data =3D { - .ubwc_enc_version =3D UBWC_3_0, +static const struct qcom_ubwc_cfg_data ubwc_5_0_hbb15 =3D { + .ubwc_enc_version =3D UBWC_5_0, + /* TODO: highest_bank_bit =3D 14 for LP_DDR4 */ .highest_bank_bit =3D 15, }; =20 -static const struct qcom_ubwc_cfg_data sm8250_data =3D { - .ubwc_enc_version =3D UBWC_4_0, - /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ +static const struct qcom_ubwc_cfg_data ubwc_5_0_hbb16 =3D { + .ubwc_enc_version =3D UBWC_5_0, .highest_bank_bit =3D 16, }; =20 -static const struct qcom_ubwc_cfg_data sm8350_data =3D { - .ubwc_enc_version =3D UBWC_4_0, - /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ +static const struct qcom_ubwc_cfg_data ubwc_6_0_hbb16 =3D { + .ubwc_enc_version =3D UBWC_6_0, .highest_bank_bit =3D 16, }; =20 -static const struct qcom_ubwc_cfg_data sm8550_data =3D { +static const struct qcom_ubwc_cfg_data sa8775p_data =3D { .ubwc_enc_version =3D UBWC_4_0, - /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ - .highest_bank_bit =3D 16, -}; - -static const struct qcom_ubwc_cfg_data sm8750_data =3D { - .ubwc_enc_version =3D UBWC_5_0, - /* TODO: highest_bank_bit =3D 15 for LP_DDR4 */ - .highest_bank_bit =3D 16, + .flags =3D UBWC_FLAG_DISABLE_SWIZZLE_LVL2, + .highest_bank_bit =3D 13, }; =20 static const struct qcom_ubwc_cfg_data glymur_data =3D { @@ -149,61 +105,61 @@ static const struct of_device_id qcom_ubwc_configs[] = __maybe_unused =3D { { .compatible =3D "qcom,apq8016", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,apq8026", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,apq8074", .data =3D &no_ubwc_data }, - { .compatible =3D "qcom,apq8096", .data =3D &msm8998_data }, - { .compatible =3D "qcom,eliza", .data =3D &eliza_data, }, - { .compatible =3D "qcom,kaanapali", .data =3D &kaanapali_data, }, + { .compatible =3D "qcom,apq8096", .data =3D &ubwc_1_0_hbb15 }, + { .compatible =3D "qcom,eliza", .data =3D &ubwc_5_0_hbb15 }, { .compatible =3D "qcom,glymur", .data =3D &glymur_data}, + { .compatible =3D "qcom,kaanapali", .data =3D &ubwc_6_0_hbb16 }, { .compatible =3D "qcom,mahua", .data =3D &glymur_data }, { .compatible =3D "qcom,msm8226", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,msm8916", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,msm8917", .data =3D &no_ubwc_data }, - { .compatible =3D "qcom,msm8937", .data =3D &msm8937_data }, + { .compatible =3D "qcom,msm8937", .data =3D &ubwc_1_0_hbb14 }, { .compatible =3D "qcom,msm8929", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,msm8939", .data =3D &no_ubwc_data }, - { .compatible =3D "qcom,msm8953", .data =3D &msm8937_data }, + { .compatible =3D "qcom,msm8953", .data =3D &ubwc_1_0_hbb14 }, { .compatible =3D "qcom,msm8956", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,msm8974", .data =3D &no_ubwc_data }, { .compatible =3D "qcom,msm8976", .data =3D &no_ubwc_data }, - { .compatible =3D "qcom,msm8996", .data =3D &msm8998_data }, - { .compatible =3D "qcom,msm8998", .data =3D &msm8998_data }, - { .compatible =3D "qcom,qcm2290", .data =3D &qcm2290_data, }, - { .compatible =3D "qcom,qcm6490", .data =3D &sc7280_data, }, - { .compatible =3D "qcom,qcs8300", .data =3D &sc8280xp_data, }, - { .compatible =3D "qcom,sa8155p", .data =3D &sm8150_data, }, - { .compatible =3D "qcom,sa8540p", .data =3D &sc8280xp_data, }, + { .compatible =3D "qcom,msm8996", .data =3D &ubwc_1_0_hbb15 }, + { .compatible =3D "qcom,msm8998", .data =3D &ubwc_1_0_hbb15 }, + { .compatible =3D "qcom,qcm2290", .data =3D &ubwc_0_0_hbb15, }, + { .compatible =3D "qcom,qcm6490", .data =3D &ubwc_3_1_hbb14, }, + { .compatible =3D "qcom,qcs8300", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sa8155p", .data =3D &ubwc_3_0_hbb15, }, + { .compatible =3D "qcom,sa8540p", .data =3D &ubwc_4_0_hbb16, }, { .compatible =3D "qcom,sa8775p", .data =3D &sa8775p_data, }, - { .compatible =3D "qcom,sar2130p", .data =3D &sar2130p_data }, - { .compatible =3D "qcom,sc7180", .data =3D &sc7180_data }, - { .compatible =3D "qcom,sc7280", .data =3D &sc7280_data, }, - { .compatible =3D "qcom,sc8180x", .data =3D &sc8180x_data, }, - { .compatible =3D "qcom,sc8280xp", .data =3D &sc8280xp_data, }, - { .compatible =3D "qcom,sda660", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm450", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm630", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm632", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm636", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm660", .data =3D &msm8937_data }, - { .compatible =3D "qcom,sdm670", .data =3D &sdm670_data, }, - { .compatible =3D "qcom,sdm845", .data =3D &sdm845_data, }, - { .compatible =3D "qcom,sm4250", .data =3D &sm6115_data, }, - { .compatible =3D "qcom,sm6115", .data =3D &sm6115_data, }, - { .compatible =3D "qcom,sm6125", .data =3D &sm6125_data, }, - { .compatible =3D "qcom,sm6150", .data =3D &sm6150_data, }, - { .compatible =3D "qcom,sm6350", .data =3D &sm6350_data, }, - { .compatible =3D "qcom,sm6375", .data =3D &sm6350_data, }, - { .compatible =3D "qcom,sm7125", .data =3D &sc7180_data }, - { .compatible =3D "qcom,sm7150", .data =3D &sm7150_data, }, - { .compatible =3D "qcom,sm7225", .data =3D &sm6350_data, }, - { .compatible =3D "qcom,sm7325", .data =3D &sc7280_data, }, - { .compatible =3D "qcom,sm8150", .data =3D &sm8150_data, }, - { .compatible =3D "qcom,sm8250", .data =3D &sm8250_data, }, - { .compatible =3D "qcom,sm8350", .data =3D &sm8350_data, }, - { .compatible =3D "qcom,sm8450", .data =3D &sm8350_data, }, - { .compatible =3D "qcom,sm8550", .data =3D &sm8550_data, }, - { .compatible =3D "qcom,sm8650", .data =3D &sm8550_data, }, - { .compatible =3D "qcom,sm8750", .data =3D &sm8750_data, }, - { .compatible =3D "qcom,x1e80100", .data =3D &sm8550_data, }, - { .compatible =3D "qcom,x1p42100", .data =3D &sm8550_data, }, + { .compatible =3D "qcom,sar2130p", .data =3D &ubwc_3_1_hbb13 }, + { .compatible =3D "qcom,sc7180", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sc7280", .data =3D &ubwc_3_1_hbb14, }, + { .compatible =3D "qcom,sc8180x", .data =3D &ubwc_3_1_hbb16, }, + { .compatible =3D "qcom,sc8280xp", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sda660", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm450", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm630", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm632", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm636", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm660", .data =3D &ubwc_1_0_hbb14 }, + { .compatible =3D "qcom,sdm670", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sdm845", .data =3D &ubwc_2_0_hbb15, }, + { .compatible =3D "qcom,sm4250", .data =3D &ubwc_1_0_hbb14, }, + { .compatible =3D "qcom,sm6115", .data =3D &ubwc_1_0_hbb14, }, + { .compatible =3D "qcom,sm6125", .data =3D &ubwc_1_0_hbb14, }, + { .compatible =3D "qcom,sm6150", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm6350", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm6375", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm7125", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm7150", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm7225", .data =3D &ubwc_2_0_hbb14, }, + { .compatible =3D "qcom,sm7325", .data =3D &ubwc_3_1_hbb14, }, + { .compatible =3D "qcom,sm8150", .data =3D &ubwc_3_0_hbb15, }, + { .compatible =3D "qcom,sm8250", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sm8350", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sm8450", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sm8550", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sm8650", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,sm8750", .data =3D &ubwc_5_0_hbb16, }, + { .compatible =3D "qcom,x1e80100", .data =3D &ubwc_4_0_hbb16, }, + { .compatible =3D "qcom,x1p42100", .data =3D &ubwc_4_0_hbb16, }, { } }; =20 --=20 2.47.3