xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ivtv: fix incorrect device_caps for ivtvfb

Browse Source 
[ Upstream commit 25e94139218c0293b4375233c14f2256d7dcfaa8 ]

The VIDIOC_G_FBUF and related overlay ioctls no longer worked (-ENOTTY was
returned).

The root cause was the introduction of the caps field in ivtv-driver.h.
While loading the ivtvfb module would update the video_device device_caps
field with V4L2_CAP_VIDEO_OUTPUT_OVERLAY it would not update that caps
field, and that's what the overlay ioctls would look at.

It's a bad idea to keep information in two places, so drop the caps field
and only use vdev.device_caps.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reported-by: Martin Dauskardt <martin.dauskardt@gmx.de>
Fixes: 2161536516 (media: media/pci: set device_caps in struct video_device)
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hans Verkuil
2022-03-06 12:29:11 +01:00
committed by Greg Kroah-Hartman
parent ebd4f1501e
commit b5664a584e
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/pci/ivtv/ivtv-driver.h
View File

@@ -332,7 +332,6 @@ struct ivtv_stream {
struct ivtv *itv; /* for ease of use */ struct ivtv *itv; /* for ease of use */
const char *name; /* name of the stream */ const char *name; /* name of the stream */
int type; /* stream type */ int type; /* stream type */
u32 caps; /* V4L2 capabilities */
struct v4l2_fh *fh; /* pointer to the streaming filehandle */ struct v4l2_fh *fh; /* pointer to the streaming filehandle */
spinlock_t qlock; /* locks access to the queues */ spinlock_t qlock; /* locks access to the queues */

10
drivers/media/pci/ivtv/ivtv-ioctl.c
View File

@@ -443,7 +443,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 ivtv_stream *s = &itv->streams[fh2id(fh)->type];
struct v4l2_window *winfmt = &fmt->fmt.win; 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; return -EINVAL;
if (!itv->osd_video_pbase) if (!itv->osd_video_pbase)
return -EINVAL; return -EINVAL;
@@ -554,7 +554,7 @@ static int ivtv_try_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2
u32 chromakey = fmt->fmt.win.chromakey; u32 chromakey = fmt->fmt.win.chromakey;
u8 global_alpha = fmt->fmt.win.global_alpha; 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; return -EINVAL;
if (!itv->osd_video_pbase) if (!itv->osd_video_pbase)
return -EINVAL; return -EINVAL;
@@ -1388,7 +1388,7 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
0, 0,
}; };
if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)) if (!(s->vdev.device_caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
return -ENOTTY; return -ENOTTY;
if (!itv->osd_video_pbase) if (!itv->osd_video_pbase)
return -ENOTTY; return -ENOTTY;
@@ -1455,7 +1455,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 ivtv_stream *s = &itv->streams[fh2id(fh)->type];
struct yuv_playback_info *yi = &itv->yuv_info; 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; return -ENOTTY;
if (!itv->osd_video_pbase) if (!itv->osd_video_pbase)
return -ENOTTY; return -ENOTTY;
@@ -1475,7 +1475,7 @@ static int ivtv_overlay(struct file *file, void *fh, unsigned int on)
struct ivtv *itv = id->itv; struct ivtv *itv = id->itv;
struct ivtv_stream *s = &itv->streams[fh2id(fh)->type]; 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; return -ENOTTY;
if (!itv->osd_video_pbase) if (!itv->osd_video_pbase)
return -ENOTTY; return -ENOTTY;

11
drivers/media/pci/ivtv/ivtv-streams.c
View File

@@ -176,7 +176,7 @@ static void ivtv_stream_init(struct ivtv *itv, int type)
s->itv = itv; s->itv = itv;
s->type = type; s->type = type;
s->name = ivtv_stream_info[type].name; 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) if (ivtv_stream_info[type].pio)
s->dma = PCI_DMA_NONE; s->dma = PCI_DMA_NONE;
@@ -299,12 +299,9 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)
if (s_mpg->vdev.v4l2_dev) if (s_mpg->vdev.v4l2_dev)
num = s_mpg->vdev.num + ivtv_stream_info[type].num_offset; num = s_mpg->vdev.num + ivtv_stream_info[type].num_offset;
} }
s->vdev.device_caps = s->caps; if (itv->osd_video_pbase && (type == IVTV_DEC_STREAM_TYPE_YUV ||
if (itv->osd_video_pbase) { type == IVTV_DEC_STREAM_TYPE_MPG)) {
itv->streams[IVTV_DEC_STREAM_TYPE_YUV].vdev.device_caps |= s->vdev.device_caps |= V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
itv->streams[IVTV_DEC_STREAM_TYPE_MPG].vdev.device_caps |=
V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
itv->v4l2_cap |= V4L2_CAP_VIDEO_OUTPUT_OVERLAY; itv->v4l2_cap |= V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
} }
video_set_drvdata(&s->vdev, s); video_set_drvdata(&s->vdev, s);