From mboxrd@z Thu Jan 1 00:00:00 1970 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 D5067274B53 for ; Thu, 7 May 2026 01:10:59 +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=1778116261; cv=none; b=bUqJ1oPWLdlzw3uNLFGiE6+aslx+/H4iH0/E53r82pWjDpbcDJS6COe91kwgF7tMyrJfIywvYSviyQAfUq7mgbW8bWRqACvNROZ13UiIdC4VW4XII91irpB9HlX2HSXJvJmStWEtAVA/fo3DTZSH3qetGKSvaKaiecRy0/OUco0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778116261; c=relaxed/simple; bh=I0GJCkT+M6rzwScGE2nHMtdPm0YonKxq+nwx5NI6V5w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K+et3FphNZNRY8scsVLCXy/bWmMe4P+5mz76XsgaCwoFhBpeNHFFfV9R1qS8TRbq71x1XjGCKdjQo36D8FzCcy0IJC545WrPtrfnAhsrHtTq35K8+SnJvuLzrPsPqVOng+tweSExmQdQzhXxaOGc7lUxJcBxPf0eiNKqbBb1Ltw= 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=ePfdtdGx; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=DrUgYsId; 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="ePfdtdGx"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="DrUgYsId" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 646LmLFo1527956 for ; Thu, 7 May 2026 01:10: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= SyQqdK9jmZKeNVXJQVvQIDZmFlPQgBoBYfDnZTubWOk=; b=ePfdtdGxMCS0JA5F yx5WxhNux3TR9r0AQrHStgqnf8SJUpCajgzo0j8nC6RkeQi4BRjb0fm3sV4neEVh jf82vWR9/sDIZf7HnUWzJOszkj6pfbIOrCRAGMVGwQg/g58yQJDWXZb6/MKerjpg ZKRdW71d3AFk+7ywimcdPQ3Yh0r2WzGZOs102fMxoJDhHNHELc97UwUXU7ucdZi0 8Hf732ha9b0cYuHsr96v0H2mvLFplY8bg0jc7QeToskH2bNWzyBRu6qAxQdbovfn WiL8NXgX9R1KnqpakuTY2Nr/K3mqKyRVPQDE0dcJs9RukNOIKde/+AXnB+XndQmT /0acGg== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e0128br42-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 07 May 2026 01:10:58 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-8aca14d1faaso11693266d6.3 for ; Wed, 06 May 2026 18:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778116258; x=1778721058; 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=DrUgYsIdI4I0G9ExUmSQYocXKARlFpJymu74bDwiMB1Y/ptnPInZ3m3YGlc3eCdzaz Cke7fPDH/KSFJ5Ccf5KmjqN5c2ztaf5FHfA2HJ7go+9AIB4TcIVlVnlWhGXsiZDPr66I NTfg4zLMvB07hlolRAodn+3BU4Qdad1tHcmTvLr/Fl3QAc6w4Xdd+MW2omxCA65kQrCz QRs+ghE77ohhRJNSIj9PCqFDs6/BCgUv9Cto8MYxPl/D7QJX1K7hZlx/nHCG2BzMgZsB pcJPQA3ojqKBaxWGb+g9P7HEtx23MkdJOYa/iYiLKPP2S+KtuucTIxqTvVrCw2KBXz55 5MVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778116258; x=1778721058; 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=ZmXnbzIGcBo4uwnqXIRYwuhFqdNCwZBivU33Dbgw6rt6Y4hZWEDxm7/Fz2PSI/fLcC pAS/6cymI/pnTefpF5DEy+3sP82KJGVKHUV3VPZK90u4F6dBdY6fWfmjXm2PbBiknwxf cuDYRut7tHF0W5dWOIc4ho9JrQBQRyAIautAiFZfIWOz0Eh3c1xXJdSBH5EzqZuLWpQg XuWHYOfXaZCBNKAgjesyYVhDEYgnwww28ukJrYjBtGFnbkHI0FliiBpDX5KARoaHvUR8 Y57BNncd4mrSjhV5xtJT77Uie3gePmtt8AH34XLYgu8luJ/4kgn9/JlRl8S5VUzJRukO zSvw== X-Forwarded-Encrypted: i=1; AFNElJ84A7bq+gc/1lgcKSgRKHxtEC419H2ZD8IGdJ/wk5UT1sj8AU6+38koAY9AQyYtHCGIyMfbo6oEb9SsA+M9@vger.kernel.org X-Gm-Message-State: AOJu0Ywo8f8TPwP2FWzcDsR92nH7Mpe8+J21rtQhxKtjje4O1GDZ9vW2 Ooo7PvA1kv/SkU8KFjTmBPYwuFBvIV9id8wWXjoGu+o9ABbcR9L9//cRzstIdJsJO8tW6gZ/B0H SqDHAJhNF5Quc2afxSNMjXPfMVFsERvLF3zyXZBhwuAGhOs6vWziuJo5GHHmDzdD1UUvC X-Gm-Gg: AeBDiesIQv9Jneb1UGEFD80epR/YHbThU/Q47G/lHRFb/MOrrl9wKkbMEF9AKY5OACD lOuL2Q6CYyJx82SpMbNhBRsPNYn+TmGZ5+9mmEo1NSigcovGBlCL8+70bXB9R2uCHVTFIyz4HMr OsndF13AHRWiPkm6AzpFDyk4wMDEJpJHNVzZi5sOxxWrX9s0f2r1/FGFtyD8oNcBMhgMHMEfVgf S+RH6mn1uRd5sPnpalwXYffIy3JPpxoI2nkB+lllIim5p915GKEOemHnQ1Jz58S6LFUDVuuXNLh gbOimpVI1epBuAqWEMaHDzTfAf+4GJ1y8bWs+ZblJPPqQjmM1ba79DYV0XqokSxjCBEVd0n2mol zJigkGzQ65se5wxFxsA0koQkX1mKtksG3ZiK+pez7QE3RSg4reiGp0lmyOmSqCQ5ew1Ege3QgFG qFHpdThnkgAvS7kUAyRCxeQQTaJg5sqEmneDGVVwRSbApCbg== X-Received: by 2002:a05:622a:8c3:b0:50e:5f71:62c3 with SMTP id d75a77b69052e-514621dffb4mr72550041cf.42.1778116257897; Wed, 06 May 2026 18:10:57 -0700 (PDT) X-Received: by 2002:a05:622a:8c3:b0:50e:5f71:62c3 with SMTP id d75a77b69052e-514621dffb4mr72549571cf.42.1778116257381; Wed, 06 May 2026 18:10: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-5a85c230e00sm5221967e87.29.2026.05.06.18.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2026 18:10:55 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 07 May 2026 04:10:43 +0300 Subject: [PATCH v5 4/7] media: iris: don't specify ubwc_swizzle in the source code Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260507-iris-ubwc-v5-4-e9a3aee53c49@oss.qualcomm.com> References: <20260507-iris-ubwc-v5-0-e9a3aee53c49@oss.qualcomm.com> In-Reply-To: <20260507-iris-ubwc-v5-0-e9a3aee53c49@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.15.1 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/pANAwAKAYs8ij4CKSjVAcsmYgBp++aUre/t8KcqA8iF+dzqb+jfk/P8fCGpcHh7W c5lxfHndMuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCafvmlAAKCRCLPIo+Aiko 1UoYB/41Mkd8BxBKnEtCaBmmwKRaMk4FvBk76Ws1YkAM3GZrAKe0YKnb/jjPIlYaH4GpR2e7wCN ixdSauHYdi4wtG4DvNdbgZkamw85A+9na54K8GHb1GUMfGRY6xcMCkncYQMuBT5UViYaJbuUGex ihdOveqy8QvS+aYovcZEgGtOi1MR3NuoUYpM4Xzeku1DAR9IbdBSn4Xj0bnTcI3L67jxLbHsUeA 6yT/FtTn/iWyQHimRgjxs3JXY+a8OWpC7rCnQ1kXz/aXZk02k6IHjPnCci3csjR7jZCTBawMuBj oBPNIBwYKCj2Nu+nTLRrnLg7YEcnH68dwwc7qLkvxpnl5r2L X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: TSKTKQSOUD-Jh6X6kP9iiOzIWjW7GRMK X-Proofpoint-ORIG-GUID: TSKTKQSOUD-Jh6X6kP9iiOzIWjW7GRMK X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA3MDAwOSBTYWx0ZWRfX1ya1IjFbC7sj fsUTaa/BNOacCVpqeFZygi99J58GkqnNpZm61b1h48wDBJqHhmAbTC9fKrQKMOGgmYIK85DHM8G vSw+kxX3OWklEaqVW7uvIK1eBC5lia9A9qU2wbqSmCVE/hSsR9IaVOjbBX+4G/gzdgtmWWaJvfk hd+906IdiU0UY367Vr+PpWKmQFtepyWQ2bz/jtMwqnc03PwGQmYYoHtebkcMiWsQA0UYuen2sRJ fWV8GVnkSCTRRBzNePZ/kpX7Eb76g3/h1Ea6qCjRQN6XmJF4ls8cPG2Ci1YWJ+eBdA8Wp7bfay/ ZQklZ34Io6Z2Fstjx0I6QNMNhiWBvM/8ScSdkwGzQu0IrlrYhxTFzv/a1Rz1SM3gZaiL3hY0YCt OcCx281fmW0Y3ktZhaQnap7HE2eSwKZIVKKDnGO4BhFmpXFTPBPowXbMMVR7rt3w3wjAazfgTiL tk2vQUC8meyAKyYeLYA== X-Authority-Analysis: v=2.4 cv=A8xc+aWG c=1 sm=1 tr=0 ts=69fbe6a2 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=4H5-pPW84uT1T8hsIVgA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 a=cvBusfyB2V15izCimMoJ: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-06_02,2026-05-06_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 phishscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 adultscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605070009 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/drivers/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 *core, struct iris_hfi_heade &payload, sizeof(u32)); - payload = core->iris_platform_data->ubwc_config->bank_swzl_level; + payload = !!(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 *core, struct iris_hfi_heade &payload, sizeof(u32)); - payload = core->iris_platform_data->ubwc_config->bank_swz2_level; + payload = !!(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 *core, struct iris_hfi_heade &payload, sizeof(u32)); - payload = core->iris_platform_data->ubwc_config->bank_swz3_level; + payload = !!(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/drivers/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 { struct ubwc_config_data { u32 max_channels; - u32 bank_swzl_level; - u32 bank_swz2_level; - u32 bank_swz3_level; u32 bank_spreading; }; diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/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[] = { static struct ubwc_config_data ubwc_config_sm8550 = { .max_channels = 8, - .bank_swzl_level = 0, - .bank_swz2_level = 1, - .bank_swz3_level = 1, .bank_spreading = 1, }; -- 2.47.3