Commit fb1417ed authored by Vedang Nagar's avatar Vedang Nagar Committed by Hans Verkuil
Browse files

media: iris: implement enum_fmt and enum_framesizes ioctls 



Implement the enum_fmt and enum_framesizes ioctls with the necessary
hooks.

Signed-off-by: default avatarVedang Nagar <quic_vnagar@quicinc.com>
Reviewed-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Tested-by: Stefan Schmidt <stefan.schmidt@linaro.org> # x1e80100 (Dell XPS 13 9345)
Reviewed-by: default avatarStefan Schmidt <stefan.schmidt@linaro.org>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-HDK
Signed-off-by: default avatarDikshita Agarwal <quic_dikshita@quicinc.com>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
parent 402109e0

drivers/media/platform/qcom/iris/iris_platform_common.h

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ struct ubwc_config_data { 
};



struct platform_inst_caps {

	u32 min_frame_width;

	u32 max_frame_width;

	u32 min_frame_height;

	u32 max_frame_height;

	u32 max_mbpf;

};

struct iris_core_power {

drivers/media/platform/qcom/iris/iris_platform_sm8550.c

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 
#define VIDEO_ARCH_LX 1



static struct platform_inst_caps platform_inst_cap_sm8550 = {

	.min_frame_width = 96,

	.max_frame_width = 8192,

	.min_frame_height = 96,

	.max_frame_height = 8192,

	.max_mbpf = (8192 * 4352) / 256,

};

drivers/media/platform/qcom/iris/iris_vdec.c

+17 −0
Original line number Diff line number Diff line
@@ -58,6 +58,23 @@ void iris_vdec_inst_deinit(struct iris_inst *inst) 
	kfree(inst->fmt_src);

}



int iris_vdec_enum_fmt(struct iris_inst *inst, struct v4l2_fmtdesc *f)

{

	switch (f->type) {

	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:

		f->pixelformat = V4L2_PIX_FMT_H264;

		f->flags = V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_DYN_RESOLUTION;

		break;

	case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:

		f->pixelformat = V4L2_PIX_FMT_NV12;

		break;

	default:

		return -EINVAL;

	}



	return 0;

}



int iris_vdec_try_fmt(struct iris_inst *inst, struct v4l2_format *f)

{

	struct v4l2_pix_format_mplane *pixmp = &f->fmt.pix_mp;

drivers/media/platform/qcom/iris/iris_vdec.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ struct iris_inst; 


void iris_vdec_inst_init(struct iris_inst *inst);

void iris_vdec_inst_deinit(struct iris_inst *inst);

int iris_vdec_enum_fmt(struct iris_inst *inst, struct v4l2_fmtdesc *f);

int iris_vdec_try_fmt(struct iris_inst *inst, struct v4l2_format *f);

int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f);

drivers/media/platform/qcom/iris/iris_vidc.c

+39 −0
Original line number Diff line number Diff line
@@ -217,6 +217,16 @@ int iris_close(struct file *filp) 
	return 0;

}



static int iris_enum_fmt(struct file *filp, void *fh, struct v4l2_fmtdesc *f)

{

	struct iris_inst *inst = iris_get_inst(filp, NULL);



	if (f->index)

		return -EINVAL;



	return iris_vdec_enum_fmt(inst, f);

}



static int iris_try_fmt_vid_mplane(struct file *filp, void *fh, struct v4l2_format *f)

{

	struct iris_inst *inst = iris_get_inst(filp, NULL);
@@ -259,6 +269,32 @@ static int iris_g_fmt_vid_mplane(struct file *filp, void *fh, struct v4l2_format 
	return ret;

}



static int iris_enum_framesizes(struct file *filp, void *fh,

				struct v4l2_frmsizeenum *fsize)

{

	struct iris_inst *inst = iris_get_inst(filp, NULL);

	struct platform_inst_caps *caps;



	if (fsize->index)

		return -EINVAL;



	if (fsize->pixel_format != V4L2_PIX_FMT_H264 &&

	    fsize->pixel_format != V4L2_PIX_FMT_NV12)

		return -EINVAL;



	caps = inst->core->iris_platform_data->inst_caps;



	fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;

	fsize->stepwise.min_width = caps->min_frame_width;

	fsize->stepwise.max_width = caps->max_frame_width;

	fsize->stepwise.step_width = STEP_WIDTH;

	fsize->stepwise.min_height = caps->min_frame_height;

	fsize->stepwise.max_height = caps->max_frame_height;

	fsize->stepwise.step_height = STEP_HEIGHT;



	return 0;

}



static int iris_g_selection(struct file *filp, void *fh, struct v4l2_selection *s)

{

	struct iris_inst *inst = iris_get_inst(filp, NULL);
@@ -300,12 +336,15 @@ static const struct vb2_ops iris_vb2_ops = { 
};



static const struct v4l2_ioctl_ops iris_v4l2_ioctl_ops = {

	.vidioc_enum_fmt_vid_cap        = iris_enum_fmt,

	.vidioc_enum_fmt_vid_out        = iris_enum_fmt,

	.vidioc_try_fmt_vid_cap_mplane  = iris_try_fmt_vid_mplane,

	.vidioc_try_fmt_vid_out_mplane  = iris_try_fmt_vid_mplane,

	.vidioc_s_fmt_vid_cap_mplane    = iris_s_fmt_vid_mplane,

	.vidioc_s_fmt_vid_out_mplane    = iris_s_fmt_vid_mplane,

	.vidioc_g_fmt_vid_cap_mplane    = iris_g_fmt_vid_mplane,

	.vidioc_g_fmt_vid_out_mplane    = iris_g_fmt_vid_mplane,

	.vidioc_enum_framesizes         = iris_enum_framesizes,

	.vidioc_reqbufs                 = v4l2_m2m_ioctl_reqbufs,

	.vidioc_g_selection             = iris_g_selection,

};