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 87A7F3E3C56 for ; Fri, 13 Mar 2026 20:12: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=1773432781; cv=none; b=i/0sTIkeP0PLnZyt3244ma/bUKVf+fZg6wt/S2NVy+TuQjy2t+KJsMpeOepCyRkoBUtz1YEyLdmcAlrRkYuTnII4nOgs5lZ8dHZ3rNmJR/sCHX+LUVcBCBmdJJAQRw/tyHoHw+WrRSsnvWDlQg+mOk0R5IiUntNSXsgRK4E3MSE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773432781; c=relaxed/simple; bh=phlz7lNAhvXN0hEIT6ClaBZaJ7P5qlMteCFYP4WlGM8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=C/p3LQBrLato/Rgs4KK/9TCO2haODdwW80h0x7HaSncmRfcHnZ5i9VXlMbjZM0ivMBVqrTdoKYPCBSOGrO3mPzLUZJCYy35o9WiVS8mALka18nLvzswXTyCxe5atyCY5ln1XSRmUCWS0p1RZXCcJwmGnsMQQ0ghq9Q1yQaD5riA= 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=ozKaNNc3; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=YrhABmxf; 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="ozKaNNc3"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="YrhABmxf" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62DIsjZZ525688 for ; Fri, 13 Mar 2026 20:12: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= OflPgbJUeB9MU802D7Qb7B2sM8brxEZYSrbm3iiUBSI=; b=ozKaNNc3lDWBpoTG 4TUUJul+Y2f99sWd61COriFvdLosF5Y+8Sn2kPOQLV1+CP2vu4JGiTzi8PeX9Aaq 3u5M4LFpUxZFZStIps7hFmT2Z9HMSezZfzUrLw4aCgR8wc9UK0zta6qHlEkiRhO2 atyAu011SCPPw8XaSLybfu149aKkO8uuu04BDeGRgUjpfpnASaxE/wXrYM6NuzMs SFuMXQaOS3zBQJTR2Vb5l1svACAbG+lwMuyLEapzJleB8NxMbDHrQb6Jji4bFMFD FBKibUClx4MZEeR1uqOsOp4Gb5rSFRIP5AA5sRxUClsJ6xw78Ldht/CXk+4wegu8 1aDxfw== 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 4cvh84sx9m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 13 Mar 2026 20:12:58 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cd7d4cc049so2585745885a.0 for ; Fri, 13 Mar 2026 13:12:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773432778; x=1774037578; 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=OflPgbJUeB9MU802D7Qb7B2sM8brxEZYSrbm3iiUBSI=; b=YrhABmxfsCMjF6MrFv1GHtOejZ8pXmlwkKibpcQEzwCtAAPweuAg8eknYluWQ9YQVr DabiyegY1iYVWyZefgIvVcADkYx/OMjmTWW/NKju6nDHN9Y1zOgztjbm0mQBFKY6E30r Od65RQJaEiVIm4gQclZZp0JHzVRRU9nNiy3N17OMZEAnkzFES4B7RhT2jOyx4Lmxhltl id4rPUxwKJoROFOihOJqPB89kSJ33K0wjtrZrDT70EeQrRwS/6oA4MwlbOAtbD9sUCIy 3kQG45Bx4jeqEyGppFe8M7oNYvZWWSQk2hY+555w/NdvyVIaHXxwS6PkmmOrRNQlJX13 OX8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773432778; x=1774037578; 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=OflPgbJUeB9MU802D7Qb7B2sM8brxEZYSrbm3iiUBSI=; b=oEcIMUfvgKUdCpSJ1rx3uB4qqmbOlCGMxpNmgbLbonjXw1+v7KOEql8UP3BaH+3FUZ WvkUK6d0u7oh3xM4X89/2TVUqfK1SI+TP2mVnKiEHDH7LxkqjAt67/4DD9/q2LkBr+NQ A6g7uyBAHDrakfjZZ4BxyXAB2TamYdH5lebXUBCd4rywPBGxjdFEgHtcV48xh0I56oyj XmATD8kCtewgI0vwqXdRRLgKZNt+dSxM+upYDr0C5EuxtQDH97zS4S8LRXpb8wKcwO24 lCtQWKo385GKssQcBCOEya+2ew63ZERdFfOBJ0BEH2IRiXzxGG5BOSeUVUT0qU7T8jUz 9VLg== X-Forwarded-Encrypted: i=1; AJvYcCWDWFCZz9kfH9RkNVw3cyBS7WsTy23SL8euLQAal76DAct5AiVmfv49HWJBuDmP8hlgj6iExBBlcLeSVQdi@vger.kernel.org X-Gm-Message-State: AOJu0YwpTl49ZwyWoVMq7v7Fgsqw1hNM//mpKZYGpi6MDPzLPv74RWEa NyIwXTA5wNYl6NR+oEgxYTR8V6k41LB28VUV8oRokAKuI1T8uQh3xANZuuFK8XUDCF7ZNfZPVxl 4u8XMV6QDzED1KFrUOVVPcsSPV3gokinlk2TAeKl0vpoXXG9VSq3RZuTjQ4gTeE5gpGnN X-Gm-Gg: ATEYQzxwc3CGXNYXOK227ezIiR1z4MwZJp13YAd+H0LngfUT8IORlsWRML0tpjt3vVP Y6GReRwbMSk/21HV29bVS5TbrYxK804pb0bHNrQrGeFoccynEI3Wb3DYnRjdr3DgswBG6l02COH HsvpWdfRS0pqM1UArUjmKZdr4tNoR3zFYkVnlM26MIXs8FzEzyTqU3wodB7/OfWAjzvDhuPxift SIV2zQC45YsRVJacshQdclGUVAczweGYa4LiHpUiU28Bkx0JglJliITdnBsPu0DYUM+foyguQKH /pNskoCtwA8NdfpLg16XyQIti4gkZ01tWH1Cus2ZAJgf398Y7b/yF3e4/HpWTGJfl3CglbRbFj/ t+5Omvpjijh4R7LRCxvQ+yF2QqlCCaqPaYE6/BrbvRh0Gk7oU9JSFjeWwgJ5mNrwajzJJQ+QYhb uOOECDwUT7wkMDu+IKIw8WUji7cSOqJPLMvj4= X-Received: by 2002:a05:620a:46ab:b0:8cd:b33a:7f94 with SMTP id af79cd13be357-8cdb5a4a8c5mr696316685a.1.1773432777832; Fri, 13 Mar 2026 13:12:57 -0700 (PDT) X-Received: by 2002:a05:620a:46ab:b0:8cd:b33a:7f94 with SMTP id af79cd13be357-8cdb5a4a8c5mr696312185a.1.1773432777363; Fri, 13 Mar 2026 13:12: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-5a155f33c15sm1681259e87.17.2026.03.13.13.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 13:12:56 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 13 Mar 2026 22:12:50 +0200 Subject: [PATCH v6 2/8] media: qcom: iris: use common set_preset_registers function 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: <20260313-iris-platform-data-v6-2-1763bb837fd2@oss.qualcomm.com> References: <20260313-iris-platform-data-v6-0-1763bb837fd2@oss.qualcomm.com> In-Reply-To: <20260313-iris-platform-data-v6-0-1763bb837fd2@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6499; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=phlz7lNAhvXN0hEIT6ClaBZaJ7P5qlMteCFYP4WlGM8=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBptG/Dq4TGBL0ZBxwH46PjUSAUzf2sw3qfpxiCN G9M4O6mM0OJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabRvwwAKCRCLPIo+Aiko 1dzEB/0UtHrslVh+GL2HTJYrp3cZTjbJVy35sOY1h+nPGPtrcak3DPDwnASl1e3XVZlAmAjnjP/ ZXPORVnCLU/FQwrjIrKFQm4Q9IvXfoJmEjqk2qk7B0NI3Fvt8+bW7Gg+twSuGN5wMJr5gCmPCyM AdxUvuEsPjXPLxX5VZXVdxRzkWAsAfAwUJeZHCqIKzakp3CAjuy4gzoyJhVuIUcTGJbKAUibTyp z9ExNghUN9uqNDxKNyvxWwM7tghDxcqwcRGvrWRjsbAmAnYyQPejA/qeARbLUr0w4G31ulHEkMi YrbO8bpPmZ4jBVksFwpQS84inm0FHpk9AqgTtr+gAxZg8Etd X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=OMoqHCaB c=1 sm=1 tr=0 ts=69b46fca cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=LmgrmXmU8fDMlo1BKrQA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEzMDE2MSBTYWx0ZWRfX/QmAyJGfVPB2 cyNOOlLy63vLrzzQp4hlcs8IfKH1TfSc1ZjpT19WtcH+vkzTAEnMql3fF9Oc88QLFV4Q3w7Q9TG 27C5J8f8fDL91681d/ZzJ/iHHYOekt7jS1scvk2FBObI7b4cvhxfBAUNBLuV36ISgIo0TtwiowN uMRgmrODbnugedfdrGXpwbUd5r4J06103hAVmI0q/xJR96PY9eAfp0Vvp8hzciZhZL7MFs+5OkF wIo+rd7c5s8mmvPu0pbQYYhkUxZpoGuj0ZaWoduMGUAt99KsX/Zbej2RHKl3YaIh1vPgMStBcVI hCrzb7viQICK9DPqE1q02rAca4c4M2xvYa7I0V0hm2E+yvSmJIUT5f8O59vmXKmQ8IenZAhBuM8 jab0o7aGCktl6qzOlzVoA7pohRqNZoxGveiCiclKwdZ64YO/gy8fMWi9Cs/3B8Q+RiJblwKo3h9 p/ortvDdxe7ooeNhfNQ== X-Proofpoint-ORIG-GUID: UG5e4Bk-xcF2nQic6vCoYqGTGEbjD4BL X-Proofpoint-GUID: UG5e4Bk-xcF2nQic6vCoYqGTGEbjD4BL 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-03-13_04,2026-03-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 impostorscore=0 suspectscore=0 phishscore=0 bulkscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603130161 The set_preset_registers is (currently) common to all supported devices. Extract it to a iris_vpu_common.c and call it directly from iris_vpu_power_on(). Later, if any of the devices requires special handling, it can be sorted out separately. Reviewed-by: Dikshita Agarwal Signed-off-by: Dmitry Baryshkov --- drivers/media/platform/qcom/iris/iris_platform_common.h | 1 - drivers/media/platform/qcom/iris/iris_platform_gen1.c | 7 ------- drivers/media/platform/qcom/iris/iris_platform_gen2.c | 9 --------- drivers/media/platform/qcom/iris/iris_vpu_common.c | 7 ++++++- drivers/media/platform/qcom/iris/iris_vpu_common.h | 2 ++ 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h index e4eefc646c7f..d7106902698c 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -207,7 +207,6 @@ struct iris_platform_data { struct iris_inst *(*get_instance)(void); u32 (*get_vpu_buffer_size)(struct iris_inst *inst, enum iris_buffer_type buffer_type); const struct vpu_ops *vpu_ops; - void (*set_preset_registers)(struct iris_core *core); const struct icc_info *icc_tbl; unsigned int icc_tbl_size; const struct bw_info *bw_tbl_dec; diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/drivers/media/platform/qcom/iris/iris_platform_gen1.c index 07ed572e895b..ed07d1b00e43 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c @@ -260,11 +260,6 @@ static struct platform_inst_caps platform_inst_cap_sm8250 = { .max_operating_rate = MAXIMUM_FPS, }; -static void iris_set_sm8250_preset_registers(struct iris_core *core) -{ - writel(0x0, core->reg_base + 0xB0088); -} - static const struct icc_info sm8250_icc_table[] = { { "cpu-cfg", 1000, 1000 }, { "video-mem", 1000, 15000000 }, @@ -343,7 +338,6 @@ const struct iris_platform_data sm8250_data = { .init_hfi_response_ops = iris_hfi_gen1_response_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu2_ops, - .set_preset_registers = iris_set_sm8250_preset_registers, .icc_tbl = sm8250_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8250_icc_table), .clk_rst_tbl = sm8250_clk_reset_table, @@ -397,7 +391,6 @@ const struct iris_platform_data sc7280_data = { .init_hfi_response_ops = iris_hfi_gen1_response_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu2_ops, - .set_preset_registers = iris_set_sm8250_preset_registers, .icc_tbl = sm8250_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8250_icc_table), .bw_tbl_dec = sc7280_bw_table_dec, diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c index 1f23ddb972f0..c84d4399f84d 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -756,11 +756,6 @@ static struct platform_inst_caps platform_inst_cap_sm8550 = { .max_operating_rate = MAXIMUM_FPS, }; -static void iris_set_sm8550_preset_registers(struct iris_core *core) -{ - writel(0x0, core->reg_base + 0xB0088); -} - static const struct icc_info sm8550_icc_table[] = { { "cpu-cfg", 1000, 1000 }, { "video-mem", 1000, 15000000 }, @@ -917,7 +912,6 @@ const struct iris_platform_data sm8550_data = { .init_hfi_response_ops = iris_hfi_gen2_response_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu3_ops, - .set_preset_registers = iris_set_sm8550_preset_registers, .icc_tbl = sm8550_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table), .clk_rst_tbl = sm8550_clk_reset_table, @@ -1018,7 +1012,6 @@ const struct iris_platform_data sm8650_data = { .init_hfi_response_ops = iris_hfi_gen2_response_ops_init, .get_vpu_buffer_size = iris_vpu33_buf_size, .vpu_ops = &iris_vpu33_ops, - .set_preset_registers = iris_set_sm8550_preset_registers, .icc_tbl = sm8550_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table), .clk_rst_tbl = sm8650_clk_reset_table, @@ -1114,7 +1107,6 @@ const struct iris_platform_data sm8750_data = { .init_hfi_response_ops = iris_hfi_gen2_response_ops_init, .get_vpu_buffer_size = iris_vpu33_buf_size, .vpu_ops = &iris_vpu35_ops, - .set_preset_registers = iris_set_sm8550_preset_registers, .icc_tbl = sm8550_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table), .clk_rst_tbl = sm8750_clk_reset_table, @@ -1212,7 +1204,6 @@ const struct iris_platform_data qcs8300_data = { .init_hfi_response_ops = iris_hfi_gen2_response_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu3_ops, - .set_preset_registers = iris_set_sm8550_preset_registers, .icc_tbl = sm8550_icc_table, .icc_tbl_size = ARRAY_SIZE(sm8550_icc_table), .clk_rst_tbl = sm8550_clk_reset_table, diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.c b/drivers/media/platform/qcom/iris/iris_vpu_common.c index 548e5f1727fd..faabf53126f3 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.c +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.c @@ -468,7 +468,7 @@ int iris_vpu_power_on(struct iris_core *core) iris_opp_set_rate(core->dev, freq); - core->iris_platform_data->set_preset_registers(core); + iris_vpu_set_preset_registers(core); iris_vpu_interrupt_init(core); core->intr_status = 0; @@ -485,3 +485,8 @@ int iris_vpu_power_on(struct iris_core *core) return ret; } + +void iris_vpu_set_preset_registers(struct iris_core *core) +{ + writel(0x0, core->reg_base + 0xb0088); +} diff --git a/drivers/media/platform/qcom/iris/iris_vpu_common.h b/drivers/media/platform/qcom/iris/iris_vpu_common.h index f6dffc613b82..07728c4c72b6 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_common.h +++ b/drivers/media/platform/qcom/iris/iris_vpu_common.h @@ -39,4 +39,6 @@ int iris_vpu35_vpu4x_power_on_controller(struct iris_core *core); void iris_vpu35_vpu4x_program_bootup_registers(struct iris_core *core); u64 iris_vpu3x_vpu4x_calculate_frequency(struct iris_inst *inst, size_t data_size); +void iris_vpu_set_preset_registers(struct iris_core *core); + #endif -- 2.47.3