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

Commit 7344ad59 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: isp: Use only pingpong_bit instead of status"

parents 908e597f 913d5d1e

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

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ struct msm_vfe_axi_ops { 
	void (*read_wm_ping_pong_addr)(struct vfe_device *vfe_dev);



	void (*update_ping_pong_addr)(void __iomem *vfe_base,

		uint8_t wm_idx, uint32_t pingpong_status, dma_addr_t paddr,

		uint8_t wm_idx, uint32_t pingpong_bit, dma_addr_t paddr,

		int32_t buf_size);



	uint32_t (*get_wm_mask)(uint32_t irq_status0, uint32_t irq_status1);
@@ -516,7 +516,7 @@ struct msm_vfe_error_info { 
	uint32_t error_mask1;

	uint32_t violation_status;

	uint32_t camif_status;

	uint8_t stream_framedrop_count[VFE_AXI_SRC_MAX];

	uint8_t stream_framedrop_count[BUF_MGR_NUM_BUF_Q];

	uint8_t stats_framedrop_count[MSM_ISP_STATS_MAX];

	uint32_t info_dump_frame_count;

	uint32_t error_count;

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

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static const struct platform_device_id msm_vfe32_dev_id[] = { 
#define VFE32_XBAR_BASE(idx) (0x40 + 0x4 * (idx / 4))

#define VFE32_XBAR_SHIFT(idx) ((idx % 4) * 8)

#define VFE32_PING_PONG_BASE(wm, ping_pong) \

	(VFE32_WM_BASE(wm) + 0x4 * (1 + (~(ping_pong >> wm) & 0x1)))

	(VFE32_WM_BASE(wm) + 0x4 * (1 + ((~ping_pong) & 0x1)))



static uint8_t stats_pingpong_offset_map[] = {

	7, 8, 9, 10, 11, 12, 13};
@@ -1164,12 +1164,12 @@ static void msm_vfe32_cfg_axi_ub(struct vfe_device *vfe_dev) 
}



static void msm_vfe32_update_ping_pong_addr(void __iomem *vfe_base,

	uint8_t wm_idx, uint32_t pingpong_status, dma_addr_t paddr,

	uint8_t wm_idx, uint32_t pingpong_bit, dma_addr_t paddr,

	int32_t buf_size)

{

	uint32_t paddr32 = (paddr & 0xFFFFFFFF);

	msm_camera_io_w(paddr32, vfe_base +

		VFE32_PING_PONG_BASE(wm_idx, pingpong_status));

		VFE32_PING_PONG_BASE(wm_idx, pingpong_bit));

}



static int msm_vfe32_axi_halt(struct vfe_device *vfe_dev, uint32_t blocking)

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

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#define VFE40_XBAR_BASE(idx) (0x58 + 0x4 * (idx / 2))

#define VFE40_XBAR_SHIFT(idx) ((idx%2) ? 16 : 0)

#define VFE40_PING_PONG_BASE(wm, ping_pong) \

	(VFE40_WM_BASE(wm) + 0x4 * (1 + (~(ping_pong >> wm) & 0x1)))

	(VFE40_WM_BASE(wm) + 0x4 * (1 + ((~ping_pong) & 0x1)))



#define VFE40_BUS_RD_CGC_OVERRIDE_BIT 16
@@ -1630,12 +1630,12 @@ static void msm_vfe40_read_wm_ping_pong_addr( 


static void msm_vfe40_update_ping_pong_addr(

	void __iomem *vfe_base,

	uint8_t wm_idx, uint32_t pingpong_status, dma_addr_t paddr,

	uint8_t wm_idx, uint32_t pingpong_bit, dma_addr_t paddr,

	int32_t buf_size)

{

	uint32_t paddr32 = (paddr & 0xFFFFFFFF);

	msm_camera_io_w(paddr32, vfe_base +

		VFE40_PING_PONG_BASE(wm_idx, pingpong_status));

		VFE40_PING_PONG_BASE(wm_idx, pingpong_bit));

}



static int msm_vfe40_axi_halt(struct vfe_device *vfe_dev,

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

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#define VFE44_XBAR_BASE(idx) (0x58 + 0x4 * (idx / 2))

#define VFE44_XBAR_SHIFT(idx) ((idx%2) ? 16 : 0)

#define VFE44_PING_PONG_BASE(wm, ping_pong) \

	(VFE44_WM_BASE(wm) + 0x4 * (1 + (~(ping_pong >> wm) & 0x1)))

	(VFE44_WM_BASE(wm) + 0x4 * (1 + ((~ping_pong) & 0x1)))



#define VFE44_BUS_RD_CGC_OVERRIDE_BIT 16
@@ -1374,12 +1374,12 @@ static void msm_vfe44_read_wm_ping_pong_addr( 


static void msm_vfe44_update_ping_pong_addr(

	void __iomem *vfe_base,

	uint8_t wm_idx, uint32_t pingpong_status, dma_addr_t paddr,

	uint8_t wm_idx, uint32_t pingpong_bit, dma_addr_t paddr,

	int32_t buf_size)

{

	uint32_t paddr32 = (paddr & 0xFFFFFFFF);

	msm_camera_io_w(paddr32, vfe_base +

		VFE44_PING_PONG_BASE(wm_idx, pingpong_status));

		VFE44_PING_PONG_BASE(wm_idx, pingpong_bit));

}



static int msm_vfe44_axi_halt(struct vfe_device *vfe_dev,

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

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#define VFE46_XBAR_BASE(idx) (0x90 + 0x4 * (idx / 2))

#define VFE46_XBAR_SHIFT(idx) ((idx%2) ? 16 : 0)

#define VFE46_PING_PONG_BASE(wm, ping_pong) \

	(VFE46_WM_BASE(wm) + 0x4 * (1 + (~(ping_pong >> wm) & 0x1)))

	(VFE46_WM_BASE(wm) + 0x4 * (1 + ((~ping_pong) & 0x1)))

#define SHIFT_BF_SCALE_BIT 1

#define VFE46_NUM_STATS_COMP 2

#define VFE46_BUS_RD_CGC_OVERRIDE_BIT 16
@@ -1437,13 +1437,13 @@ static void msm_vfe46_read_wm_ping_pong_addr( 


static void msm_vfe46_update_ping_pong_addr(

	void __iomem *vfe_base,

	uint8_t wm_idx, uint32_t pingpong_status, dma_addr_t paddr,

	uint8_t wm_idx, uint32_t pingpong_bit, dma_addr_t paddr,

	int32_t buf_size)

{

	uint32_t paddr32 = (paddr & 0xFFFFFFFF);



	msm_camera_io_w(paddr32, vfe_base +

		VFE46_PING_PONG_BASE(wm_idx, pingpong_status));

		VFE46_PING_PONG_BASE(wm_idx, pingpong_bit));

}



static int msm_vfe46_axi_halt(struct vfe_device *vfe_dev,