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

Commit be0bab8a 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_v2: cpp: Fix data types in cpp structures"

parents cd983617 a5bf7a15

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+3 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static struct msm_cpp_buff_queue_info_t *msm_cpp_get_buff_queue_entry( 


static unsigned long msm_cpp_get_phy_addr(struct cpp_device *cpp_dev,

	struct msm_cpp_buff_queue_info_t *buff_queue_info, uint32_t buff_index,

	uint8_t native_buff, int *fd)

	uint8_t native_buff, int32_t *fd)

{

	unsigned long phy_add = 0;

	struct list_head *buff_head;
@@ -323,7 +323,7 @@ static void msm_cpp_dequeue_buffer_info(struct cpp_device *cpp_dev, 


static unsigned long msm_cpp_fetch_buffer_info(struct cpp_device *cpp_dev,

	struct msm_cpp_buffer_info_t *buffer_info, uint32_t session_id,

	uint32_t stream_id, int *fd)

	uint32_t stream_id, int32_t *fd)

{

	unsigned long phy_addr = 0;

	struct msm_cpp_buff_queue_info_t *buff_queue_info;
@@ -1332,6 +1332,7 @@ static struct msm_cpp_frame_info_t *msm_cpp_get_frame( 
	int32_t rc = 0;



	new_frame = kzalloc(sizeof(struct msm_cpp_frame_info_t), GFP_KERNEL);



	if (!new_frame) {

		pr_err("Insufficient memory\n");

		rc = -ENOMEM;

drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ static long msm_vpe_subdev_ioctl(struct v4l2_subdev *sd, 
		struct msm_vpe_transaction_setup_cfg *cfg;

		VPE_DBG("VIDIOC_MSM_VPE_TRANSACTION_SETUP\n");

		if (sizeof(*cfg) != ioctl_ptr->len) {

			pr_err("%s: size mismatch cmd=%d, len=%d, expected=%zu",

			pr_err("%s: size mismatch cmd=%d, len=%zu, expected=%zu",

				__func__, cmd, ioctl_ptr->len,

				sizeof(*cfg));

			rc = -EINVAL;

include/media/msmb_pproc.h

+11 −11
Original line number Diff line number Diff line
@@ -101,18 +101,18 @@ struct msm_cpp_frame_strip_info { 
	uint32_t output_bytes_per_pixel;

	uint32_t temporal_bytes_per_pixel;



	unsigned int source_address[2];

	unsigned int destination_address[2];

	uint32_t source_address[2];

	uint32_t destination_address[2];

	/* source_address[1] is used for CbCR planar

	 * to CbCr interleaved conversion

	 */

	unsigned int temporal_source_address[2];

	uint32_t temporal_source_address[2];

	/* destination_address[1] is used for CbCr interleved

	 * to CbCr planar conversion

	 */

	unsigned int temporal_destination_address[2];

	unsigned int src_stride;

	unsigned int dst_stride;

	uint32_t temporal_destination_address[2];

	uint32_t src_stride;

	uint32_t dst_stride;

	uint32_t rotate_270;

	uint32_t horizontal_flip;

	uint32_t vertical_flip;
@@ -126,7 +126,7 @@ struct msm_cpp_frame_strip_info { 
};



struct msm_cpp_buffer_info_t {

	int fd;

	int32_t fd;

	uint32_t index;

	uint32_t offset;

	uint8_t native_buff;
@@ -187,7 +187,7 @@ struct msm_vpe_frame_strip_info { 
};



struct msm_vpe_buffer_info_t {

	int fd;

	int32_t fd;

	uint32_t index;

	uint32_t offset;

	uint8_t native_buff;
@@ -208,8 +208,8 @@ struct msm_vpe_frame_info_t { 
	uint32_t client_id;

	enum msm_vpe_frame_type frame_type;

	struct msm_vpe_frame_strip_info strip_info;

	int src_fd;

	int dst_fd;

	unsigned long src_fd;

	unsigned long dst_fd;

	struct ion_handle *src_ion_handle;

	struct ion_handle *dest_ion_handle;

	unsigned long src_phyaddr;
@@ -294,7 +294,7 @@ struct msm_pproc_queue_buf_info { 


struct msm_camera_v4l2_ioctl_t {

	uint32_t id;

	uint32_t len;

	size_t len;

	int32_t trans_code;

	void __user *ioctl_ptr;

};