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

Commit 2049cc66 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: Program scratch buffer by sending right bit"

parents 829cfc97 9c7f7133

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

+3 −2
Original line number Diff line number Diff line
@@ -3509,7 +3509,8 @@ void msm_isp_process_axi_irq(struct vfe_device *vfe_dev, 
					if (comp_info->stream_composite_mask &

						(1 << wm))

						msm_isp_cfg_wm_scratch(vfe_dev,

							wm, pingpong_status);

							wm, (pingpong_status >>

								wm) & 0x1);

				continue;

			}

			stream_idx = HANDLE_TO_IDX(comp_info->stream_handle);
@@ -3529,7 +3530,7 @@ void msm_isp_process_axi_irq(struct vfe_device *vfe_dev, 
				pr_err("%s: Invalid handle for wm irq\n",

					__func__);

				msm_isp_cfg_wm_scratch(vfe_dev, i,

					pingpong_status);

					(pingpong_status >> i) & 0x1);

				continue;

			}

			stream_info = &axi_data->stream_info[stream_idx];

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

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static inline void msm_isp_cfg_stream_scratch(struct vfe_device *vfe_dev, 
	pingpong_bit = (~(pingpong_status >> stream_info->wm[0]) & 0x1);

	for (i = 0; i < stream_info->num_planes; i++)

		msm_isp_cfg_wm_scratch(vfe_dev, stream_info->wm[i],

				~pingpong_bit);

				~pingpong_bit & 0x1);

	stream_info->buf[pingpong_bit] = NULL;

}