[PATCH 1/2] vicodec: Drop unneeded symbol dependency

[PATCH 1/2] vicodec: Drop unneeded symbol dependency

[Ezequiel Garcia]

The vicodec doesn't use the Subdev API, so drop the dependency.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
 drivers/media/platform/vicodec/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/vicodec/Kconfig b/drivers/media/platform/vicodec/Kconfig
index 2503bcb1529f..ad13329e3461 100644
--- a/drivers/media/platform/vicodec/Kconfig
+++ b/drivers/media/platform/vicodec/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_VICODEC
 	tristate "Virtual Codec Driver"
-	depends on VIDEO_DEV && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+	depends on VIDEO_DEV && VIDEO_V4L2
 	select VIDEOBUF2_VMALLOC
 	select V4L2_MEM2MEM_DEV
 	default n
-- 
2.19.0.rc2

[PATCH 2/2] vicodec: Drop unused job_abort()

[Ezequiel Garcia]

The vicodec does not use the aborting field. In fact, this driver
can't really cancel any work, since it performs all the work
in device_run().

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
 drivers/media/platform/vicodec/vicodec-core.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
index bbc48fcaa563..8d455c42163e 100644
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -112,8 +112,6 @@ struct vicodec_ctx {
 
 	struct v4l2_ctrl_handler hdl;
 
-	/* Abort requested by m2m */
-	int			aborting;
 	struct vb2_v4l2_buffer *last_src_buf;
 	struct vb2_v4l2_buffer *last_dst_buf;
 
@@ -376,14 +374,6 @@ static int job_ready(void *priv)
 	return 1;
 }
 
-static void job_abort(void *priv)
-{
-	struct vicodec_ctx *ctx = priv;
-
-	/* Will cancel the transaction in the next interrupt handler */
-	ctx->aborting = 1;
-}
-
 /*
  * video ioctls
  */
@@ -1268,7 +1258,6 @@ static const struct video_device vicodec_videodev = {
 
 static const struct v4l2_m2m_ops m2m_ops = {
 	.device_run	= device_run,
-	.job_abort	= job_abort,
 	.job_ready	= job_ready,
 };
 
-- 
2.19.0.rc2

Re: [PATCH 1/2] vicodec: Drop unneeded symbol dependency

[Hans Verkuil]

On 09/10/2018 05:21 PM, Ezequiel Garcia wrote:
> The vicodec doesn't use the Subdev API, so drop the dependency.
> 
> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
> ---
>  drivers/media/platform/vicodec/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/vicodec/Kconfig b/drivers/media/platform/vicodec/Kconfig
> index 2503bcb1529f..ad13329e3461 100644
> --- a/drivers/media/platform/vicodec/Kconfig
> +++ b/drivers/media/platform/vicodec/Kconfig
> @@ -1,6 +1,6 @@
>  config VIDEO_VICODEC
>  	tristate "Virtual Codec Driver"
> -	depends on VIDEO_DEV && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API

But it definitely needs the MEDIA_CONTROLLER. That's what it should depend on.

Regards,

	Hans

> +	depends on VIDEO_DEV && VIDEO_V4L2
>  	select VIDEOBUF2_VMALLOC
>  	select V4L2_MEM2MEM_DEV
>  	default n
> 

Re: [PATCH 1/2] vicodec: Drop unneeded symbol dependency

[Ezequiel Garcia]

On Mon, 2018-09-10 at 17:23 +0200, Hans Verkuil wrote:
> On 09/10/2018 05:21 PM, Ezequiel Garcia wrote:
> > The vicodec doesn't use the Subdev API, so drop the dependency.
> > 
> > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
> > ---
> >  drivers/media/platform/vicodec/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/media/platform/vicodec/Kconfig b/drivers/media/platform/vicodec/Kconfig
> > index 2503bcb1529f..ad13329e3461 100644
> > --- a/drivers/media/platform/vicodec/Kconfig
> > +++ b/drivers/media/platform/vicodec/Kconfig
> > @@ -1,6 +1,6 @@
> >  config VIDEO_VICODEC
> >  	tristate "Virtual Codec Driver"
> > -	depends on VIDEO_DEV && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
> 
> But it definitely needs the MEDIA_CONTROLLER. That's what it should depend on.
> 

Does it really? The code have proper ifdefs.

Re: [PATCH 1/2] vicodec: Drop unneeded symbol dependency

[Hans Verkuil]

On 09/10/2018 05:44 PM, Ezequiel Garcia wrote:
> On Mon, 2018-09-10 at 17:23 +0200, Hans Verkuil wrote:
>> On 09/10/2018 05:21 PM, Ezequiel Garcia wrote:
>>> The vicodec doesn't use the Subdev API, so drop the dependency.
>>>
>>> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
>>> ---
>>>  drivers/media/platform/vicodec/Kconfig | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/media/platform/vicodec/Kconfig b/drivers/media/platform/vicodec/Kconfig
>>> index 2503bcb1529f..ad13329e3461 100644
>>> --- a/drivers/media/platform/vicodec/Kconfig
>>> +++ b/drivers/media/platform/vicodec/Kconfig
>>> @@ -1,6 +1,6 @@
>>>  config VIDEO_VICODEC
>>>  	tristate "Virtual Codec Driver"
>>> -	depends on VIDEO_DEV && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
>>
>> But it definitely needs the MEDIA_CONTROLLER. That's what it should depend on.
>>
> 
> Does it really? The code have proper ifdefs.
> 

You are right, it is not needed now, but will be when stateless codec support
is added to vicodec in the future.

Regards,

	Hans