Commit 51abe041 authored by Bingbu Cao's avatar Bingbu Cao Committed by Mauro Carvalho Chehab
Browse files

media: staging/intel-ipu3: Add dual pipe support 



This patch adds support to run dual pipes simultaneously.
A private ioctl to configure the pipe mode (video or still)
is also implemented.

IPU3 hardware supports a maximum of 2 streams per pipe.
With the support of dual pipes, more than 2 stream outputs
can be achieved.

This helps to support advanced camera features like
Continuous View Finder (CVF) and Snapshot During Video(SDV).

Extend ipu3 IMGU driver to support dual pipes

    1. Extend current IMGU device to contain 2 groups
       of video nodes and 2 subdevs
    2. Extend current css to support 2 pipeline and make
       CSS APIs to support 2 pipe
    3. Add a v4l2 ctrl to allow user to specify the mode
       of the pipe
    4. Check media pipeline link status to get enabled
       pipes

Signed-off-by: default avatarBingbu Cao <bingbu.cao@intel.com>
Signed-off-by: default avatarTian Shu Qiu <tian.shu.qiu@intel.com>
Signed-off-by: default avatarYong Zhi <yong.zhi@intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 41158dab

drivers/staging/media/ipu3/include/intel-ipu3.h

+10 −0
Original line number Diff line number Diff line
@@ -12,6 +12,16 @@ 
#define V4L2_META_FMT_IPU3_PARAMS	v4l2_fourcc('i', 'p', '3', 'p') /* IPU3 processing parameters */

#define V4L2_META_FMT_IPU3_STAT_3A	v4l2_fourcc('i', 'p', '3', 's') /* IPU3 3A statistics */



/* from include/uapi/linux/v4l2-controls.h */

#define V4L2_CID_INTEL_IPU3_BASE	(V4L2_CID_USER_BASE + 0x10c0)

#define V4L2_CID_INTEL_IPU3_MODE	(V4L2_CID_INTEL_IPU3_BASE + 1)



/* custom ctrl to set pipe mode */

enum ipu3_running_mode {

	IPU3_RUNNING_MODE_VIDEO = 0,

	IPU3_RUNNING_MODE_STILL = 1,

};



/******************* ipu3_uapi_stats_3a *******************/



#define IPU3_UAPI_MAX_STRIPES				2

drivers/staging/media/ipu3/ipu3-css-fw.c

+6 −5
Original line number Diff line number Diff line
@@ -69,16 +69,17 @@ unsigned int ipu3_css_fw_obgrid_size(const struct imgu_fw_info *bi) 
	return obgrid_size;

}



void *ipu3_css_fw_pipeline_params(struct ipu3_css *css,

				  enum imgu_abi_param_class c,

				  enum imgu_abi_memories m,

void *ipu3_css_fw_pipeline_params(struct ipu3_css *css, unsigned int pipe,

				  enum imgu_abi_param_class cls,

				  enum imgu_abi_memories mem,

				  struct imgu_fw_isp_parameter *par,

				  size_t par_size, void *binary_params)

{

	struct imgu_fw_info *bi = &css->fwp->binary_header[css->current_binary];

	struct imgu_fw_info *bi =

		&css->fwp->binary_header[css->pipes[pipe].bindex];



	if (par->offset + par->size >

	    bi->info.isp.sp.mem_initializers.params[c][m].size)

	    bi->info.isp.sp.mem_initializers.params[cls][mem].size)

		return NULL;



	if (par->size != par_size)

drivers/staging/media/ipu3/ipu3-css-fw.h

+3 −3
Original line number Diff line number Diff line
@@ -179,9 +179,9 @@ int ipu3_css_fw_init(struct ipu3_css *css); 
void ipu3_css_fw_cleanup(struct ipu3_css *css);



unsigned int ipu3_css_fw_obgrid_size(const struct imgu_fw_info *bi);

void *ipu3_css_fw_pipeline_params(struct ipu3_css *css,

				  enum imgu_abi_param_class c,

				  enum imgu_abi_memories m,

void *ipu3_css_fw_pipeline_params(struct ipu3_css *css, unsigned int pipe,

				  enum imgu_abi_param_class cls,

				  enum imgu_abi_memories mem,

				  struct imgu_fw_isp_parameter *par,

				  size_t par_size, void *binary_params);

drivers/staging/media/ipu3/ipu3-css-params.c

+172 −144

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/media/ipu3/ipu3-css-params.h

+6 −3
Original line number Diff line number Diff line
@@ -4,16 +4,19 @@ 
#ifndef __IPU3_PARAMS_H

#define __IPU3_PARAMS_H



int ipu3_css_cfg_acc(struct ipu3_css *css, struct ipu3_uapi_flags *use,

int ipu3_css_cfg_acc(struct ipu3_css *css, unsigned int pipe,

		     struct ipu3_uapi_flags *use,

		     struct imgu_abi_acc_param *acc,

		     struct imgu_abi_acc_param *acc_old,

		     struct ipu3_uapi_acc_param *acc_user);



int ipu3_css_cfg_vmem0(struct ipu3_css *css, struct ipu3_uapi_flags *use,

int ipu3_css_cfg_vmem0(struct ipu3_css *css, unsigned int pipe,

		       struct ipu3_uapi_flags *use,

		       void *vmem0, void *vmem0_old,

		       struct ipu3_uapi_params *user);



int ipu3_css_cfg_dmem0(struct ipu3_css *css, struct ipu3_uapi_flags *use,

int ipu3_css_cfg_dmem0(struct ipu3_css *css, unsigned int pipe,

		       struct ipu3_uapi_flags *use,

		       void *dmem0, void *dmem0_old,

		       struct ipu3_uapi_params *user);

CRA Git | Maintained and supported by SUSTech CRA and CCSE