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

Commit 3f772904 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: Set max address for stats write master"

parents ba53c451 b10388b9

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

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ struct msm_vfe_stats_ops { 


	void (*update_ping_pong_addr)(struct vfe_device *vfe_dev,

		struct msm_vfe_stats_stream *stream_info,

		uint32_t pingpong_status, dma_addr_t paddr);

		uint32_t pingpong_status, dma_addr_t paddr, uint32_t buf_size);



	uint32_t (*get_frame_id)(struct vfe_device *vfe_dev);

	uint32_t (*get_wm_mask)(uint32_t irq_status0, uint32_t irq_status1);

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, 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
@@ -1305,7 +1305,7 @@ static void msm_vfe32_stats_enable_module(struct vfe_device *vfe_dev, 


static void msm_vfe32_stats_update_ping_pong_addr(struct vfe_device *vfe_dev,

	struct msm_vfe_stats_stream *stream_info, uint32_t pingpong_status,

	dma_addr_t paddr)

	dma_addr_t paddr, uint32_t buf_sz)

{

	void __iomem *vfe_base = vfe_dev->vfe_base;

	int vfe_idx = msm_isp_get_vfe_idx_for_stats_stream(vfe_dev,

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, 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
@@ -2114,7 +2114,7 @@ static void msm_vfe40_stats_enable_module(struct vfe_device *vfe_dev, 


static void msm_vfe40_stats_update_ping_pong_addr(

	struct vfe_device *vfe_dev, struct msm_vfe_stats_stream *stream_info,

	uint32_t pingpong_status, dma_addr_t paddr)

	uint32_t pingpong_status, dma_addr_t paddr, uint32_t buf_sz)

{

	void __iomem *vfe_base = vfe_dev->vfe_base;

	int vfe_idx = msm_isp_get_vfe_idx_for_stats_stream(vfe_dev,

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, 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
@@ -1720,7 +1720,7 @@ static void msm_vfe44_stats_update_cgc_override(struct vfe_device *vfe_dev, 


static void msm_vfe44_stats_update_ping_pong_addr(

	struct vfe_device *vfe_dev, struct msm_vfe_stats_stream *stream_info,

	uint32_t pingpong_status, dma_addr_t paddr)

	uint32_t pingpong_status, dma_addr_t paddr, uint32_t buf_sz)

{

	void __iomem *vfe_base = vfe_dev->vfe_base;

	int vfe_idx = msm_isp_get_vfe_idx_for_stats_stream(vfe_dev,

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, 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
@@ -1798,7 +1798,7 @@ static void msm_vfe46_stats_enable_module(struct vfe_device *vfe_dev, 


static void msm_vfe46_stats_update_ping_pong_addr(

	struct vfe_device *vfe_dev, struct msm_vfe_stats_stream *stream_info,

	uint32_t pingpong_status, dma_addr_t paddr)

	uint32_t pingpong_status, dma_addr_t paddr, uint32_t buf_sz)

{

	void __iomem *vfe_base = vfe_dev->vfe_base;

	int vfe_idx = msm_isp_get_vfe_idx_for_stats_stream(vfe_dev,