From nobody Mon Feb 9 09:33:22 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 B60CD31A556 for ; Sun, 25 Jan 2026 11:30:29 +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=1769340631; cv=none; b=eHLHiHGgeN9ra8qlwpgw6h3bvqp/4ansJhMp4iYGPF/YGlT6msgJqNSIDrvsmsh3V/bgROe3tf4FJ6gki67P2IX7ZfcE53EwHo+4oBb/VxexU4fkU2DDWsJ+nWpSwynQY3X/ZolokxdDaFJf25DzaSRVAMPsFXnfzp96WLreEwI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769340631; c=relaxed/simple; bh=I0GJCkT+M6rzwScGE2nHMtdPm0YonKxq+nwx5NI6V5w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g9Q5faMfC5Zj5ntnwdTwc7O8kOxCDjgD59ScENG/gBXLMKreL93ZrWMVXq7pnHs8XYoN3o0ogL5sn7ZxifG0OYVPV7z59BAfmE5JGDCwXNWx1YcjbPK8yRRwfh8ZNz1pIS2z/dFN7w099fVc5NAfAAUMQA3o6EW4bCgxV62bvyk= 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=ZqrwAWTS; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ZL0a/o3u; 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="ZqrwAWTS"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ZL0a/o3u" 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 60P9j2uc2863776 for ; Sun, 25 Jan 2026 11:30:29 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= SyQqdK9jmZKeNVXJQVvQIDZmFlPQgBoBYfDnZTubWOk=; b=ZqrwAWTSQABX2npi TVIHRRRAO64dO8G/rheiBW9cDNHF+Tt3eW0tjfIPQfhQtjN9wCkIumkHfhgBdHo5 3xGpFhJYsGZsmRVVV/hayuQD5N3Pejw6g3FYJ+C1tURa/x5wE96/6gLZpp74HbcR u+5nh0G2gbKFn+WSC0tDRC+osTk1bhrSTuO2Z95iWpKyRHT5glW3FzodXo61advE bKq0JnqxjNAfew6LySMuJ/IE3+uQxXVRTNApunhfLnRqLKAYiZ2Vqze0FICkL63c gGli5QmgDSsEvWrOt26g3I7/Q+zSHIXJvvV682Wr2euf9UjtlOrPQ4emV9hlKU3V CJRRQg== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bvw4wsh6e-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 25 Jan 2026 11:30:28 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8bb9f029f31so1320057285a.2 for ; Sun, 25 Jan 2026 03:30:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1769340628; x=1769945428; 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=SyQqdK9jmZKeNVXJQVvQIDZmFlPQgBoBYfDnZTubWOk=; b=ZL0a/o3uMMvPsbSSH4DSrP0qIk1JuOtseDtVcL5auY33al04Slur7SzKYyv7KDcPYP yjD82SAopVVVEfLt8NKoX1nof1TSis8vyDZretQZep+3HoI/YIQd9gbBrkcv6QSx4uRt tRoeYglF99vavZJG97WHoRLIdKKgIzScqCu3J86ynMGDlJD7wJdLeLkFco44k3cVztNp Y7NOL7qHMpcwQWmk8jzJYIAhVCu5Y8ooC4R/pHAr4WKDldJDGM9OTrkVe3777pO6GKPz sTUYPT7cP6+Y6cOWiUcWMEc9MH3MsVDUXOzjXXqAXLzdrkuEjyV69QhdJR5X3ZaZaVem 8nRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769340628; x=1769945428; 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=SyQqdK9jmZKeNVXJQVvQIDZmFlPQgBoBYfDnZTubWOk=; b=QOvwZLimRP+KU0vCCeabzLUW1slQKj/lQvsoVHOrd1glwU4QPqv1K95w5EsO/8SHM3 j5dNFkLWv9wmwyO+I4c1Ey5pYgoxqPNxIMXxPAFKM1fh8v3S88p0vrddQJsnh/ZrBZ3a YKIH3cnhi2fo0kKrDnnwczYQisT78/jFqfEzITONRK2GSEEiTl1B89kh3mLAA9O3qKkn eRyGE/nv8IXC6yvwjeduVQuO8YK/F81KC1Wn/1Y4f8DiCnykLBvxldsis8n7RFzOKq+M HcJBFA62mvB7xR4Que8nk48NamrFk//cC2ZpYUJsEEJsLB+vXiXxiEP6acoNKH/UN1RY BtQw== X-Forwarded-Encrypted: i=1; AJvYcCW+E+Nc2E/HD2j8fXgSU/QYL/4/GOmeHX+L3rUNIjCB9eveQDD8QaFF4MzoZHTQQemjPP96hXfvulvAAJI=@vger.kernel.org X-Gm-Message-State: AOJu0YzVfIqUiYAZNGpAos1d5GagLbkLmvqMId1WwPj/OECA0U9XebSR M23fUraKTrj4rknGfbnSNNE7y1cqGtBSOGYEFtq6h/2z+26RYPiHthdh9C28g6iFWroFspnA8Tt p1ugBvG6ph6EnKEv/jg7gugM/ijwE/ppw0YzjJdQ+XrchtsSCX/1S02Js3vUOW6JjXJU= X-Gm-Gg: AZuq6aJQ8ERw1CPApCQZv8Uh1pqI7pNdjC3aOUJ7MTkDMqa9B5oFDFTHcT19fFUEBDG pWi3k0TsTzC2o2vm4i6yJ+/G1qCG3dtGLw0wo5E7seoxWZ+Qk6bO614/ffGOpIToKaK6DItYJRv ZIchXa1PjA9obQBYXv0gAZdEKc1n3vamFIEuvpD6Fwf60Iip/977aNw3wAAYr47r5ChnbRBAIkd Ru7+IgtW5OnjTjMuQL/AF8SxhN5N3hyaqt+6rPpIdQtXvahGBABsj2TRDfLgCQYcfGe+CYtq/ds 2nmaX5JzUbV1U5JWFcVM1TqlcgKCZQ3L3BEjcL5ws7//qkJwmWwAvj3IxkUfQuQ/kZxG4xUFR/I h2TUhg70kdwW2clOuZKqXTeV9QIttztk/Q08IlcE+AGoqcuqdeMjXHhADm1hvfssvL/2lqj0T+r 9/1T0IRGGybFAxbdz/d7wXlyE= X-Received: by 2002:a05:620a:461f:b0:8c6:a608:5abc with SMTP id af79cd13be357-8c6f95fd92emr156260685a.28.1769340628065; Sun, 25 Jan 2026 03:30:28 -0800 (PST) X-Received: by 2002:a05:620a:461f:b0:8c6:a608:5abc with SMTP id af79cd13be357-8c6f95fd92emr156258385a.28.1769340627680; Sun, 25 Jan 2026 03:30:27 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-385d9fec3c9sm18583451fa.15.2026.01.25.03.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 03:30:25 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 25 Jan 2026 13:30:08 +0200 Subject: [PATCH v4 6/9] media: iris: don't specify ubwc_swizzle in the source 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: <20260125-iris-ubwc-v4-6-1ff30644ac81@oss.qualcomm.com> References: <20260125-iris-ubwc-v4-0-1ff30644ac81@oss.qualcomm.com> In-Reply-To: <20260125-iris-ubwc-v4-0-1ff30644ac81@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Akhil P Oommen , Vikash Garodia , Dikshita Agarwal , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-media@vger.kernel.org, Bryan O'Donoghue , Wangao Wang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3286; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=I0GJCkT+M6rzwScGE2nHMtdPm0YonKxq+nwx5NI6V5w=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpdf6/r+/CRSOtjlesB321W8+/NVuCWNV5b7blO 3tD6mjH262JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaXX+vwAKCRCLPIo+Aiko 1UMeCACfr6fMyFR/w1e2kdiDjfvPQe/y223f1zEgA73d6AKI50kP2ZsaBhG04vLvbeVPTzZdQzv ftfQdeTefNyGINHx3JGZaX2evrbO2fKqgIAQlYUvmvpCyB9XoyKxgpIPmAr1VjKAxRKPugxxW0Q rgGGaUDtSRlhjpMJmO7TDFGanZK4Q00jh4OprV9iM3qwhWGCldRVI2N68bR3QOVoHT7s3j4VruK aodCfVgHUClwmn33Ad23lKsNGaIfPKi9WKfLMsFT4qIlCAzQnYwQsBdZ5OSfeTVecqQ0g1yq/+D kjhB3WEiz30ELAQL5J/Q7KCz+A5wRoERB3HoDGvxSBZqpC9K X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: sZmdc5su9M6Qhejp8P7cYNUZwChGAO-I X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI1MDA5NSBTYWx0ZWRfX5ZrTCVUgwD3n tlgle1vkMNJC6Ommtv4+hVsx5PdFwm9BDgYdmzk7dnA/l8SFebw45Yx1Zc4gLVbW2Eymi76RtDQ rF9pm6g7FDJTF482qH2rNv8DxHoP3VWnMsDgqyz5cejx544iHg31JrUJ5G8R2CBJQ2TJs9Yv9v3 XTI7mihxF25aDQJ6/zM0ixhL0BrI/WQTwIZXtyKF4Sbm3z466Tt9noY+7K820upY0ZHOxgU5Ryp eUG5qDr948++DXSjpwMEqNNAc/v/JvXg0JPCr53MqSbeLK0/bq8WLp9YPgeJB2qfzIRrzEOMCvT 0eo/13fyDG423txZNbz5zcryqvK9PAoD5GWr2a8wgZpaL24MoBywySWa5QeNTYMM9HW0cODKI0c A16PYvGxvuBeuacDyiEeL/j+IpoxtNKBnQDIoVuz+8PeGSfynxQ1v9I930zLMdYM5FzNOXj+zbL sfLgu9aL98wHIdD1OIg== X-Proofpoint-ORIG-GUID: sZmdc5su9M6Qhejp8P7cYNUZwChGAO-I X-Authority-Analysis: v=2.4 cv=POgCOPqC c=1 sm=1 tr=0 ts=6975fed5 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=4H5-pPW84uT1T8hsIVgA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.20,FMLib:17.12.100.49 definitions=2026-01-25_02,2026-01-22_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 impostorscore=0 spamscore=0 bulkscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601250095 The UBWC swizzle is specified both in the Iris driver and in the platform UBWC config. Use the platform UBWC configuration instead of specifying it directly in the source. Reviewed-by: Konrad Dybcio Reviewed-by: Bryan O'Donoghue Reviewed-by: Dikshita Agarwal Tested-by: Wangao Wang Signed-off-by: Dmitry Baryshkov --- drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c | 6 +++--- drivers/media/platform/qcom/iris/iris_platform_common.h | 3 --- drivers/media/platform/qcom/iris/iris_platform_gen2.c | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c b/driv= ers/media/platform/qcom/iris/iris_hfi_gen2_packet.c index 6dc0cbaa9c19..a4d9efdbb43b 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c @@ -170,7 +170,7 @@ void iris_hfi_gen2_packet_sys_init(struct iris_core *co= re, struct iris_hfi_heade &payload, sizeof(u32)); =20 - payload =3D core->iris_platform_data->ubwc_config->bank_swzl_level; + payload =3D !!(qcom_ubwc_swizzle(ubwc) & UBWC_SWIZZLE_ENABLE_LVL1); iris_hfi_gen2_create_packet(hdr, HFI_PROP_UBWC_BANK_SWZL_LEVEL1, HFI_HOST_FLAGS_NONE, @@ -180,7 +180,7 @@ void iris_hfi_gen2_packet_sys_init(struct iris_core *co= re, struct iris_hfi_heade &payload, sizeof(u32)); =20 - payload =3D core->iris_platform_data->ubwc_config->bank_swz2_level; + payload =3D !!(qcom_ubwc_swizzle(ubwc) & UBWC_SWIZZLE_ENABLE_LVL2); iris_hfi_gen2_create_packet(hdr, HFI_PROP_UBWC_BANK_SWZL_LEVEL2, HFI_HOST_FLAGS_NONE, @@ -190,7 +190,7 @@ void iris_hfi_gen2_packet_sys_init(struct iris_core *co= re, struct iris_hfi_heade &payload, sizeof(u32)); =20 - payload =3D core->iris_platform_data->ubwc_config->bank_swz3_level; + payload =3D !!(qcom_ubwc_swizzle(ubwc) & UBWC_SWIZZLE_ENABLE_LVL3); iris_hfi_gen2_create_packet(hdr, HFI_PROP_UBWC_BANK_SWZL_LEVEL3, HFI_HOST_FLAGS_NONE, diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/driv= ers/media/platform/qcom/iris/iris_platform_common.h index 5639eb5a75b6..e217f15ef028 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -77,9 +77,6 @@ struct tz_cp_config { =20 struct ubwc_config_data { u32 max_channels; - u32 bank_swzl_level; - u32 bank_swz2_level; - u32 bank_swz3_level; u32 bank_spreading; }; =20 diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/driver= s/media/platform/qcom/iris/iris_platform_gen2.c index bdeb92e0b7bc..8072f430bd26 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -792,9 +792,6 @@ static const char * const sm8550_opp_clk_table[] =3D { =20 static struct ubwc_config_data ubwc_config_sm8550 =3D { .max_channels =3D 8, - .bank_swzl_level =3D 0, - .bank_swz2_level =3D 1, - .bank_swz3_level =3D 1, .bank_spreading =3D 1, }; =20 --=20 2.47.3