[PATCH v2 2/3] media: qcom: Use PAS API for video memory protection
From: Sumit Garg
Date: Tue Oct 27 2026 - 08:47:56 EST
From: Sumit Garg <sumit.garg@xxxxxxxxxxxxxxxx>
Replace the direct qcom_scm_mem_protect_video_var() calls in venus and
iris with qcom_pas_mem_protect_video_var(), so that the call is only
issued when the active PAS backend needs it. This allows the video
codecs to bring up firmware with the OP-TEE PAS backend as well, with
no functional change for the SCM backend.
As the video drivers no longer call into SCM directly, also drop their
Kconfig selection of QCOM_SCM.
Signed-off-by: Sumit Garg <sumit.garg@xxxxxxxxxxxxxxxx>
---
drivers/media/platform/qcom/iris/Kconfig | 1 -
drivers/media/platform/qcom/iris/iris_firmware.c | 5 ++---
drivers/media/platform/qcom/venus/Kconfig | 1 -
drivers/media/platform/qcom/venus/firmware.c | 3 +--
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/Kconfig b/drivers/media/platform/qcom/iris/Kconfig
index 0996213e71e7..804d8d38341e 100644
--- a/drivers/media/platform/qcom/iris/Kconfig
+++ b/drivers/media/platform/qcom/iris/Kconfig
@@ -5,7 +5,6 @@ config VIDEO_QCOM_IRIS
depends on QCOM_SMEM || QCOM_SMEM=n
select V4L2_MEM2MEM_DEV
select QCOM_MDT_LOADER
- select QCOM_SCM
select QCOM_PAS
select QCOM_UBWC_CONFIG if ARCH_QCOM && QCOM_SMEM
select VIDEOBUF2_DMA_CONTIG
diff --git a/drivers/media/platform/qcom/iris/iris_firmware.c b/drivers/media/platform/qcom/iris/iris_firmware.c
index ed2bd0e83797..16e19c65c7ba 100644
--- a/drivers/media/platform/qcom/iris/iris_firmware.c
+++ b/drivers/media/platform/qcom/iris/iris_firmware.c
@@ -5,7 +5,6 @@
#include <linux/firmware.h>
#include <linux/firmware/qcom/qcom_pas.h>
-#include <linux/firmware/qcom/qcom_scm.h>
#include <linux/of_address.h>
#include <linux/of_reserved_mem.h>
#include <linux/soc/qcom/mdt_loader.h>
@@ -241,12 +240,12 @@ int iris_fw_load(struct iris_core *core)
for (i = 0; i < core->iris_platform_data->tz_cp_config_data_size; i++) {
cp_config = &core->iris_platform_data->tz_cp_config_data[i];
- ret = qcom_scm_mem_protect_video_var(cp_config->cp_start,
+ ret = qcom_pas_mem_protect_video_var(cp_config->cp_start,
cp_config->cp_size,
cp_config->cp_nonpixel_start,
cp_config->cp_nonpixel_size);
if (ret) {
- dev_err(core->dev, "qcom_scm_mem_protect_video_var failed: %d\n", ret);
+ dev_err(core->dev, "qcom_pas_mem_protect_video_var failed: %d\n", ret);
qcom_pas_shutdown(IRIS_PAS_ID);
return ret;
}
diff --git a/drivers/media/platform/qcom/venus/Kconfig b/drivers/media/platform/qcom/venus/Kconfig
index 7997b8aa427a..c4362eff954a 100644
--- a/drivers/media/platform/qcom/venus/Kconfig
+++ b/drivers/media/platform/qcom/venus/Kconfig
@@ -5,7 +5,6 @@ config VIDEO_QCOM_VENUS
depends on (ARCH_QCOM && ARM64 && IOMMU_API) || COMPILE_TEST
select OF_DYNAMIC if ARCH_QCOM
select QCOM_MDT_LOADER
- select QCOM_SCM
select QCOM_PAS
select VIDEOBUF2_DMA_CONTIG
select V4L2_MEM2MEM_DEV
diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c
index 3c0727ea137d..d232fe5b28b4 100644
--- a/drivers/media/platform/qcom/venus/firmware.c
+++ b/drivers/media/platform/qcom/venus/firmware.c
@@ -13,7 +13,6 @@
#include <linux/platform_device.h>
#include <linux/of_device.h>
#include <linux/firmware/qcom/qcom_pas.h>
-#include <linux/firmware/qcom/qcom_scm.h>
#include <linux/sizes.h>
#include <linux/soc/qcom/mdt_loader.h>
@@ -255,7 +254,7 @@ int venus_boot(struct venus_core *core)
* cp_nonpixel_start = venus_sec_non_pixel/virtual-addr-pool[0]
* cp_nonpixel_size = venus_sec_non_pixel/virtual-addr-pool[1]
*/
- ret = qcom_scm_mem_protect_video_var(res->cp_start,
+ ret = qcom_pas_mem_protect_video_var(res->cp_start,
res->cp_size,
res->cp_nonpixel_start,
res->cp_nonpixel_size);
--
2.43.0