From nobody Mon Feb 9 14:15:02 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2EA3C12B93 for ; Sat, 10 Jan 2026 19:38:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768073891; cv=none; b=qHsj3+4HnTO0WfqIXPYNpWEm+loUGgo/AYcH+DzhMSeerBycMH8hrc4pe7DqbMLMLqP6Gg7XM8AcYzdzPc65hMy6XEh9XJHXsM6GuanuKq9hqkmBYoEtSXJaPaAPVT3rJJSKqGJ3gjAzmUN7A3AKLV0E2ovwXVCTzSGxGJjMDQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768073891; c=relaxed/simple; bh=wPApkxuh4lfLkguH9VNNQc3BFntt8VOiO6TMdbr3Zds=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=m5K76sNroEfIAoEL0MtFVoSnS5k6iIYXtm2uvC5abHxocBuZsWaYNl6hju9XFsjP/xFYJGYeZMmzmGPj2BHurmdgqTj6Zd5KS7iJLFsoAQWrhFHpN4hvI1sjE+p3Ix523i1FxCJ/dtqt5aIQi9AQHLgNDPwD4No+4H14EIRWb6M= 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=E6VOGJUG; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=MpsH7al6; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="E6VOGJUG"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="MpsH7al6" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60AI8XDb3884337 for ; Sat, 10 Jan 2026 19:38: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= gK+pnJ21j1i9U/bbLvHtPo8Y26e9MJOkY3Hs+TWsP98=; b=E6VOGJUGy61sVQhC sTL6ONEeLNvGbeqIEZSCr7OTYTbQQKSl3okuOUlb6Ptntc4xzteoRxhxUZQaFXVm 2RRSkCuTUdH6U0C/yz9XjzGgt84YdUDtukdixmVfzQ+Yu6vdUY6+Tiz/mk8in0zn uRXBI7v49eCpFQnRyIVh1GY5sY6lIDAMgH4HJUelFLIE84mD36TPNUSpUNYqmbSv JpaO1Cn5n5wkV6xrCLGJQ0WV60idtUdXl8ZH5gB4bMQ2RWr+vjFchfgPwaj/IlYZ vWaCmBZBQAXKATq5U9fFmQQJ1xZhaJ9BpXBROTmu2ZFdFs0dTsp5Nwmn6PsbT0xk +jgc9g== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bkmem0pmk-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 10 Jan 2026 19:38:06 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8c38129a433so1383452085a.2 for ; Sat, 10 Jan 2026 11:38:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768073886; x=1768678686; 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=gK+pnJ21j1i9U/bbLvHtPo8Y26e9MJOkY3Hs+TWsP98=; b=MpsH7al6JKA2YwDpYFcuQOAZLwVW04RD5+qZAkJ1lpiRXmzig1QyEKYVKWAUdfV4Ua QX6fjmwt8IcqrFysoJEFbracevQx2tpdjdxO0a0srqGqrq6F/nVuMrgSpsOMWCltyz66 Fh08QGtdy+vaRx3Z04uJjO3JWj6X0K1eHzfCZQiI74XsmmjGw5XmwzyNTVfFjWwGTcy2 obBoB2qz/0ZD8lxMr2rTOT4N9+hOGecXFT0d+0Sk/fq6vyH92ooxuHl7WmSkSKTcPipY disHqDEcuUpR8XguIUh7woNY872gTZcRry/6mkvaPZsl6sHg4JvCbGB2WOuSXF3RFqJ9 agzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768073886; x=1768678686; 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=gK+pnJ21j1i9U/bbLvHtPo8Y26e9MJOkY3Hs+TWsP98=; b=CltV/a8s1MOArFb3AZsvVjZeza6ygzw64nq6M07JAD7oCLjQg8yfSv7jKnGrdnxf7k mGIYuoYHppYlAElkFDp1R2uhcYtrUgOyDplptIUV0htQxpnjnc/45V9Gdds/z69Xpc3/ eYjwupAW82tbshnGSHOfHY8jl8B2kRbVPBgaBQWt895s0JBqnQpXY1Rhe+5lWpYhkUZ8 rfRaiEvMC3/SY/FOT+sKz7bTkMJHa5LpTsXiwCyyWYhknRvY1RG5KY2sIYnYym1l/p+H t2+PqQPulHmA3LA8I3rBqlnoZb9Bb8zTIcbivWYC28wtgEIxzgJd1SGSBIggGtrmL3zr V/IA== X-Forwarded-Encrypted: i=1; AJvYcCXXVFXuAEe08+YEGhSSvu/i/w0Bc2vGuJ5kUDF5JtMwReFCT7Ug8YWm+cYt4Dc7yVJDPCpjo9356IccygI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxf21BumE//cByDL3i2buxZHJVERKIsrfBucYbXPeF7MIyXM6dg SULOYxXDj8ogia3uZquWYrhvJEVdzsivMf/q8W9VZo5Orp+MWfYOwwSXx4cHrWp+R9qY+LkCqXa yuoRM1HvqLm7P95nhwJu6v3zXboU518xS8PKgqwDQWv3w6GHoz2bagioD/1gvD31GtW0= X-Gm-Gg: AY/fxX78CGuPjog4Npayl9iQFKSUQv40eSZFcpHtYZGYIsBUyC8IUGNXmAN/+sRv48I pMy4jufMaiDQLfgNQGNH2Uh24ZOITwbAiOwcctTNVfHt5bus+zx4JbzdJaEX6eMlmoItBWxzKU6 Nfo9gMVtDLVZErzkn6uyEwty3DIueatf5eN5CQ+h4T9oWCH6TIz8MCAh8G0At0nc0oc7TniPHbF 8InPaQIYXpwtCIiuQJTNXwVsaf8dOJlv1LZv9RijrShXW4rFa/nmg25OKxwhcLL1yiApYNKZpfk UIjxG/PTwBP7+AtNnGMFZo/piDTv4hoiX8J3d+vHyN96Anc8He3ZwxlOa15e/U18JmHfXRVj1iB uHbU77jfl4opiFP/l1yPHLkVGkzOQm/o77t12DTr9TfK1MsqmKJrrFe2i7iVvrVnLYrUFRK1qVb NwSxCsOcm7sTqvuBqw8mMSqtg= X-Received: by 2002:a05:620a:1925:b0:8b2:ea3f:2f91 with SMTP id af79cd13be357-8c38941be22mr1791695585a.81.1768073885493; Sat, 10 Jan 2026 11:38:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IEIKWgn/ESS0qupy6xBZrxuNNEEt1VDukrNT5CaPVcHGZGReo2NFsBi2b+nv6ZXh9qRMm0aJg== X-Received: by 2002:a05:620a:1925:b0:8b2:ea3f:2f91 with SMTP id af79cd13be357-8c38941be22mr1791693585a.81.1768073885052; Sat, 10 Jan 2026 11:38:05 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59b65d0f6absm3539700e87.42.2026.01.10.11.38.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jan 2026 11:38:04 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 10 Jan 2026 21:37:58 +0200 Subject: [PATCH 06/11] 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: <20260110-iris-ubwc-v1-6-dd70494dcd7b@oss.qualcomm.com> References: <20260110-iris-ubwc-v1-0-dd70494dcd7b@oss.qualcomm.com> In-Reply-To: <20260110-iris-ubwc-v1-0-dd70494dcd7b@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 X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3036; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=wPApkxuh4lfLkguH9VNNQc3BFntt8VOiO6TMdbr3Zds=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpYqqTqJmApBFFw10nL1vWSv+/MlslTeTh12Vy7 IceARZggeaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaWKqkwAKCRCLPIo+Aiko 1QHuB/9SDh8YAvc7H5s3wL2CsuB8vGeKPCPurzevmcKRHH1YnrOFa7QKcZ37MhNPhXNFF6K1xxp jsh+JHZLsbflUJExjO1oH36XdfZg2hDrpk47mqwbOhd6x6RKZJBVUwJOxbYS+qofypTKBbliKEw qMJfjCjO8jHHO7/a7U5SSxk+QREto7FgnTdDPK0DbjzWAPIh9E/RX05mQmDDqq/VFCXNHyk8YJR Ka8rPLLcuK6cTDY8ZxwEhTMtt8934hmWXJEikYkHY90pN6ShtsSOU0N69ORl5JUbekwAuxb9nHz bCX2FMRAD/6/NTjuZQvhq8GbuxVkYsnoaCdJ8cwYzGuYjoPH X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: RemF0NBEp3EKT99aCMHPeqkIyc8pGlGf X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTEwMDE3MyBTYWx0ZWRfX0OabzDVaauC9 40T2rM0L2vk+hvdMIJgbDff7lA9z+EqbEqWVDDenNRMgsYb7hDNXIi5cEn6kjk11T9DExmkMwSi Rfmee3UePDA3hSFyxX/mb54bnGGno8S7PJQ0KS4X1fOPZCgxay4aZ2dU1CqDosJoEY58GHTCvMU fcStJ3ICrZha3CZ4euf4gKDbmaW87vABD1hD/66Mkb0TWubBzGvM4ekWssopc4k/8tqYuQlWf/I GRyMvaBVUFUNZJqVhHZchitGJkSb+4A5vFZ8QlJa9kEYFbGUfqVpg1aXndYLO/u3hyWhW4aYjLN NXv5jv192ettvY/Swf6xS8jJFovtFdtTqdmXwBfOKZ8MG4r9x2rj4W/PK6e2xZ/6SuzsfT5fxW0 WtuAe5dBYWIXOKd4vPJ/HszQnHUrOWhlakRH+ugoEdBZGdmD0eciXdFa18UB/6VuYeKeIhj+juC wX/mTPO/52NzlFWwIGA== X-Authority-Analysis: v=2.4 cv=Z7zh3XRA c=1 sm=1 tr=0 ts=6962aa9e cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=DVbmZvK3Bkzfg3EmCNkA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-ORIG-GUID: RemF0NBEp3EKT99aCMHPeqkIyc8pGlGf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-10_06,2026-01-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 malwarescore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 spamscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601100173 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. Signed-off-by: Dmitry Baryshkov Reviewed-by: Bryan O'Donoghue Reviewed-by: Konrad Dybcio --- 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 a4e60e9d32a4..a880751107c7 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c @@ -169,7 +169,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 !!(ubwc->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LVL1); iris_hfi_gen2_create_packet(hdr, HFI_PROP_UBWC_BANK_SWZL_LEVEL1, HFI_HOST_FLAGS_NONE, @@ -179,7 +179,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 !!(ubwc->ubwc_swizzle & UBWC_SWIZZLE_ENABLE_LVL2); iris_hfi_gen2_create_packet(hdr, HFI_PROP_UBWC_BANK_SWZL_LEVEL2, HFI_HOST_FLAGS_NONE, @@ -189,7 +189,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 !!(ubwc->ubwc_swizzle & 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 8421711dbe60..9f9ee67e4732 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -73,9 +73,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 5ae996d19ffd..0f06066d814a 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -633,9 +633,6 @@ static const struct platform_clk_data sm8550_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