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

Commit b52f06a1 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: compilation fix in isp"

parents 1c34a6a6 9496ff98

drivers/media/platform/msm/camera_v2/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ obj-$(CONFIG_MSMB_CAMERA) += camera/ 
obj-$(CONFIG_MSMB_CAMERA) += msm_vb2/

obj-$(CONFIG_MSMB_CAMERA) += sensor/

#obj-$(CONFIG_MSMB_CAMERA) += pproc/

#obj-$(CONFIG_MSMB_CAMERA) += isp/

#obj-$(CONFIG_MSMB_CAMERA) += ispif/

obj-$(CONFIG_MSMB_CAMERA) += isp/

obj-$(CONFIG_MSMB_CAMERA) += ispif/

#obj-$(CONFIG_MSMB_JPEG) += jpeg_10/

#obj-$(CONFIG_MSM_JPEGDMA) += jpeg_dma/

#obj-$(CONFIG_MSMB_CAMERA) += msm_buf_mgr/

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

+0 −3
Original line number Diff line number Diff line
@@ -1090,9 +1090,6 @@ void msm_isp_notify(struct vfe_device *vfe_dev, uint32_t event_type, 
		ISP_DBG("%s: vfe %d frame_src %d frameid %d\n", __func__,

			vfe_dev->pdev->id, frame_src,

			vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id);

		trace_msm_cam_isp_status_dump("SOFNOTIFY:", vfe_dev->pdev->id,

			vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id,

			0, 0, 0);



		/*

		 * Cannot support dual_cam and framedrop same time in union.

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

+1 −16
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include "msm_camera_io_util.h"

#include "cam_smmu_api.h"

#include "msm_isp48.h"

#define CREATE_TRACE_POINTS

#include "trace/events/msm_cam.h"



#ifndef UINT16_MAX

#define UINT16_MAX             (65535U)
@@ -2160,9 +2158,6 @@ static void msm_isp_enqueue_tasklet_cmd(struct vfe_device *vfe_dev, 
		return;

	}

	atomic_add(1, &vfe_dev->irq_cnt);

	trace_msm_cam_isp_status_dump("VFE_IRQ:", vfe_dev->pdev->id,

		vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id,

		irq_status0, irq_status1, dual_irq_status);

	queue_cmd->vfeInterruptStatus0 = irq_status0;

	queue_cmd->vfeInterruptStatus1 = irq_status1;

	queue_cmd->vfe_pingpong_status = ping_pong_status;
@@ -2300,9 +2295,7 @@ void msm_isp_do_tasklet(unsigned long data) 
		atomic_sub(1, &vfe_dev->irq_cnt);

		msm_isp_prepare_tasklet_debug_info(vfe_dev,

			irq_status0, irq_status1, ts);

		trace_msm_cam_isp_status_dump("VFE_TASKLET:", vfe_dev->pdev->id,

			vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id,

			irq_status0, irq_status1, dual_irq_status);



		irq_ops = &vfe_dev->hw_info->vfe_ops.irq_ops;

		irq_ops->process_reset_irq(vfe_dev,

			irq_status0, irq_status1);
@@ -2594,9 +2587,6 @@ void msm_isp_irq_debug_dump(struct vfe_device *vfe_dev) 
		flags);

	dump_index = vfe_dev->common_data->vfe_irq_dump.current_irq_index;

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

		trace_msm_cam_ping_pong_debug_dump(

			vfe_dev->common_data->vfe_irq_dump.irq_debug[

				dump_index % MAX_VFE_IRQ_DEBUG_DUMP_SIZE]);

		dump_index++;

	}

	spin_unlock_irqrestore(
@@ -2616,9 +2606,6 @@ void msm_isp_tasklet_debug_dump(struct vfe_device *vfe_dev) 
	flags);

	dump_index = vfe_dev->common_data->vfe_irq_dump.current_tasklet_index;

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

		trace_msm_cam_tasklet_debug_dump(

			vfe_dev->common_data->vfe_irq_dump.tasklet_debug[

				dump_index % MAX_VFE_IRQ_DEBUG_DUMP_SIZE]);

		dump_index++;

	}

	spin_unlock_irqrestore(
@@ -2629,8 +2616,6 @@ void msm_isp_tasklet_debug_dump(struct vfe_device *vfe_dev) 
void msm_isp_dump_ping_pong_mismatch(struct vfe_device *vfe_dev)

{



	trace_msm_cam_string(" ***** msm_isp_dump_irq_debug ****");

	msm_isp_irq_debug_dump(vfe_dev);

	trace_msm_cam_string(" ***** msm_isp_dump_taskelet_debug ****");

	msm_isp_tasklet_debug_dump(vfe_dev);

}

gen_headers_arm.bp

+1 −0
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ gen_headers_out_arm = [ 
    "media/radio-iris-commands.h",

    "media/radio-iris.h",

    "media/synx.h",

    "media/msmb_isp.h",

    "misc/cxl.h",

    "misc/ocxl.h",

    "misc/wigig_sensing_uapi.h",

gen_headers_arm64.bp

+1 −0
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ gen_headers_out_arm64 = [ 
    "media/radio-iris-commands.h",

    "media/radio-iris.h",

    "media/synx.h",

    "media/msmb_isp.h",

    "misc/cxl.h",

    "misc/ocxl.h",

    "misc/wigig_sensing_uapi.h",