V4L/DVB: Fix color format with tm6010

The values for the fourcc format were correct, but applied to the
wrong register. With this change, video is now barely working again with
tm6000.

While here, let's remove, for now, the memset. This way, people can
have some image when testing this device.

Yet to be fixed: parts of the image frame are missed. As we don't clean
the buffers anymore, this is "recovered" by repeating the values from a
previous frame. The quality is bad, since the image pixels will contain
data from some previous frames, generating weird delay artifacts.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index 860553ff86e..bfbc53bd291 100644
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -156,10 +156,13 @@ int tm6000_get_reg32 (struct tm6000_core *dev, u8 req, u16 value, u16 index)
 void tm6000_set_fourcc_format(struct tm6000_core *dev)
 {
         if (dev->dev_type == TM6010) {
+                int val;
+
+                val = tm6000_get_reg(dev, TM6010_REQ07_RCC_ACTIVE_VIDEO_IF, 0) & 0xfc;
                 if (dev->fourcc == V4L2_PIX_FMT_UYVY)
-                        tm6000_set_reg(dev, TM6010_REQ07_RC1_TRESHOLD, 0xd0);
+                        tm6000_set_reg(dev, TM6010_REQ07_RCC_ACTIVE_VIDEO_IF, val);
                 else
-                        tm6000_set_reg(dev, TM6010_REQ07_RC1_TRESHOLD, 0x90);
+                        tm6000_set_reg(dev, TM6010_REQ07_RCC_ACTIVE_VIDEO_IF, val | 1);
         } else {
                 if (dev->fourcc == V4L2_PIX_FMT_UYVY)
                         tm6000_set_reg(dev, TM6010_REQ07_RC1_TRESHOLD, 0xd0);
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index bed758fe4c3..f694bb8638e 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -151,8 +151,8 @@ static inline void get_next_buf(struct tm6000_dmaqueue *dma_q,
 
         /* Cleans up buffer - Usefull for testing for frame/URB loss */
         outp = videobuf_to_vmalloc(&(*buf)->vb);
-        if (outp)
-                memset(outp, 0, (*buf)->vb.size);
+//      if (outp)
+//              memset(outp, 0, (*buf)->vb.size);
 
         return;
 }