Commit c92f0380 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "For two regressions in media core:

   - v4l2-subdev: fix regression in check_pad()

   - videodev2.h: change V4L2_PIX_FMT_BGRA444 define: fourcc was already
     in use"

* tag 'media/v5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: videodev2.h: change V4L2_PIX_FMT_BGRA444 define: fourcc was already in use
  media: v4l2-subdev: fix regression in check_pad()
parents 83768245 22be8233

drivers/media/v4l2-core/v4l2-subdev.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static inline int check_which(__u32 which) 
static inline int check_pad(struct v4l2_subdev *sd, __u32 pad)

{

#if defined(CONFIG_MEDIA_CONTROLLER)

	if (sd->entity.graph_obj.mdev) {

	if (sd->entity.num_pads) {

		if (pad >= sd->entity.num_pads)

			return -EINVAL;

		return 0;

include/uapi/linux/videodev2.h

+7 −1
Original line number Diff line number Diff line
@@ -518,7 +518,13 @@ struct v4l2_pix_format { 
#define V4L2_PIX_FMT_RGBX444 v4l2_fourcc('R', 'X', '1', '2') /* 16  rrrrgggg bbbbxxxx */

#define V4L2_PIX_FMT_ABGR444 v4l2_fourcc('A', 'B', '1', '2') /* 16  aaaabbbb ggggrrrr */

#define V4L2_PIX_FMT_XBGR444 v4l2_fourcc('X', 'B', '1', '2') /* 16  xxxxbbbb ggggrrrr */

#define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') /* 16  bbbbgggg rrrraaaa */



/*

 * Originally this had 'BA12' as fourcc, but this clashed with the older

 * V4L2_PIX_FMT_SGRBG12 which inexplicably used that same fourcc.

 * So use 'GA12' instead for V4L2_PIX_FMT_BGRA444.

 */

#define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') /* 16  bbbbgggg rrrraaaa */

#define V4L2_PIX_FMT_BGRX444 v4l2_fourcc('B', 'X', '1', '2') /* 16  bbbbgggg rrrrxxxx */

#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */

#define V4L2_PIX_FMT_ARGB555 v4l2_fourcc('A', 'R', '1', '5') /* 16  ARGB-1-5-5-5  */

CRA Git | Maintained and supported by SUSTech CRA and CCSE