Patchwork drm/exynos: use logical AND in exynos_drm_plane_check_size()

login
register
mail settings
Submitter Tobias Jakobi
Date May 25, 2016, 12:30 p.m.
Message ID <1464179407-9004-1-git-send-email-tjakobi@math.uni-bielefeld.de>
Download mbox | patch
Permalink /patch/9135253/
State New
Headers show

Comments

Tobias Jakobi - May 25, 2016, 12:30 p.m.
The current bitwise AND should result in the same assembler
but this is what the code is actually supposed to do.

Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
---
 drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Tobias Jakobi - June 10, 2016, 10:12 a.m.
Ping!

- Tobias

Tobias Jakobi wrote:
> The current bitwise AND should result in the same assembler
> but this is what the code is actually supposed to do.
> 
> Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
> ---
>  drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> index b3f3c2c..e4a1a63 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> @@ -226,7 +226,7 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
>  	    state->v_ratio == (1 << 15))
>  		height_ok = true;
>  
> -	if (width_ok & height_ok)
> +	if (width_ok && height_ok)
>  		return 0;
>  
>  	DRM_DEBUG_KMS("scaling mode is not supported");
>
Eric Engestrom - June 10, 2016, 10:54 a.m.
On Wed, May 25, 2016 at 02:30:07PM +0200, Tobias Jakobi wrote:
> The current bitwise AND should result in the same assembler
> but this is what the code is actually supposed to do.
> 
> Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>

Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

> ---
>  drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> index b3f3c2c..e4a1a63 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> @@ -226,7 +226,7 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
>  	    state->v_ratio == (1 << 15))
>  		height_ok = true;
>  
> -	if (width_ok & height_ok)
> +	if (width_ok && height_ok)
>  		return 0;
>  
>  	DRM_DEBUG_KMS("scaling mode is not supported");
> -- 
> 2.7.3
Daniel Vetter - June 10, 2016, 2:11 p.m.
On Fri, Jun 10, 2016 at 11:54:50AM +0100, Eric Engestrom wrote:
> On Wed, May 25, 2016 at 02:30:07PM +0200, Tobias Jakobi wrote:
> > The current bitwise AND should result in the same assembler
> > but this is what the code is actually supposed to do.
> > 
> > Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
> 
> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

Applied to drm-misc, thanks.
-Daniel

> 
> > ---
> >  drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> > index b3f3c2c..e4a1a63 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> > @@ -226,7 +226,7 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
> >  	    state->v_ratio == (1 << 15))
> >  		height_ok = true;
> >  
> > -	if (width_ok & height_ok)
> > +	if (width_ok && height_ok)
> >  		return 0;
> >  
> >  	DRM_DEBUG_KMS("scaling mode is not supported");
> > -- 
> > 2.7.3
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Inki Dae - June 13, 2016, 1:34 a.m.
Picked it up.

Thanks,
Inki Dae

2016년 06월 10일 19:12에 Tobias Jakobi 이(가) 쓴 글:
> Ping!
> 
> - Tobias
> 
> Tobias Jakobi wrote:
>> The current bitwise AND should result in the same assembler
>> but this is what the code is actually supposed to do.
>>
>> Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
>> ---
>>  drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
>> index b3f3c2c..e4a1a63 100644
>> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
>> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
>> @@ -226,7 +226,7 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
>>  	    state->v_ratio == (1 << 15))
>>  		height_ok = true;
>>  
>> -	if (width_ok & height_ok)
>> +	if (width_ok && height_ok)
>>  		return 0;
>>  
>>  	DRM_DEBUG_KMS("scaling mode is not supported");
>>
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 
>
Daniel Vetter - June 13, 2016, 6:34 a.m.
On Mon, Jun 13, 2016 at 3:34 AM, Inki Dae <inki.dae@samsung.com> wrote:
> Picked it up.

Fyi it's already in drm-misc too.
-Daniel

>
> Thanks,
> Inki Dae
>
> 2016년 06월 10일 19:12에 Tobias Jakobi 이(가) 쓴 글:
>> Ping!
>>
>> - Tobias
>>
>> Tobias Jakobi wrote:
>>> The current bitwise AND should result in the same assembler
>>> but this is what the code is actually supposed to do.
>>>
>>> Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
>>> ---
>>>  drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
>>> index b3f3c2c..e4a1a63 100644
>>> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
>>> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
>>> @@ -226,7 +226,7 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
>>>          state->v_ratio == (1 << 15))
>>>              height_ok = true;
>>>
>>> -    if (width_ok & height_ok)
>>> +    if (width_ok && height_ok)
>>>              return 0;
>>>
>>>      DRM_DEBUG_KMS("scaling mode is not supported");
>>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
>>
>>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index b3f3c2c..e4a1a63 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -226,7 +226,7 @@  exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
 	    state->v_ratio == (1 << 15))
 		height_ok = true;
 
-	if (width_ok & height_ok)
+	if (width_ok && height_ok)
 		return 0;
 
 	DRM_DEBUG_KMS("scaling mode is not supported");