2018-12-29 15:32:42

by Yue Haibing

Subject: [PATCH -next] media: staging/intel-ipu3: Fix err handle of ipu3_css_find_binary

'bindex' is unsigned, it never less than zero.
This patch bring int 'binary' back to handle the err condition.

Fixes: 51abe041c5ed ("media: staging/intel-ipu3: Add dual pipe support")
Signed-off-by: YueHaibing <[email protected]>
---
drivers/staging/media/ipu3/ipu3-css.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/ipu3/ipu3-css.c b/drivers/staging/media/ipu3/ipu3-css.c
index 44c5563..28f0c02 100644
--- a/drivers/staging/media/ipu3/ipu3-css.c
+++ b/drivers/staging/media/ipu3/ipu3-css.c
@@ -1751,7 +1751,7 @@ int ipu3_css_fmt_try(struct ipu3_css *css,
&q[IPU3_CSS_QUEUE_OUT].fmt.mpix;
struct v4l2_pix_format_mplane *const vf =
&q[IPU3_CSS_QUEUE_VF].fmt.mpix;
- int i, s;
+ int i, s, binary;

/* Adjust all formats, get statistics buffer sizes and formats */
for (i = 0; i < IPU3_CSS_QUEUES; i++) {
@@ -1826,13 +1826,13 @@ int ipu3_css_fmt_try(struct ipu3_css *css,
s = (bds->height - gdc->height) / 2 - FILTER_SIZE;
env->height = s < MIN_ENVELOPE ? MIN_ENVELOPE : s;

- css->pipes[pipe].bindex =
- ipu3_css_find_binary(css, pipe, q, r);
- if (css->pipes[pipe].bindex < 0) {
+ binary = ipu3_css_find_binary(css, pipe, q, r);
+ if (binary < 0) {
dev_err(css->dev, "failed to find suitable binary\n");
return -EINVAL;
}

+ css->pipes[pipe].bindex = binary;
dev_dbg(css->dev, "Binary index %d for pipe %d found.",
css->pipes[pipe].bindex, pipe);

--
2.7.0

2019-01-07 02:45:21

by Bingbu Cao

Subject: Re: [PATCH -next] media: staging/intel-ipu3: Fix err handle of ipu3_css_find_binary

Hi, Haibing

Thanks for your patch, it looks fine for me.
Reviewed-by: Bingbu Cao <[email protected]>

On 12/29/2018 10:45 AM, YueHaibing wrote:
> css->pipes[pipe].bindex = binary;

2019-01-07 11:02:19

by Sakari Ailus

Subject: Re: [PATCH -next] media: staging/intel-ipu3: Fix err handle of ipu3_css_find_binary

Hi Bingbu,

On Mon, Jan 07, 2019 at 10:38:19AM +0800, Bingbu Cao wrote:
> Hi, Haibing
>
> Thanks for your patch, it looks fine for me.
> Reviewed-by: Bingbu Cao <[email protected]>
>
> On 12/29/2018 10:45 AM, YueHaibing wrote:
> > css->pipes[pipe].bindex = binary;

I'm taking Colin's patch with equivalent content; it was there first.

Thanks!

--
Sakari Ailus
[email protected]

2019-01-08 04:06:21

by Bingbu Cao

Subject: Re: [PATCH -next] media: staging/intel-ipu3: Fix err handle of ipu3_css_find_binary

On 01/07/2019 07:00 PM, Sakari Ailus wrote:
> Hi Bingbu,
>
> On Mon, Jan 07, 2019 at 10:38:19AM +0800, Bingbu Cao wrote:
>> Hi, Haibing
>>
>> Thanks for your patch, it looks fine for me.
>> Reviewed-by: Bingbu Cao <[email protected]>
>>
>> On 12/29/2018 10:45 AM, YueHaibing wrote:
>>> css->pipes[pipe].bindex = binary;
> I'm taking Colin's patch with equivalent content; it was there first.
Sakari, good to know that, thanks!
>
> Thanks!
>