Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aead671b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: isp: Optimize finding stream"

parents 1875b571 076a22aa

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

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "msm_isp_util.h"

#include "msm_isp_axi_util.h"



#define HANDLE_TO_IDX(handle) (handle & 0xFF)

#define ISP_SOF_DEBUG_COUNT 0



static int msm_isp_update_dual_HW_ms_info_at_start(

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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include "msm_isp.h"



#define HANDLE_TO_IDX(handle) (handle & 0xFF)

#define SRC_TO_INTF(src) \

	((src < RDI_INTF_0 || src == VFE_AXI_SRC_MAX) ? VFE_PIX_0 : \

	(VFE_RAW_0 + src - RDI_INTF_0))

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

+3 −7
Original line number Diff line number Diff line
@@ -377,13 +377,9 @@ static int msm_isp_start_fetch_engine_multi_pass(struct vfe_device *vfe_dev, 
		fe_cfg->frame_id;



	if (fe_cfg->offline_pass == OFFLINE_SECOND_PASS) {

		for (i = 0; i < VFE_AXI_SRC_MAX; i++) {

			stream_info = &vfe_dev->axi_data.stream_info[i];

			if (stream_info->stream_id == fe_cfg->output_stream_id)

				break;

		}



		if (i == VFE_AXI_SRC_MAX) {

		stream_info = &vfe_dev->axi_data.stream_info[

			HANDLE_TO_IDX(fe_cfg->output_stream_id)];

		if (!stream_info) {

			pr_err("%s: Couldn't find streamid 0x%X\n", __func__,

				fe_cfg->output_stream_id);

			return -EINVAL;