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

Commit 914f05c8 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] soc-camera: Support user-configurable line stride 



Add a capabilities field to the soc_camera_host structure to flag hosts
that support user-configurable line strides. soc_camera_try_fmt() then
passes the user-provided bytesperline and sizeimage format fields to
such hosts, and expects the host to check (and fix if needed) the
values.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
[g.liakhovetski@gmx.de: fix a typo in mx2_camera.c]
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b0a461ff

drivers/media/video/mx2_camera.c

+2 −0
Original line number Diff line number Diff line
@@ -1787,6 +1787,8 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev) 
	pcdev->soc_host.priv		= pcdev;

	pcdev->soc_host.v4l2_dev.dev	= &pdev->dev;

	pcdev->soc_host.nr		= pdev->id;

	if (cpu_is_mx25())

		pcdev->soc_host.capabilities = SOCAM_HOST_CAP_STRIDE;



	pcdev->alloc_ctx = vb2_dma_contig_init_ctx(&pdev->dev);

	if (IS_ERR(pcdev->alloc_ctx)) {

drivers/media/video/soc_camera.c

+4 −2
Original line number Diff line number Diff line
@@ -171,8 +171,10 @@ static int soc_camera_try_fmt(struct soc_camera_device *icd, 
	dev_dbg(icd->pdev, "TRY_FMT(%c%c%c%c, %ux%u)\n",

		pixfmtstr(pix->pixelformat), pix->width, pix->height);



	if (!(ici->capabilities & SOCAM_HOST_CAP_STRIDE)) {

		pix->bytesperline = 0;

		pix->sizeimage = 0;

	}



	ret = ici->ops->try_fmt(icd, f);

	if (ret < 0)

include/media/soc_camera.h

+4 −0
Original line number Diff line number Diff line
@@ -56,11 +56,15 @@ struct soc_camera_device { 
	};

};



/* Host supports programmable stride */

#define SOCAM_HOST_CAP_STRIDE		(1 << 0)



struct soc_camera_host {

	struct v4l2_device v4l2_dev;

	struct list_head list;

	struct mutex host_lock;		/* Protect during probing */

	unsigned char nr;		/* Host number */

	u32 capabilities;

	void *priv;

	const char *drv_name;

	struct soc_camera_host_ops *ops;