From 9b269cfbcfabaac330923ab165a55a002ce425d5 Mon Sep 17 00:00:00 2001 From: Hu Kejun Date: Tue, 8 Dec 2020 10:32:57 +0800 Subject: [PATCH] media: rockchip: isp: fix bug of scheduling while atomic Signed-off-by: Hu Kejun Change-Id: Ic02fc10aa58cb25effd25144ce0eca850324e8d8 --- drivers/media/platform/rockchip/isp/isp_params_v21.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/isp/isp_params_v21.c b/drivers/media/platform/rockchip/isp/isp_params_v21.c index 0eefc46907ba..a32c23ae96d7 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v21.c +++ b/drivers/media/platform/rockchip/isp/isp_params_v21.c @@ -3870,6 +3870,7 @@ rkisp_params_first_cfg_v2x(struct rkisp_isp_params_vdev *params_vdev) struct rkisp_isp_params_val_v21 *priv_val = (struct rkisp_isp_params_val_v21 *)params_vdev->priv_val; + rkisp_alloc_bay3d_buf(params_vdev, params_vdev->isp21_params); spin_lock(¶ms_vdev->config_lock); /* override the default things */ if (!params_vdev->isp21_params->module_cfg_update && @@ -3887,7 +3888,6 @@ rkisp_params_first_cfg_v2x(struct rkisp_isp_params_vdev *params_vdev) priv_val->tmo_en = 0; priv_val->lsc_en = 0; priv_val->mge_en = 0; - rkisp_alloc_bay3d_buf(params_vdev, params_vdev->isp21_params); __isp_isr_other_config(params_vdev, params_vdev->isp21_params, RKISP_PARAMS_ALL); __isp_isr_meas_config(params_vdev, params_vdev->isp21_params, RKISP_PARAMS_ALL); __preisp_isr_update_hdrae_para(params_vdev, params_vdev->isp21_params);