From nobody Mon Feb 9 19:04:45 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 3D3DC352F81 for ; Fri, 16 Jan 2026 07:27:51 +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=1768548472; cv=none; b=QsGIzeM6mnpMopUzlC7Vim46QzpdIUAbJ+yYOMGS9mqeZeLtpgIIUCRKN7PwpNKcRmjWnXz9XSQOA7qfTgo4D6j8b9p51Mf6+gRq1bo4hGPIxEfRm2nmutsTzzNRlx87p22stQHsyBkkTfkVS8AfJgkmCpN+3O70rmPQ2lxKcyk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768548472; c=relaxed/simple; bh=CLwtGbYMk7JPP0q90MTX23YSmAwj3tjnRTfHx1oOcwo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s9/CzmYooVEDPfndzlOihpgqWdr/fRoepJ5fVOsbLY9tJW4S2/6hWnI5ICWRXU+QMmzWsmQX24ZdZd1mns66tcEgVlT/JORLRxMQ2C92+S8FMTME5c9Ae7ySSowuk6saTRRhcvWffr7kzrfq9JQ/s92VK38SAUn7uwurq5VD0iM= 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=Pg/8+jaD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=I3gfF0Je; 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="Pg/8+jaD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="I3gfF0Je" 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 60FMaKRN3192150 for ; Fri, 16 Jan 2026 07:27:50 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= SZ0iwrehLKaUcajId2K+vtohdRW3UYKAHqXQkWw5X5E=; b=Pg/8+jaDveFD4Lrw f7e3NY6djZyZlaQNPfS6yvwZF+iLu8hJ0Gf6d+WOJk8pwmXkCEz2rMZV9+TFxtuj tuAOkB2ror5Rn4iVl2wFLlmVgJGjMOn2rWVfv1+N4X9Mz295NlYoFuSRAMy27+i0 Vt2yj41lEVWAOWJtPzQdHojuKDahZG+PDqsayMbVsq8drFvrI+SMiGgscne0HpVz Z6kOVFZ0CLKB+P4o6tC8fIu6MfV2NqUp+Nq0JHrvHOfX2Z00479wbDuuY137C0Zn bW6VtBO8QhYca8LUzM2i5ulSVmNOWikgKwWayyj7bRGWlK/W578sh0sfuZ1cs08R il6Rig== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bq968h80m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 16 Jan 2026 07:27:50 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8c6a2ef071dso430542185a.0 for ; Thu, 15 Jan 2026 23:27:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768548469; x=1769153269; 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=SZ0iwrehLKaUcajId2K+vtohdRW3UYKAHqXQkWw5X5E=; b=I3gfF0Jeq1ub/VlBf8F+F2JlXprOdRZ0n8lZUehz0FsG7l6wFxTNP2feEsthSmgNU2 zJ6uqbuYtGf96ZYKUsVcW0Om5uqIaa6E+BdQzK9E2Gh67SN74uZkXov31mgS8jf/kxkq +NApYoIjAz6o5I4aSl/JivxM/L9dKqyPX5/I63C1spV62TFDxVSM2IEA2U9sYckZ+AXV 3oXKmPTgEapFyKthMJXj/phtCwb6x/BXY29e37JTPxRKpFiNHotkEyi2B1Z3i1Jj6c6K CJVJ2Gk2cOzo2Mgvr+Zbd3J8nkbGXDwwjWRRaOdMYBVtgEaQ/HbEQZWX66irc/e/+e51 UvVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768548469; x=1769153269; 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=SZ0iwrehLKaUcajId2K+vtohdRW3UYKAHqXQkWw5X5E=; b=Rx4DQg9J7K8lHH0W+qpf56MvHZe4mLva/Cf1/kfjDUq9HDzRtLrP19SqD6yPRMWbRq cpnI85KgpuDAa0OdZhD0MqQno/5QiqG7srYmRSyGEOEfUZqwf3XamliPHKQUQBPt8S56 F1cV6TM/lcu+xgxJuCARf6l4pgXviapP5kqGU5AjcnA06LZ+g+fHgCID0adW+I00Lz+H yI6aEKBVjPDqsD/3IsIyVFVUUTceUYfTdfC/eR5YJvcDIqy/qHFzXVmV9nHyAKJD+4kC SnOgZMgdLBzjcu09do+PUZR/oykS70O6XejZuKxViwtNDRdqBf9L6AhWOYu1azcL7g9W 1gCA== X-Forwarded-Encrypted: i=1; AJvYcCVx6e3+zZI5BvPBomilypyI7LFX8PSwYMReb398NIsLFlniPQByjLqboi4BkHQjVYp7cDCH1AyqF/OhEks=@vger.kernel.org X-Gm-Message-State: AOJu0Yxces5b9eKrx0RDvOCJq+dZbBdpBOR4sxv3DkaP5ApLpTuSWiEX iSAkMdvQ+JDiL0l1ETCC7wBIRf0vYWbC3kkfpp9MBHF4j07Ex0BUeATWr1tIbIU5qgJSgudvgTh tJOwvyU7t/PpjzN2M+8wYnf1c2ZtQLhAc0z93rjVksJs1OIJCGACKp1POOYGxgnOMtGw= X-Gm-Gg: AY/fxX7nUr9uHdPvYnMBC8bE/GaTkQBY0ijWNVYRc6lKqzx6Urs0hdD4PC0w5wpafhK uLhxSFFFWn0IAbZfNXlS5Wc3EE7LO0hKO/XosUu3yZqS2W6lZ3uNGbjDIKJEm995rOI+Jz9Zn1+ UtPIIDCbjs7257RImm8B7/P/fEBo07UiKMIRnq6imaqdnog+hIQxjtUofJKxTa0hC047w7QqZES 0u8l71dqPwIGv0OLZUDr9PrpELmrPUtrfaDkxT/lFd7p72MiWMO0WpOZBEcWdFvaEXdLhcGsVRJ bQcgeuCEhcF9wAs5ZASU+XIsTbMOOfQfvTifMMSZSg8zpfkVdAG4ZnD5v+q/xnbRVhrP4HKhgWy o3uKTPWUpMYcFDPCp9yLL1kGoDGBh0uYSLN0NQ3O8mTs17iubgyrvl3diPrCoffwBP+eLjFQ2kh 7pyYqBfTb2G8LJqYHr5XPbgvU= X-Received: by 2002:a05:620a:2915:b0:8b2:e638:7dce with SMTP id af79cd13be357-8c6a6965342mr275660685a.75.1768548469366; Thu, 15 Jan 2026 23:27:49 -0800 (PST) X-Received: by 2002:a05:620a:2915:b0:8b2:e638:7dce with SMTP id af79cd13be357-8c6a6965342mr275658285a.75.1768548468955; Thu, 15 Jan 2026 23:27:48 -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-59baf3976dbsm516941e87.66.2026.01.15.23.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 23:27:47 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 16 Jan 2026 09:27:40 +0200 Subject: [PATCH v3 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: <20260116-iris-ubwc-v3-6-662ac0e0761f@oss.qualcomm.com> References: <20260116-iris-ubwc-v3-0-662ac0e0761f@oss.qualcomm.com> In-Reply-To: <20260116-iris-ubwc-v3-0-662ac0e0761f@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 X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3239; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=CLwtGbYMk7JPP0q90MTX23YSmAwj3tjnRTfHx1oOcwo=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpaehqux+edbq6z3a9Wwtvn4DrpEkdkreFomTW/ 0GyHvpNqbOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaWnoagAKCRCLPIo+Aiko 1fzFB/9pnnNJp6fEXrEne1FHN5Ync/IFqS/ZFBzmZieZpTw/pBAe6HMkip31brV2LXiZyM2Spbl Z3uUdfVSWgBHzCAZL4Y1BpMnHaNKQ7nyZv9GFFzTBAVkAfIJcKZL+8G1E/JjV/ocDcwhqkFXJmQ 4LT/65d5sIOcB/eau8UROFDkSi3pqw3BXmISQZYQBi6EfhycwuUQRjyKtOOu76s6Vf0pCQq61qj hDwfOJFu576VddZN/81TifqFo3cReZLLZtJM8al0buBeDbOMisdEC05Uze8bf1wFlQWeK+VyvTp YWYaZQQe4wnVYjcyMoTZvBSVA+9vK233vviPiZIBfYvd/rk4 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=JNg2csKb c=1 sm=1 tr=0 ts=6969e876 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==: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=19NtJfuW7GRvGFya53UA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: 2OX9c2TCTrzdbMLZrR4E2Zr_Kz9SS9Hz X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE2MDA1NyBTYWx0ZWRfX5QmJnqtMR4q+ NSzDKY5lpmMmW/dGW3PrbNy5JDxzspOLq+65WrPdlE7yBw4YuDz5fix9qgGzui31vjqd8+OrCQt 1f7y/iteoNUwS8ZzWbVu7vJh4oaCijBcxeRnSgLd9/8onnN2cpEMl9j8+iB3r3gfEOSt1mJBQLt /sYvU80dgM6M6kpit30Qk5YeTG9N9IvmFl8awi8EWc+TB7Rq7XUNH+9WvhOqN37xk07iXFF6ZX9 QUB3yi7EAZKTJAzYsmTkY0Gx/du/znB+GVgSGL0W7u+yp+TXN+iIN5Imeb4G6c6Pcyq30pTfcXM qFYxwGzOj237BVe8VIcLtWGmLiN3KwF2Oio03c1OJ0VkZSSOwSMaug8Ymx91Xd8FaIyc8vpbPSb 4L36LcVmneBInBzuxgTrZj8Vb+unCAVw0bxfKU5i/G/E6d+oAGgGN+uh/xq688Yun7gSeQ6RAA+ yfABhkNOfy7wdYMirgQ== X-Proofpoint-GUID: 2OX9c2TCTrzdbMLZrR4E2Zr_Kz9SS9Hz 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-16_02,2026-01-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 adultscore=0 suspectscore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601160057 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 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 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