From ea8d0f2fdfec5c5cbf07fe375c8f26fb399c1492 Mon Sep 17 00:00:00 2001 From: "haitao.liu" Date: Fri, 17 Nov 2023 18:52:21 +0800 Subject: [PATCH] vdin: Comment the code of changing secure mode dynamically [1/1] PD#SWPL-161102 Problem: vpp call tee interface in ISR cause abnormal because it may schedule in tee interface. Solution: Donot need to call the tee intreface to change vdin secure buffer state, so remove the related code,not to call it in ISR Verify: t5m Change-Id: I971a2db1821532df475b2b2c856eb569a2b8177d Signed-off-by: haitao.liu --- drivers/media/vin/tvin/vdin/vdin_drv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/media/vin/tvin/vdin/vdin_drv.c b/drivers/media/vin/tvin/vdin/vdin_drv.c index 9f5323e3a..e3c30986a 100644 --- a/drivers/media/vin/tvin/vdin/vdin_drv.c +++ b/drivers/media/vin/tvin/vdin/vdin_drv.c @@ -6146,9 +6146,11 @@ static int vdin_signal_notify_callback(struct notifier_block *block, struct vd_signal_info_s *vd_signal = NULL; /* only for vdin loopback */ struct vdin_dev_s *devp = NULL; +#ifdef VDIN_ENALBE_NOTIFY_SECURITY #ifdef CONFIG_AMLOGIC_MEDIA_SECURITY unsigned int i = 0; struct vd_secure_info_s *vd_secure = NULL; +#endif #endif if (is_meson_t3x_cpu()) @@ -6171,6 +6173,7 @@ static int vdin_signal_notify_callback(struct notifier_block *block, __func__, devp->tx_fmt, devp->vd1_fmt); break; case VIDEO_SECURE_TYPE_CHANGED: +#ifdef VDIN_ENALBE_NOTIFY_SECURITY #ifdef CONFIG_AMLOGIC_MEDIA_SECURITY vd_secure = (struct vd_secure_info_s *)para; if (!vd_secure || !(devp->flags & VDIN_FLAG_DEC_STARTED)) @@ -6226,6 +6229,10 @@ static int vdin_signal_notify_callback(struct notifier_block *block, vdin_set_mem_protect(devp, 0); } +#endif +#else + if (vdin_dbg_en) + pr_info("%s VDIN_ENALBE_NOTIFY_SECURITY is not defined\n", __func__); #endif break;