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

Commit ec597208 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cvp: Use HFI buffer descriptor from user space"

parents 5cbcb2a4 20d21f01

drivers/media/platform/msm/cvp/cvp_hfi_api.h

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ 
#define HFI_PERSIST_BUFFERS_OFFSET 7

#define HFI_PERSIST_BUF_NUM     2



#define HFI_DS_CMD_SIZE	54

#define HFI_DS_BUFFERS_OFFSET	48

#define HFI_DS_CMD_SIZE	50

#define HFI_DS_BUFFERS_OFFSET	44

#define HFI_DS_BUF_NUM	3



#define HFI_OF_CONFIG_CMD_SIZE 34

drivers/media/platform/msm/cvp/msm_v4l2_private.c

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ static int convert_from_user(struct cvp_kmd_arg *kp, 
		set_bit(bit_offset, &inst->deprecate_bitmask);

	}



	if (get_user(kp->buf_offset, &up->buf_offset) ||

		get_user(kp->buf_num, &up->buf_num))

		return -EFAULT;



	switch (kp->type) {

	case CVP_KMD_GET_SESSION_INFO:

	{