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

Commit 8f4f298e authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] omap3isp: Support additional in-memory compressed bayer formats 



This also prevents accessing NULL pointer in csi2_try_format().

Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 77e7c4e6

drivers/media/video/omap3isp/ispvideo.c

+13 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ 
 * Helper functions

 */



/*

 * NOTE: When adding new media bus codes, always remember to add

 * corresponding in-memory formats to the table below!!!

 */

static struct isp_format_info formats[] = {

	{ V4L2_MBUS_FMT_Y8_1X8, V4L2_MBUS_FMT_Y8_1X8,

	  V4L2_MBUS_FMT_Y8_1X8, V4L2_MBUS_FMT_Y8_1X8,
@@ -68,9 +72,18 @@ static struct isp_format_info formats[] = { 
	{ V4L2_MBUS_FMT_SRGGB8_1X8, V4L2_MBUS_FMT_SRGGB8_1X8,

	  V4L2_MBUS_FMT_SRGGB8_1X8, V4L2_MBUS_FMT_SRGGB8_1X8,

	  V4L2_PIX_FMT_SRGGB8, 8, },

	{ V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8, V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8,

	  V4L2_MBUS_FMT_SBGGR10_1X10, 0,

	  V4L2_PIX_FMT_SBGGR10DPCM8, 8, },

	{ V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8, V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8,

	  V4L2_MBUS_FMT_SGBRG10_1X10, 0,

	  V4L2_PIX_FMT_SGBRG10DPCM8, 8, },

	{ V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8, V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,

	  V4L2_MBUS_FMT_SGRBG10_1X10, 0,

	  V4L2_PIX_FMT_SGRBG10DPCM8, 8, },

	{ V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8, V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8,

	  V4L2_MBUS_FMT_SRGGB10_1X10, 0,

	  V4L2_PIX_FMT_SRGGB10DPCM8, 8, },

	{ V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_MBUS_FMT_SBGGR10_1X10,

	  V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_MBUS_FMT_SBGGR8_1X8,

	  V4L2_PIX_FMT_SBGGR10, 10, },