5 files changed, 49 insertions, 15 deletions

diff --git a/drivers/media/video/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c
index b59475bfc243..b588e30cbcf0 100644
--- a/drivers/media/video/ivtv/ivtv-controls.c
+++ b/drivers/media/video/ivtv/ivtv-controls.c
@@ -267,13 +267,13 @@ int ivtv_s_ext_ctrls(struct file *file, void *fh, struct v4l2_ext_controls *c)
                 if (p.video_encoding != itv->params.video_encoding) {
                         int is_mpeg1 = p.video_encoding ==
                                 V4L2_MPEG_VIDEO_ENCODING_MPEG_1;
-                        struct v4l2_format fmt;
+                        struct v4l2_mbus_framefmt fmt;
 
                         /* fix videodecoder resolution */
-                        fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                        fmt.fmt.pix.width = itv->params.width / (is_mpeg1 ? 2 : 1);
-                        fmt.fmt.pix.height = itv->params.height;
-                        v4l2_subdev_call(itv->sd_video, video, s_fmt, &fmt);
+                        fmt.width = itv->params.width / (is_mpeg1 ? 2 : 1);
+                        fmt.height = itv->params.height;
+                        fmt.code = V4L2_MBUS_FMT_FIXED;
+                        v4l2_subdev_call(itv->sd_video, video, s_mbus_fmt, &fmt);
                 }
                 err = cx2341x_update(itv, ivtv_api_func, &itv->params, &p);
                 if (!err && itv->params.stream_vbi_fmt != p.stream_vbi_fmt)
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index abf410943cc9..3c2cc270ccd5 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -823,6 +823,12 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
 
         IVTV_DEBUG_FILE("close() of %s\n", s->name);
 
+        if (id->type == IVTV_DEC_STREAM_TYPE_YUV &&
+                test_bit(IVTV_F_I_DECODING_YUV, &itv->i_flags)) {
+                /* Restore registers we've changed & clean up any mess */
+                ivtv_yuv_close(itv);
+        }
+
         /* Stop decoding */
         if (test_bit(IVTV_F_S_STREAMING, &s->s_flags)) {
                 IVTV_DEBUG_INFO("close stopping decode\n");
@@ -832,10 +838,7 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts)
         }
         clear_bit(IVTV_F_S_APPL_IO, &s->s_flags);
         clear_bit(IVTV_F_S_STREAMOFF, &s->s_flags);
-        if (id->type == IVTV_DEC_STREAM_TYPE_YUV && test_bit(IVTV_F_I_DECODING_YUV, &itv->i_flags)) {
-                /* Restore registers we've changed & clean up any mess we've made */
-                ivtv_yuv_close(itv);
-        }
+
         if (itv->output_mode == OUT_UDMA_YUV && id->yuv_frames)
                 itv->output_mode = OUT_NONE;
 
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index fa9f0d958f96..11ac2fa33ef7 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -569,6 +569,7 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
         struct ivtv_open_id *id = fh;
         struct ivtv *itv = id->itv;
         struct cx2341x_mpeg_params *p = &itv->params;
+        struct v4l2_mbus_framefmt mbus_fmt;
         int ret = ivtv_try_fmt_vid_cap(file, fh, fmt);
         int w = fmt->fmt.pix.width;
         int h = fmt->fmt.pix.height;
@@ -586,7 +587,10 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
         p->height = h;
         if (p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1)
                 fmt->fmt.pix.width /= 2;
-        v4l2_subdev_call(itv->sd_video, video, s_fmt, fmt);
+        mbus_fmt.width = fmt->fmt.pix.width;
+        mbus_fmt.height = h;
+        mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
+        v4l2_subdev_call(itv->sd_video, video, s_mbus_fmt, &mbus_fmt);
         return ivtv_g_fmt_vid_cap(file, fh, fmt);
 }
 
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index de4288cc1889..9ecacab4b89b 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -618,12 +618,17 @@ static int ivtv_setup_v4l2_decode_stream(struct ivtv_stream *s)
         struct ivtv *itv = s->itv;
         struct cx2341x_mpeg_params *p = &itv->params;
         int datatype;
+        u16 width;
+        u16 height;
 
         if (s->vdev == NULL)
                 return -EINVAL;
 
         IVTV_DEBUG_INFO("Setting some initial decoder settings\n");
 
