Commit b3627647 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'br-v5.18s' of git://linuxtv.org/hverkuil/media_tree into media_stage 

Tag branch

* tag 'br-v5.18s' of git://linuxtv.org/hverkuil/media_tree

:
  ivtv: fix incorrect device_caps for ivtvfb
  media: rcar-csi2: Drop comma after SoC match table sentinel
  media: camss: Replace hard coded value with parameter
  media: saa7134: fix incorrect use to determine if list is empty
  media: MAINTAINERS: update rksip1 maintainers info
  MAINTAINERS: update media vimc driver maintainers
  media: i2c: max2175: Use rbtree rather than flat register cache

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parents 92ec1a5c 25e94139

MAINTAINERS

+3 −4
Original line number Diff line number Diff line
@@ -16644,8 +16644,7 @@ F: Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml 
F:	sound/soc/rockchip/rockchip_i2s_tdm.*









ROCKCHIP ISP V1 DRIVER









M:	Helen Koike <helen.koike@collabora.com>









M:	Dafna Hirschfeld <dafna.hirschfeld@collabora.com>









M:	Dafna Hirschfeld <dafna@fastmail.com>









L:	linux-media@vger.kernel.org









L:	linux-rockchip@lists.infradead.org









S:	Maintained








@@ -20364,8 +20363,8 @@ F:	drivers/media/common/videobuf2/*







F:	include/media/videobuf2-*

















VIMC VIRTUAL MEDIA CONTROLLER DRIVER









M:	Helen Koike <helen.koike@collabora.com>









R:	Shuah Khan <skhan@linuxfoundation.org>









M:	Shuah Khan <skhan@linuxfoundation.org>









R:	Kieran Bingham <kieran.bingham@ideasonboard.com>









L:	linux-media@vger.kernel.org









S:	Maintained









W:	https://linuxtv.org

























drivers/media/i2c/max2175.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -257,7 +257,7 @@ static const struct regmap_config max2175_regmap_config = {







	.reg_defaults = max2175_reg_defaults,









	.num_reg_defaults = ARRAY_SIZE(max2175_reg_defaults),









	.volatile_table = &max2175_volatile_regs,









	.cache_type = REGCACHE_FLAT,









	.cache_type = REGCACHE_RBTREE,









};



















struct max2175 {
































drivers/media/pci/ivtv/ivtv-driver.h



+0
−1






























Original line number
Diff line number
Diff line







@@ -330,7 +330,6 @@ struct ivtv_stream {







	struct ivtv *itv;		/* for ease of use */









	const char *name;		/* name of the stream */









	int type;			/* stream type */









	u32 caps;			/* V4L2 capabilities */



















	struct v4l2_fh *fh;		/* pointer to the streaming filehandle */









	spinlock_t qlock;		/* locks access to the queues */
































drivers/media/pci/ivtv/ivtv-ioctl.c



+5
−5






























Original line number
Diff line number
Diff line







@@ -438,7 +438,7 @@ static int ivtv_g_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_f







	struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];









	struct v4l2_window *winfmt = &fmt->fmt.win;



















	if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))









	if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))









		return -EINVAL;









	if (!itv->osd_video_pbase)









		return -EINVAL;








@@ -549,7 +549,7 @@ static int ivtv_try_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2







	u32 chromakey = fmt->fmt.win.chromakey;









	u8 global_alpha = fmt->fmt.win.global_alpha;



















	if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))









	if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))









		return -EINVAL;









	if (!itv->osd_video_pbase)









		return -EINVAL;








@@ -1383,7 +1383,7 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)







		0,









	};



















	if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))









	if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))









		return -ENOTTY;









	if (!itv->osd_video_pbase)









		return -ENOTTY;








@@ -1450,7 +1450,7 @@ static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffe







	struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];









	struct yuv_playback_info *yi = &itv->yuv_info;



















	if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))









	if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))









		return -ENOTTY;









	if (!itv->osd_video_pbase)









		return -ENOTTY;








@@ -1470,7 +1470,7 @@ static int ivtv_overlay(struct file *file, void *fh, unsigned int on)







	struct ivtv *itv = id->itv;









	struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];



















	if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))









	if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))









		return -ENOTTY;









	if (!itv->osd_video_pbase)









		return -ENOTTY;
































drivers/media/pci/ivtv/ivtv-streams.c



+4
−7






























Original line number
Diff line number
Diff line







@@ -176,7 +176,7 @@ static void ivtv_stream_init(struct ivtv *itv, int type)







	s->itv = itv;









	s->type = type;









	s->name = ivtv_stream_info[type].name;









	s->caps = ivtv_stream_info[type].v4l2_caps;









	s->vdev.device_caps = ivtv_stream_info[type].v4l2_caps;



















	if (ivtv_stream_info[type].pio)









		s->dma = DMA_NONE;








@@ -299,12 +299,9 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)







		if (s_mpg->vdev.v4l2_dev)









			num = s_mpg->vdev.num + ivtv_stream_info[type].num_offset;









	}









	s->vdev.device_caps = s->caps;









	if (itv->osd_video_pbase) {









		itv->streams[IVTV_DEC_STREAM_TYPE_YUV].vdev.device_caps |=









			V4L2_CAP_VIDEO_OUTPUT_OVERLAY;









		itv->streams[IVTV_DEC_STREAM_TYPE_MPG].vdev.device_caps |=









			V4L2_CAP_VIDEO_OUTPUT_OVERLAY;









	if (itv->osd_video_pbase && (type == IVTV_DEC_STREAM_TYPE_YUV ||









				     type == IVTV_DEC_STREAM_TYPE_MPG)) {









		s->vdev.device_caps |= V4L2_CAP_VIDEO_OUTPUT_OVERLAY;









		itv->v4l2_cap |= V4L2_CAP_VIDEO_OUTPUT_OVERLAY;









	}









	video_set_drvdata(&s->vdev, s);