[PATCH] media: davinci: vpfe: fix build error

[PATCH] media: davinci: vpfe: fix build error

[Prabhakar]

From: Lad, Prabhakar <prabhakar.lad@ti.com>

recent patch with commit id 4f996594ceaf6c3f9bc42b40c40b0f7f87b79c86
which makes vidioc_s_crop const, was causing a following build error.

vpfe_capture.c: In function 'vpfe_s_crop':
vpfe_capture.c:1695: error: assignment of read-only location '*crop'
vpfe_capture.c:1706: warning: passing argument 1 of
'ccdc_dev->hw_ops.set_image_window' discards qualifiers from pointer target type
vpfe_capture.c:1706: note: expected 'struct v4l2_rect *' but argument is of
type 'const struct v4l2_rect *'
make[4]: *** [drivers/media/platform/davinci/vpfe_capture.o] Error 1

Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
---
 drivers/media/platform/davinci/vpfe_capture.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index 48052cb..8be492c 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -1669,6 +1669,7 @@ static int vpfe_s_crop(struct file *file, void *priv,
 			     const struct v4l2_crop *crop)
 {
 	struct vpfe_device *vpfe_dev = video_drvdata(file);
+	struct v4l2_rect rect = crop->c;
 	int ret = 0;
 
 	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_s_crop\n");
@@ -1684,7 +1685,7 @@ static int vpfe_s_crop(struct file *file, void *priv,
 	if (ret)
 		return ret;
 
-	if (crop->c.top < 0 || crop->c.left < 0) {
+	if (rect.top < 0 || rect.left < 0) {
 		v4l2_err(&vpfe_dev->v4l2_dev,
 			"doesn't support negative values for top & left\n");
 		ret = -EINVAL;
@@ -1692,26 +1693,26 @@ static int vpfe_s_crop(struct file *file, void *priv,
 	}
 
 	/* adjust the width to 16 pixel boundary */
-	crop->c.width = ((crop->c.width + 15) & ~0xf);
+	rect.width = ((rect.width + 15) & ~0xf);
 
 	/* make sure parameters are valid */
-	if ((crop->c.left + crop->c.width >
+	if ((rect.left + rect.width >
 		vpfe_dev->std_info.active_pixels) ||
-	    (crop->c.top + crop->c.height >
+	    (rect.top + rect.height >
 		vpfe_dev->std_info.active_lines)) {
 		v4l2_err(&vpfe_dev->v4l2_dev, "Error in S_CROP params\n");
 		ret = -EINVAL;
 		goto unlock_out;
 	}
-	ccdc_dev->hw_ops.set_image_window(&crop->c);
-	vpfe_dev->fmt.fmt.pix.width = crop->c.width;
-	vpfe_dev->fmt.fmt.pix.height = crop->c.height;
+	ccdc_dev->hw_ops.set_image_window(&rect);
+	vpfe_dev->fmt.fmt.pix.width = rect.width;
+	vpfe_dev->fmt.fmt.pix.height = rect.height;
 	vpfe_dev->fmt.fmt.pix.bytesperline =
 		ccdc_dev->hw_ops.get_line_length();
 	vpfe_dev->fmt.fmt.pix.sizeimage =
 		vpfe_dev->fmt.fmt.pix.bytesperline *
 		vpfe_dev->fmt.fmt.pix.height;
-	vpfe_dev->crop = crop->c;
+	vpfe_dev->crop = rect;
 unlock_out:
 	mutex_unlock(&vpfe_dev->lock);
 	return ret;
-- 
1.7.4.1

Re: [PATCH] media: davinci: vpfe: fix build error

[Hans Verkuil]

On Mon October 1 2012 14:52:48 Prabhakar wrote:
> From: Lad, Prabhakar <prabhakar.lad@ti.com>
> 
> recent patch with commit id 4f996594ceaf6c3f9bc42b40c40b0f7f87b79c86
> which makes vidioc_s_crop const, was causing a following build error.
> 
> vpfe_capture.c: In function 'vpfe_s_crop':
> vpfe_capture.c:1695: error: assignment of read-only location '*crop'
> vpfe_capture.c:1706: warning: passing argument 1 of
> 'ccdc_dev->hw_ops.set_image_window' discards qualifiers from pointer target type
> vpfe_capture.c:1706: note: expected 'struct v4l2_rect *' but argument is of
> type 'const struct v4l2_rect *'
> make[4]: *** [drivers/media/platform/davinci/vpfe_capture.o] Error 1

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>

> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
> Cc: Hans Verkuil <hans.verkuil@cisco.com>
> ---
>  drivers/media/platform/davinci/vpfe_capture.c |   17 +++++++++--------
>  1 files changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
> index 48052cb..8be492c 100644
> --- a/drivers/media/platform/davinci/vpfe_capture.c
> +++ b/drivers/media/platform/davinci/vpfe_capture.c
> @@ -1669,6 +1669,7 @@ static int vpfe_s_crop(struct file *file, void *priv,
>  			     const struct v4l2_crop *crop)
>  {
>  	struct vpfe_device *vpfe_dev = video_drvdata(file);
> +	struct v4l2_rect rect = crop->c;
>  	int ret = 0;
>  
>  	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_s_crop\n");
> @@ -1684,7 +1685,7 @@ static int vpfe_s_crop(struct file *file, void *priv,
>  	if (ret)
>  		return ret;
>  
> -	if (crop->c.top < 0 || crop->c.left < 0) {
> +	if (rect.top < 0 || rect.left < 0) {
>  		v4l2_err(&vpfe_dev->v4l2_dev,
>  			"doesn't support negative values for top & left\n");
>  		ret = -EINVAL;
> @@ -1692,26 +1693,26 @@ static int vpfe_s_crop(struct file *file, void *priv,
>  	}
>  
>  	/* adjust the width to 16 pixel boundary */
> -	crop->c.width = ((crop->c.width + 15) & ~0xf);
> +	rect.width = ((rect.width + 15) & ~0xf);
>  
>  	/* make sure parameters are valid */
> -	if ((crop->c.left + crop->c.width >
> +	if ((rect.left + rect.width >
>  		vpfe_dev->std_info.active_pixels) ||
> -	    (crop->c.top + crop->c.height >
> +	    (rect.top + rect.height >
>  		vpfe_dev->std_info.active_lines)) {
>  		v4l2_err(&vpfe_dev->v4l2_dev, "Error in S_CROP params\n");
>  		ret = -EINVAL;
>  		goto unlock_out;
>  	}
> -	ccdc_dev->hw_ops.set_image_window(&crop->c);
> -	vpfe_dev->fmt.fmt.pix.width = crop->c.width;
> -	vpfe_dev->fmt.fmt.pix.height = crop->c.height;
> +	ccdc_dev->hw_ops.set_image_window(&rect);
> +	vpfe_dev->fmt.fmt.pix.width = rect.width;
> +	vpfe_dev->fmt.fmt.pix.height = rect.height;
>  	vpfe_dev->fmt.fmt.pix.bytesperline =
>  		ccdc_dev->hw_ops.get_line_length();
>  	vpfe_dev->fmt.fmt.pix.sizeimage =
>  		vpfe_dev->fmt.fmt.pix.bytesperline *
>  		vpfe_dev->fmt.fmt.pix.height;
> -	vpfe_dev->crop = crop->c;
> +	vpfe_dev->crop = rect;
>  unlock_out:
>  	mutex_unlock(&vpfe_dev->lock);
>  	return ret;
> 

Re: [PATCH] media: davinci_vpfe: fix build error

[Prabhakar Lad]

Hi Hans,

On Tue, Dec 17, 2013 at 8:55 PM, Lad, Prabhakar
<prabhakar.csengg@gmail.com> wrote:
> From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
>
> This patch includes linux/delay.h required for msleep,
> which fixes following build error.
>
> dm365_isif.c: In function ‘isif_enable’:
> dm365_isif.c:129:2: error: implicit declaration of function ‘msleep’
>
Will you pick this patch or shall I go ahead and  issue a pull to Mauro ?

Regards,
--Prabhakar Lad

Re: [PATCH] media: davinci_vpfe: fix build error

[Hans Verkuil]

I just made a patch myself that I added to the pull request I just posted.

You didn't CC me or CC the linux-media list when you posted your patch, so I
never saw it.

Regards,

	Hans

On 12/20/2013 01:47 PM, Prabhakar Lad wrote:
> Hi Hans,
> 
> On Tue, Dec 17, 2013 at 8:55 PM, Lad, Prabhakar
> <prabhakar.csengg@gmail.com> wrote:
>> From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
>>
>> This patch includes linux/delay.h required for msleep,
>> which fixes following build error.
>>
>> dm365_isif.c: In function ‘isif_enable’:
>> dm365_isif.c:129:2: error: implicit declaration of function ‘msleep’
>>
> Will you pick this patch or shall I go ahead and  issue a pull to Mauro ?
> 
> Regards,
> --Prabhakar Lad
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] media: davinci_vpfe: fix build error

[Prabhakar Lad]

Hi Hans,

On Fri, Dec 20, 2013 at 6:23 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
> I just made a patch myself that I added to the pull request I just posted.
>
> You didn't CC me or CC the linux-media list when you posted your patch, so I
> never saw it.
>
I dont know why this patch didnt make up in linux-media but its
present DLOS [1].
I posted it the same day when you pinged me about this issue. Anyway your patch
too didnt reach me and I also cannot find it in the ML. May be you
directly issued the pull ?

[1] https://patchwork.kernel.org/patch/3362211/

Regards,
--Prabhakar Lad

Re: [PATCH] media: davinci_vpfe: fix build error

[Hans Verkuil]

Hi Prabhakar,

On 12/20/2013 02:02 PM, Prabhakar Lad wrote:
> Hi Hans,
> 
> On Fri, Dec 20, 2013 at 6:23 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
>> I just made a patch myself that I added to the pull request I just posted.
>>
>> You didn't CC me or CC the linux-media list when you posted your patch, so I
>> never saw it.
>>
> I dont know why this patch didnt make up in linux-media but its
> present DLOS [1].

If it's not mailed to linux-media, then it doesn't end up in linux-media patchwork,
and then I won't see it when I process pending patches.

While I am subscribed to DLOS I do not actually read it unless I know there is
something that I need to pay attention to.

> I posted it the same day when you pinged me about this issue.

I was a bit surprised that I didn't see a patch for this, you are very prompt
normally :-)

> Anyway your patch
> too didnt reach me and I also cannot find it in the ML. May be you
> directly issued the pull ?

I directly issued the pull. It was such a trivial change. 

Regards,

	Hans

> 
> [1] https://patchwork.kernel.org/patch/3362211/
> 
> Regards,
> --Prabhakar Lad
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] media: davinci_vpfe: fix build error

[Prabhakar Lad]

Hi Hans,

On Fri, Dec 20, 2013 at 7:00 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
> Hi Prabhakar,
>
> On 12/20/2013 02:02 PM, Prabhakar Lad wrote:
>> Hi Hans,
>>
>> On Fri, Dec 20, 2013 at 6:23 PM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
>>> I just made a patch myself that I added to the pull request I just posted.
>>>
>>> You didn't CC me or CC the linux-media list when you posted your patch, so I
>>> never saw it.
>>>
>> I dont know why this patch didnt make up in linux-media but its
>> present DLOS [1].
>
> If it's not mailed to linux-media, then it doesn't end up in linux-media patchwork,
> and then I won't see it when I process pending patches.
>
> While I am subscribed to DLOS I do not actually read it unless I know there is
> something that I need to pay attention to.
>
This didnt land into linux-media becuase may be I sent it throught TI's network
I usually send it via my home network.

>> I posted it the same day when you pinged me about this issue.
>
> I was a bit surprised that I didn't see a patch for this, you are very prompt
> normally :-)
>
 :)
>> Anyway your patch
>> too didnt reach me and I also cannot find it in the ML. May be you
>> directly issued the pull ?
>
> I directly issued the pull. It was such a trivial change.
>
No problem as long as its fixed :)

Thanks,
--Prabhakar Lad