+        width = p->width;
+        height = p->height;
+
         /* set audio mode to left/stereo  for dual/stereo mode. */
         ivtv_vapi(itv, CX2341X_DEC_SET_AUDIO_MODE, 2, itv->audio_bilingual_mode, itv->audio_stereo_mode);
 
@@ -646,7 +651,14 @@ static int ivtv_setup_v4l2_decode_stream(struct ivtv_stream *s)
            2 = yuv_from_host */
         switch (s->type) {
         case IVTV_DEC_STREAM_TYPE_YUV:
-                datatype = itv->output_mode == OUT_PASSTHROUGH ? 1 : 2;
+                if (itv->output_mode == OUT_PASSTHROUGH) {
+                        datatype = 1;
+                } else {
+                        /* Fake size to avoid switching video standard */
+                        datatype = 2;
+                        width = 720;
+                        height = itv->is_out_50hz ? 576 : 480;
+                }
                 IVTV_DEBUG_INFO("Setup DEC YUV Stream data[0] = %d\n", datatype);
                 break;
         case IVTV_DEC_STREAM_TYPE_MPG:
@@ -655,9 +667,13 @@ static int ivtv_setup_v4l2_decode_stream(struct ivtv_stream *s)
                 break;
         }
         if (ivtv_vapi(itv, CX2341X_DEC_SET_DECODER_SOURCE, 4, datatype,
-                        p->width, p->height, p->audio_properties)) {
+                        width, height, p->audio_properties)) {
                 IVTV_DEBUG_WARN("Couldn't initialize decoder source\n");
         }
+
+        /* Decoder sometimes dies here, so wait a moment */
+        ivtv_msleep_timeout(10, 0);
+
         return 0;
 }
 
@@ -697,6 +713,9 @@ int ivtv_start_v4l2_decode_stream(struct ivtv_stream *s, int gop_offset)
         /* start playback */
         ivtv_vapi(itv, CX2341X_DEC_START_PLAYBACK, 2, gop_offset, 0);
 
+        /* Let things settle before we actually start */
+        ivtv_msleep_timeout(10, 0);
+
         /* Clear the following Interrupt mask bits for decoding */
         ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_DECODE);
         IVTV_DEBUG_IRQ("IRQ Mask is now: 0x%08x\n", itv->irqmask);
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index 49e1a283ed36..9ff3425891ed 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -1066,7 +1066,11 @@ static int ivtvfb_init_io(struct ivtv *itv)
         }
         mutex_unlock(&itv->serialize_lock);
 
-        ivtvfb_get_framebuffer(itv, &oi->video_rbase, &oi->video_buffer_size);
+        if (ivtvfb_get_framebuffer(itv, &oi->video_rbase,
+                                        &oi->video_buffer_size) < 0) {
+                IVTVFB_ERR("Firmware failed to respond\n");
+                return -EIO;
+        }
 
         /* The osd buffer size depends on the number of video buffers allocated
            on the PVR350 itself. For now we'll hardcode the smallest osd buffer
@@ -1158,8 +1162,11 @@ static int ivtvfb_init_card(struct ivtv *itv)
         }
 
         /* Find & setup the OSD buffer */
-        if ((rc = ivtvfb_init_io(itv)))
+        rc = ivtvfb_init_io(itv);
+        if (rc) {
+                ivtvfb_release_buffers(itv);
                 return rc;
+        }
 
         /* Set the startup video mode information */
         if ((rc = ivtvfb_init_vidmode(itv))) {
@@ -1210,6 +1217,7 @@ static int ivtvfb_callback_cleanup(struct device *dev, void *p)
 {
         struct v4l2_device *v4l2_dev = dev_get_drvdata(dev);
         struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev);
+        struct osd_info *oi = itv->osd_info;
 
         if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {
                 if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) {
@@ -1218,7 +1226,7 @@ static int ivtvfb_callback_cleanup(struct device *dev, void *p)
                         return 0;
                 }
                 IVTVFB_INFO("Unregister framebuffer %d\n", itv->instance);
-                ivtvfb_blank(FB_BLANK_POWERDOWN, &itv->osd_info->ivtvfb_info);
+                ivtvfb_blank(FB_BLANK_VSYNC_SUSPEND, &oi->ivtvfb_info);
                 ivtvfb_release_buffers(itv);
                 itv->osd_video_pbase = 0;
         }