From e900b84a6c1bae12f04a49d921f14a7b7ffe2b37 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Mon, 29 Jul 2024 22:20:08 -0700 Subject: [PATCH 1/8] CAMX: Snap for drop 07/29/2024 mainline 1246 LA.VENDOR.15.4.0.AU417 Change-Id: If893daa2a40275a7e4b08d77c8f6c09b0f9a7ed2 Signed-off-by: Haritha Chintalapati From 800a670e4e2bcb10f628cf9fe6f21b027f1e1f8c Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Tue, 30 Jul 2024 22:38:08 -0700 Subject: [PATCH 2/8] CAMX: Snap for drop 07/30/2024 mainline 1247 LA.VENDOR.15.4.0.AU418 Change-Id: I4433f1789c22883af652fcf68ee64215b8e5e7ca Signed-off-by: Haritha Chintalapati From f919ae8d3f94f06102c3e00cd5b9a4ebbc607e7c Mon Sep 17 00:00:00 2001 From: Haochen Yang Date: Wed, 31 Jul 2024 15:38:08 -0700 Subject: [PATCH 3/8] ARM: dts: msm: Add support to update camera qos This change adds support to update static and smart camera qos. enable-secure-qos-update property specifies whether secure camera Qos update feature is enabled. CRs-Fixed: 3857947 Change-Id: I4c70f1be49a1e3bcda1ea2e4a73fbce3c130b6ab Signed-off-by: Haochen Yang --- bindings/msm-cam-cpas.txt | 5 +++++ sun-camera.dtsi | 1 + 2 files changed, 6 insertions(+) diff --git a/bindings/msm-cam-cpas.txt b/bindings/msm-cam-cpas.txt index 39a6c62d..c872a2cf 100644 --- a/bindings/msm-cam-cpas.txt +++ b/bindings/msm-cam-cpas.txt @@ -229,6 +229,11 @@ First Level Node - CAM CPAS device Definition: Client ID for camera caches. ID is used to differentiate the property of the cache like being Forget, Dealloc. +- enable-secure-qos-update + Usage: optional + Value type: + Definition: Bool property specifying whether secure camera Qos update feature is enabled. + - enable-smart-qos Usage: optional Value type: diff --git a/sun-camera.dtsi b/sun-camera.dtsi index 726439eb..71300adc 100644 --- a/sun-camera.dtsi +++ b/sun-camera.dtsi @@ -1734,6 +1734,7 @@ sys-cache-names = "ofe_ip", "ipe_rt_ip", "ipe_srt_ip", "ipe_rt_rf", "ipe_srt_rf"; sys-cache-uids = <71 72 73 74 75>; sys-cache-concur = <1 1 1 0 0>; + enable-secure-qos-update; enable-smart-qos; enable-cam-drv = <(CAM_DDR_DRV | CAM_CLK_DRV)>; rt-wr-priority-min = <4>; From 79dee7f64396cfb7a88fc64213611e601c9cc14c Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 31 Jul 2024 18:08:08 -0700 Subject: [PATCH 4/8] CAMX: Snap for drop 07/31/2024 mainline 1248 LA.VENDOR.15.4.0.AU418 60658a5 Merge 'ARM: dts: msm: Add support to update camera qos' into camera-kernel.lnx.dev Change-Id: I382ad9696200ec6520ea13fc01c7742d85588bdd Signed-off-by: Haritha Chintalapati From 554527efcc03425129481fe25be80f60a03a8188 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Thu, 1 Aug 2024 15:08:07 -0700 Subject: [PATCH 5/8] CAMX: Snap for drop 08/01/2024 mainline 1249 LA.VENDOR.15.4.0.AU418 Change-Id: I7b734a22bf32fc8253adb6f05d70eac821172723 Signed-off-by: Haritha Chintalapati From 5b3153fe49563d76643103de87ae939c12a10121 Mon Sep 17 00:00:00 2001 From: Li Sha Lim Date: Mon, 5 Aug 2024 13:08:08 -0700 Subject: [PATCH 6/8] ARM: dts: msm: Remove camnoc reg from TFE In the past, TFE driver needed camnoc reg access in event of bus overflow. Now, there's no need for it with usage of CPAS APIs, so the reg entries for cam_camnoc_rt in TFE is removed. CRs-Fixed: 3865318 Change-Id: Iccb6619d82b9b8b34e937d32a3c628b151745c54 Signed-off-by: Li Sha Lim --- sun-camera.dtsi | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/sun-camera.dtsi b/sun-camera.dtsi index 71300adc..074a2160 100644 --- a/sun-camera.dtsi +++ b/sun-camera.dtsi @@ -2647,10 +2647,9 @@ cam_vfe0: qcom,ife0@ac86000{ cell-index = <0>; compatible = "qcom,mc_tfe980"; - reg-names = "ife", "cam_camnoc_rt"; - reg = <0x0ac86000 0x10000>, - <0x0ad90000 0x9000>; - reg-cam-base = <0x86000 0x19000>; + reg-names = "ife"; + reg = <0x0ac86000 0x10000>; + reg-cam-base = <0x86000>; rt-wrapper-base = <0x86000>; interrupt-names = "tfe0"; interrupts = ; @@ -2726,10 +2725,9 @@ cam_vfe1: qcom,ife1@ac96000 { cell-index = <1>; compatible = "qcom,mc_tfe980"; - reg-names = "ife", "cam_camnoc_rt"; - reg = <0x0ac96000 0x10000>, - <0x0ad90000 0x9000>; - reg-cam-base = <0x96000 0x19000>; + reg-names = "ife"; + reg = <0x0ac96000 0x10000>; + reg-cam-base = <0x96000>; rt-wrapper-base = <0x86000>; interrupt-names = "tfe1"; interrupts = ; @@ -2805,10 +2803,9 @@ cam_vfe2: qcom,ife2@aca6000 { cell-index = <2>; compatible = "qcom,mc_tfe980"; - reg-names = "ife", "cam_camnoc_rt"; - reg = <0x0aca6000 0x10000>, - <0x0ad90000 0x9000>; - reg-cam-base = <0xa6000 0x19000>; + reg-names = "ife"; + reg = <0x0aca6000 0x10000>; + reg-cam-base = <0xa6000>; rt-wrapper-base = <0x86000>; interrupt-names = "tfe2"; interrupts = ; From 8491d7878d12b54d2f64be79428449378882c99c Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Mon, 5 Aug 2024 13:08:22 -0700 Subject: [PATCH 7/8] CAMX: Snap for drop 08/05/2024 mainline 1250 LA.VENDOR.15.4.0.AU418 ac7a0e2 Merge 'ARM: dts: msm: Remove camnoc reg from TFE' into camera-kernel.lnx.dev Change-Id: Icc545568d3327ffd49230f90f0f7cdeea84da318 Signed-off-by: Haritha Chintalapati From f0ef78f8ade473e7031b2197a2222d79fa357a24 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 7 Aug 2024 00:38:07 -0700 Subject: [PATCH 8/8] CAMX: Snap for drop 08/06/2024 mainline 1251 LA.VENDOR.15.4.0.AU427 Change-Id: Ifc34e1aa94c3038c6087be6a274ab501c9c5c641 Signed-off-by: Haritha Chintalapati