Merge "msm:camera: avoid remap logic for RDI path" (9550fe60) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+3 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -3550,7 +3550,8 @@ static int msm_isp_request_frame(struct vfe_device *vfe_dev,
		vfe_ops.axi_ops.get_pingpong_status(vfe_dev);

		/* As MCT is still processing it, need to drop the additional requests*/
		if (vfe_dev->isp_page->drop_reconfig) {
		if (vfe_dev->isp_page->drop_reconfig &&
		frame_src == VFE_PIX_0) {
		pr_err("%s: MCT has not yet delayed %d drop request %d\n",
		__func__, vfe_dev->isp_page->drop_reconfig, frame_id);
		goto error;