tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Mauro Carvalho Chehab <mchehab@kernel.org>

Mauro Carvalho Chehab b3627647 92ec1a5c

+17 -22
+3 -4
MAINTAINERS
··· 16644 16644 F: sound/soc/rockchip/rockchip_i2s_tdm.* 16645 16645 16646 16646 ROCKCHIP ISP V1 DRIVER 16647 - M: Helen Koike <helen.koike@collabora.com> 16648 - M: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> 16647 + M: Dafna Hirschfeld <dafna@fastmail.com> 16649 16648 L: linux-media@vger.kernel.org 16650 16649 L: linux-rockchip@lists.infradead.org 16651 16650 S: Maintained ··· 20363 20364 F: include/media/videobuf2-* 20364 20365 20365 20366 VIMC VIRTUAL MEDIA CONTROLLER DRIVER 20366 - M: Helen Koike <helen.koike@collabora.com> 20367 - R: Shuah Khan <skhan@linuxfoundation.org> 20367 + M: Shuah Khan <skhan@linuxfoundation.org> 20368 + R: Kieran Bingham <kieran.bingham@ideasonboard.com> 20368 20369 L: linux-media@vger.kernel.org 20369 20370 S: Maintained 20370 20371 W: https://linuxtv.org
+1 -1
drivers/media/i2c/max2175.c
··· 257 257 .reg_defaults = max2175_reg_defaults, 258 258 .num_reg_defaults = ARRAY_SIZE(max2175_reg_defaults), 259 259 .volatile_table = &max2175_volatile_regs, 260 - .cache_type = REGCACHE_FLAT, 260 + .cache_type = REGCACHE_RBTREE, 261 261 }; 262 262 263 263 struct max2175 {
-1
drivers/media/pci/ivtv/ivtv-driver.h
··· 330 330 struct ivtv *itv; /* for ease of use */ 331 331 const char *name; /* name of the stream */ 332 332 int type; /* stream type */ 333 - u32 caps; /* V4L2 capabilities */ 334 333 335 334 struct v4l2_fh *fh; /* pointer to the streaming filehandle */ 336 335 spinlock_t qlock; /* locks access to the queues */
+5 -5
drivers/media/pci/ivtv/ivtv-ioctl.c
··· 438 438 struct ivtv_stream *s = &itv->streams[fh2id(fh)->type]; 439 439 struct v4l2_window *winfmt = &fmt->fmt.win; 440 440 441 - if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) 441 + if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) 442 442 return -EINVAL; 443 443 if (!itv->osd_video_pbase) 444 444 return -EINVAL; ··· 549 549 u32 chromakey = fmt->fmt.win.chromakey; 550 550 u8 global_alpha = fmt->fmt.win.global_alpha; 551 551 552 - if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) 552 + if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) 553 553 return -EINVAL; 554 554 if (!itv->osd_video_pbase) 555 555 return -EINVAL; ··· 1383 1383 0, 1384 1384 }; 1385 1385 1386 - if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) 1386 + if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) 1387 1387 return -ENOTTY; 1388 1388 if (!itv->osd_video_pbase) 1389 1389 return -ENOTTY; ··· 1450 1450 struct ivtv_stream *s = &itv->streams[fh2id(fh)->type]; 1451 1451 struct yuv_playback_info *yi = &itv->yuv_info; 1452 1452 1453 - if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) 1453 + if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) 1454 1454 return -ENOTTY; 1455 1455 if (!itv->osd_video_pbase) 1456 1456 return -ENOTTY; ··· 1470 1470 struct ivtv *itv = id->itv; 1471 1471 struct ivtv_stream *s = &itv->streams[fh2id(fh)->type]; 1472 1472 1473 - if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) 1473 + if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) 1474 1474 return -ENOTTY; 1475 1475 if (!itv->osd_video_pbase) 1476 1476 return -ENOTTY;
+4 -7
drivers/media/pci/ivtv/ivtv-streams.c
··· 176 176 s->itv = itv; 177 177 s->type = type; 178 178 s->name = ivtv_stream_info[type].name; 179 - s->caps = ivtv_stream_info[type].v4l2_caps; 179 + s->vdev.device_caps = ivtv_stream_info[type].v4l2_caps; 180 180 181 181 if (ivtv_stream_info[type].pio) 182 182 s->dma = DMA_NONE; ··· 299 299 if (s_mpg->vdev.v4l2_dev) 300 300 num = s_mpg->vdev.num + ivtv_stream_info[type].num_offset; 301 301 } 302 - s->vdev.device_caps = s->caps; 303 - if (itv->osd_video_pbase) { 304 - itv->streams[IVTV_DEC_STREAM_TYPE_YUV].vdev.device_caps |= 305 - V4L2_CAP_VIDEO_OUTPUT_OVERLAY; 306 - itv->streams[IVTV_DEC_STREAM_TYPE_MPG].vdev.device_caps |= 307 - V4L2_CAP_VIDEO_OUTPUT_OVERLAY; 302 + if (itv->osd_video_pbase && (type == IVTV_DEC_STREAM_TYPE_YUV || 303 + type == IVTV_DEC_STREAM_TYPE_MPG)) { 304 + s->vdev.device_caps |= V4L2_CAP_VIDEO_OUTPUT_OVERLAY; 308 305 itv->v4l2_cap |= V4L2_CAP_VIDEO_OUTPUT_OVERLAY; 309 306 } 310 307 video_set_drvdata(&s->vdev, s);
+2 -2
drivers/media/pci/saa7134/saa7134-alsa.c
··· 1214 1214 1215 1215 static int saa7134_alsa_init(void) 1216 1216 { 1217 - struct saa7134_dev *dev = NULL; 1217 + struct saa7134_dev *dev; 1218 1218 1219 1219 saa7134_dmasound_init = alsa_device_init; 1220 1220 saa7134_dmasound_exit = alsa_device_exit; ··· 1229 1229 alsa_device_init(dev); 1230 1230 } 1231 1231 1232 - if (dev == NULL) 1232 + if (list_empty(&saa7134_devlist)) 1233 1233 pr_info("saa7134 ALSA: no saa7134 cards found\n"); 1234 1234 1235 1235 return 0;
+1 -1
drivers/media/platform/qcom/camss/camss-csid-gen2.c
··· 405 405 writel_relaxed(val, csid->base + CSID_RDI_FRM_DROP_PERIOD(0)); 406 406 407 407 val = 0; 408 - writel_relaxed(0, csid->base + CSID_RDI_FRM_DROP_PATTERN(0)); 408 + writel_relaxed(val, csid->base + CSID_RDI_FRM_DROP_PATTERN(0)); 409 409 410 410 val = 1; 411 411 writel_relaxed(val, csid->base + CSID_RDI_IRQ_SUBSAMPLE_PERIOD(0));
+1 -1
drivers/media/platform/rcar-vin/rcar-csi2.c
··· 1489 1489 .soc_id = "r8a7795", .revision = "ES2.*", 1490 1490 .data = &rcar_csi2_info_r8a7795es2, 1491 1491 }, 1492 - { /* sentinel */ }, 1492 + { /* sentinel */ } 1493 1493 }; 1494 1494 1495 1495 static int rcsi2_probe(struct platform_device *pdev)