From f871ee03ff4cb3edbbd67ed636a4c8ae690bc143 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Wed, 13 Oct 2021 18:45:25 +0800 Subject: [PATCH] media: rockchip: isp: dmatx default config with mipi sensor input Change-Id: I51f27921b650d614e552d810995172d4ea17ef08 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/dev.c b/drivers/media/platform/rockchip/isp/dev.c index b3ffecacdc2e..413a3094d81b 100644 --- a/drivers/media/platform/rockchip/isp/dev.c +++ b/drivers/media/platform/rockchip/isp/dev.c @@ -411,7 +411,7 @@ static int _set_pipeline_default_fmt(struct rkisp_device *dev) rkisp_set_stream_def_fmt(dev, RKISP_STREAM_SP, width, height, V4L2_PIX_FMT_NV12); if ((dev->isp_ver == ISP_V20 || dev->isp_ver == ISP_V21) && - dev->active_sensor->mbus.type == V4L2_MBUS_CSI2_DPHY) { + dev->isp_inp == INP_CSI) { width = dev->active_sensor->fmt[1].format.width; height = dev->active_sensor->fmt[1].format.height; code = dev->active_sensor->fmt[1].format.code; @@ -431,7 +431,7 @@ static int _set_pipeline_default_fmt(struct rkisp_device *dev) width, height, rkisp_mbus_pixelcode_to_v4l2(code)); } - if (dev->isp_ver == ISP_V20) { + if (dev->isp_ver == ISP_V20 && dev->isp_inp == INP_CSI) { width = dev->active_sensor->fmt[2].format.width; height = dev->active_sensor->fmt[2].format.height; code = dev->active_sensor->fmt[2].format.code;