]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] media: ti-vpe: vpe: Setup srcdst parameters in start_streaming
authorNikhil Devshatwar <nikhil.nd@ti.com>
Fri, 18 Nov 2016 23:20:26 +0000 (21:20 -0200)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 22 Nov 2016 09:59:59 +0000 (07:59 -0200)
For deinterlacing operation, each operation needs 2 fields in the
history. This is achieved by holding three buffers in
ctx->src_vbs[0,1,2] (f,f-1,f-2)

This is achieved by using the ctx->sequence which gets reset via the
s_fmt ioctl.

These buffers are dequeued in stream OFF by calling free_vbs()
But the corresponding references aren't removed anywhere.

When application tries to stream ON and OFF continuously, s_fmt ioctl
won't be called and it won't setup the srcdst parameters.

Setting source/destination parameters in stream ON ioctl would make
sure that the context is re-initialized before it is being used by
the driver.

Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/ti-vpe/vpe.c

index c79137b404eaeb7e778f6539f76ebf862e012823..1ee7e611e41b0bd9822aef18d9c6a1d8d20a49bb 100644 (file)
@@ -869,6 +869,7 @@ static int set_srcdst_params(struct vpe_ctx *ctx)
        }
 
        free_vbs(ctx);
+       ctx->src_vbs[2] = ctx->src_vbs[1] = ctx->src_vbs[0] = NULL;
 
        ret = realloc_mv_buffers(ctx, mv_buf_size);
        if (ret)
@@ -1990,6 +1991,9 @@ static int vpe_start_streaming(struct vb2_queue *q, unsigned int count)
        if (ctx->deinterlacing)
                config_edi_input_mode(ctx, 0x0);
 
+       if (ctx->sequence != 0)
+               set_srcdst_params(ctx);
+
        return 0;
 }