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

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

Merge "msm: camera: Disable logs in irq context"

parents 7e681ea6 affbc6eb

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#define HANDLE_TO_IDX(handle) (handle & 0xFF)

/* at how many frames to add frame skip pattern */

#define BURST_SKIP_THRESHOLD              (16)

#define ISP_SOF_DEBUG_COUNT 5

#define ISP_SOF_DEBUG_COUNT 0



int msm_isp_axi_create_stream(

	struct msm_vfe_axi_shared_data *axi_data,

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

+1 −1
Original line number Diff line number Diff line
@@ -1724,7 +1724,7 @@ static void msm_isp_enqueue_tasklet_cmd(struct vfe_device *vfe_dev, 
	spin_lock_irqsave(&vfe_dev->tasklet_lock, flags);

	queue_cmd = &vfe_dev->tasklet_queue_cmd[vfe_dev->taskletq_idx];

	if (queue_cmd->cmd_used) {

		pr_err_ratelimited("%s: Tasklet queue overflow: %d\n",

		ISP_DBG("%s: Tasklet queue overflow: %d\n",

			__func__, vfe_dev->pdev->id);

		list_del(&queue_cmd->list);

	} else {

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


#define ISPIF_TIMEOUT_SLEEP_US                1000

#define ISPIF_TIMEOUT_ALL_US               1000000

#define ISPIF_SOF_DEBUG_COUNT                    5

#define ISPIF_SOF_DEBUG_COUNT                    0



#undef CDBG

#ifdef CONFIG_MSMB_CAMERA_DEBUG

drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c

+2 −6
Original line number Diff line number Diff line
@@ -345,10 +345,6 @@ static irqreturn_t msm_csid_irq(int irq_num, void *data) 
	}

	irq = msm_camera_io_r(csid_dev->base +

		csid_dev->ctrl_reg->csid_reg.csid_irq_status_addr);

	if (csid_dev->csid_sof_debug == SOF_DEBUG_ENABLE)

		pr_err("%s CSID%d_IRQ_STATUS_ADDR = 0x%x\n",

			 __func__, csid_dev->pdev->id, irq);

	else

	CDBG("%s CSID%d_IRQ_STATUS_ADDR = 0x%x\n",

		 __func__, csid_dev->pdev->id, irq);

	if (irq & (0x1 <<

drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c

+1 −2
Original line number Diff line number Diff line
@@ -506,8 +506,7 @@ static irqreturn_t msm_csiphy_irq(int irq_num, void *data) 
			csiphy_dev->base +

			csiphy_dev->ctrl_reg->csiphy_reg.

			mipi_csiphy_interrupt_clear0_addr + 0x4*i);

		pr_err_ratelimited(

			"%s MIPI_CSIPHY%d_INTERRUPT_STATUS%d = 0x%x\n",

		CDBG("%s MIPI_CSIPHY%d_INTERRUPT_STATUS%d = 0x%x\n",

			__func__, csiphy_dev->pdev->id, i, irq);

		msm_camera_io_w(0x0,

			csiphy_dev->base +