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

Commit 38a1421d authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] ivtv: disable fbuf support if ivtvfb isn't loaded 



Disable all fbuf-related functionality if ivtvfb isn't loaded. This
caused various v4l2-compliance failures.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent bbc9fa2e

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

+26 −10
Original line number Diff line number Diff line
@@ -448,9 +448,12 @@ static int ivtv_g_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f 
static int ivtv_g_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)

{

	struct ivtv *itv = fh2id(fh)->itv;

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

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



	if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))

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

		return -EINVAL;

	if (!itv->osd_video_pbase)

		return -EINVAL;

	winfmt->chromakey = itv->osd_chroma_key;

	winfmt->global_alpha = itv->osd_global_alpha;
@@ -555,10 +558,13 @@ static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format 
static int ivtv_try_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)

{

	struct ivtv *itv = fh2id(fh)->itv;

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

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

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



	if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))

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

		return -EINVAL;

	if (!itv->osd_video_pbase)

		return -EINVAL;

	ivtv_g_fmt_vid_out_overlay(file, fh, fmt);

	fmt->fmt.win.chromakey = chromakey;
@@ -741,6 +747,11 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc 
	snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(itv->pdev));

	vcap->capabilities = itv->v4l2_cap | V4L2_CAP_DEVICE_CAPS;

	vcap->device_caps = s->caps;

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

	    !itv->osd_video_pbase) {

		vcap->capabilities &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;

		vcap->device_caps &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;

	}

	return 0;

}
@@ -1363,6 +1374,7 @@ static int ivtv_try_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder 
static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)

{

	struct ivtv *itv = fh2id(fh)->itv;

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

	u32 data[CX2341X_MBOX_MAX_DATA];

	struct yuv_playback_info *yi = &itv->yuv_info;
@@ -1386,10 +1398,10 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb) 
		0,

	};



	if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))

		return -EINVAL;

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

		return -ENOTTY;

	if (!itv->osd_video_pbase)

		return -EINVAL;

		return -ENOTTY;



	fb->capability = V4L2_FBUF_CAP_EXTERNOVERLAY | V4L2_FBUF_CAP_CHROMAKEY |

		V4L2_FBUF_CAP_GLOBAL_ALPHA;
@@ -1450,12 +1462,13 @@ static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffe 
{

	struct ivtv_open_id *id = fh2id(fh);

	struct ivtv *itv = id->itv;

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

	struct yuv_playback_info *yi = &itv->yuv_info;



	if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))

		return -EINVAL;

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

		return -ENOTTY;

	if (!itv->osd_video_pbase)

		return -EINVAL;

		return -ENOTTY;



	itv->osd_global_alpha_state = (fb->flags & V4L2_FBUF_FLAG_GLOBAL_ALPHA) != 0;

	itv->osd_local_alpha_state =
@@ -1470,9 +1483,12 @@ static int ivtv_overlay(struct file *file, void *fh, unsigned int on) 
{

	struct ivtv_open_id *id = fh2id(fh);

	struct ivtv *itv = id->itv;

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



	if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))

		return -EINVAL;

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

		return -ENOTTY;

	if (!itv->osd_video_pbase)

		return -ENOTTY;



	ivtv_vapi(itv, CX2341X_OSD_SET_STATE, 1, on != 0);

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

+4 −2
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ static struct { 
		"decoder MPG",

		VFL_TYPE_GRABBER, IVTV_V4L2_DEC_MPG_OFFSET,

		PCI_DMA_TODEVICE, 0,

		V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,

		V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |

		V4L2_CAP_VIDEO_OUTPUT_OVERLAY,

		&ivtv_v4l2_dec_fops

	},

	{	/* IVTV_DEC_STREAM_TYPE_VBI */
@@ -151,7 +152,8 @@ static struct { 
		"decoder YUV",

		VFL_TYPE_GRABBER, IVTV_V4L2_DEC_YUV_OFFSET,

		PCI_DMA_TODEVICE, 0,

		V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,

		V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |

		V4L2_CAP_VIDEO_OUTPUT_OVERLAY,

		&ivtv_v4l2_dec_fops

	}

};