drm/amd/display: remove duplicated argument

[PATCH] drm/amd/display: remove duplicated argument

Posted by José Pekkarinen 2 years, 1 month ago

Spotted by coccicheck, there is a redundant check for
v->SourcePixelFormat[k] != dm_444_16. This patch will
remove it. The corresponding output follows.

drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:5130:86-122: duplicated argument to && or ||

Signed-off-by: José Pekkarinen <jose.pekkarinen@foxhound.fi>
---
 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
index ad741a723c0e..3686f1e7de3a 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
@@ -5128,7 +5128,7 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
 			ViewportExceedsSurface = true;
 
 		if (v->SourcePixelFormat[k] != dm_444_64 && v->SourcePixelFormat[k] != dm_444_32 && v->SourcePixelFormat[k] != dm_444_16
-				&& v->SourcePixelFormat[k] != dm_444_16 && v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) {
+				&& v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) {
 			if (v->ViewportWidthChroma[k] > v->SurfaceWidthC[k] || v->ViewportHeightChroma[k] > v->SurfaceHeightC[k]) {
 				ViewportExceedsSurface = true;
 			}
-- 
2.39.2

Re: [PATCH] drm/amd/display: remove duplicated argument

Posted by Aurabindo Pillai 2 years, 1 month ago


On 2023-10-29 05:39, José Pekkarinen wrote:
> Spotted by coccicheck, there is a redundant check for
> v->SourcePixelFormat[k] != dm_444_16. This patch will
> remove it. The corresponding output follows.
> 
> drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:5130:86-122: duplicated argument to && or ||
> 
> Signed-off-by: José Pekkarinen <jose.pekkarinen@foxhound.fi>
> ---
>   drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> index ad741a723c0e..3686f1e7de3a 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> @@ -5128,7 +5128,7 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
>   			ViewportExceedsSurface = true;
>   
>   		if (v->SourcePixelFormat[k] != dm_444_64 && v->SourcePixelFormat[k] != dm_444_32 && v->SourcePixelFormat[k] != dm_444_16
> -				&& v->SourcePixelFormat[k] != dm_444_16 && v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) {
> +				&& v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) {
>   			if (v->ViewportWidthChroma[k] > v->SurfaceWidthC[k] || v->ViewportHeightChroma[k] > v->SurfaceHeightC[k]) {
>   				ViewportExceedsSurface = true;
>   			}

Hi José,

Sorry, I've just queued it. Should be merged to amd-staging-drm-next soon.

Re: [PATCH] drm/amd/display: remove duplicated argument

Posted by Aurabindo Pillai 2 years, 1 month ago


On 10/29/2023 5:39 AM, José Pekkarinen wrote:
> Spotted by coccicheck, there is a redundant check for
> v->SourcePixelFormat[k] != dm_444_16. This patch will
> remove it. The corresponding output follows.
> 
> drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:5130:86-122: duplicated argument to && or ||
> 
> Signed-off-by: José Pekkarinen <jose.pekkarinen@foxhound.fi>
> ---
>   drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> index ad741a723c0e..3686f1e7de3a 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> @@ -5128,7 +5128,7 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
>   			ViewportExceedsSurface = true;
>   
>   		if (v->SourcePixelFormat[k] != dm_444_64 && v->SourcePixelFormat[k] != dm_444_32 && v->SourcePixelFormat[k] != dm_444_16
> -				&& v->SourcePixelFormat[k] != dm_444_16 && v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) {
> +				&& v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) {
>   			if (v->ViewportWidthChroma[k] > v->SurfaceWidthC[k] || v->ViewportHeightChroma[k] > v->SurfaceHeightC[k]) {
>   				ViewportExceedsSurface = true;
>   			}

Thanks for catching.

Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>

Re: [PATCH] drm/amd/display: remove duplicated argument

Posted by José Pekkarinen 2 years, 1 month ago

On 2023-10-30 15:54, Aurabindo Pillai wrote:
> On 10/29/2023 5:39 AM, José Pekkarinen wrote:
>> Spotted by coccicheck, there is a redundant check for
>> v->SourcePixelFormat[k] != dm_444_16. This patch will
>> remove it. The corresponding output follows.
>> 
>> drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:5130:86-122: 
>> duplicated argument to && or ||
>> 
>> Signed-off-by: José Pekkarinen <jose.pekkarinen@foxhound.fi>
>> ---
>>   drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 
>> +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git 
>> a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c 
>> b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
>> index ad741a723c0e..3686f1e7de3a 100644
>> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
>> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
>> @@ -5128,7 +5128,7 @@ void 
>> dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib 
>> *mode_l
>>   			ViewportExceedsSurface = true;
>>     		if (v->SourcePixelFormat[k] != dm_444_64 && 
>> v->SourcePixelFormat[k] != dm_444_32 && v->SourcePixelFormat[k] != 
>> dm_444_16
>> -				&& v->SourcePixelFormat[k] != dm_444_16 && 
>> v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != 
>> dm_rgbe) {
>> +				&& v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] 
>> != dm_rgbe) {
>>   			if (v->ViewportWidthChroma[k] > v->SurfaceWidthC[k] || 
>> v->ViewportHeightChroma[k] > v->SurfaceHeightC[k]) {
>>   				ViewportExceedsSurface = true;
>>   			}
> 
> Thanks for catching.
> 
> Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>

     Sorry to bring this up, I just wanted to check whether this
has been applied in the following pulls or not.

     Thanks!

     José.

Re: [PATCH] drm/amd/display: remove duplicated argument

Posted by Alex Deucher 2 years, 1 month ago

Applied.  Thanks!

On Wed, Nov 8, 2023 at 3:52 AM José Pekkarinen
<jose.pekkarinen@foxhound.fi> wrote:
>
> On 2023-10-30 15:54, Aurabindo Pillai wrote:
> > On 10/29/2023 5:39 AM, José Pekkarinen wrote:
> >> Spotted by coccicheck, there is a redundant check for
> >> v->SourcePixelFormat[k] != dm_444_16. This patch will
> >> remove it. The corresponding output follows.
> >>
> >> drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:5130:86-122:
> >> duplicated argument to && or ||
> >>
> >> Signed-off-by: José Pekkarinen <jose.pekkarinen@foxhound.fi>
> >> ---
> >>   drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2
> >> +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git
> >> a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> >> b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> >> index ad741a723c0e..3686f1e7de3a 100644
> >> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> >> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> >> @@ -5128,7 +5128,7 @@ void
> >> dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib
> >> *mode_l
> >>                      ViewportExceedsSurface = true;
> >>              if (v->SourcePixelFormat[k] != dm_444_64 &&
> >> v->SourcePixelFormat[k] != dm_444_32 && v->SourcePixelFormat[k] !=
> >> dm_444_16
> >> -                            && v->SourcePixelFormat[k] != dm_444_16 &&
> >> v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] !=
> >> dm_rgbe) {
> >> +                            && v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k]
> >> != dm_rgbe) {
> >>                      if (v->ViewportWidthChroma[k] > v->SurfaceWidthC[k] ||
> >> v->ViewportHeightChroma[k] > v->SurfaceHeightC[k]) {
> >>                              ViewportExceedsSurface = true;
> >>                      }
> >
> > Thanks for catching.
> >
> > Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
>
>      Sorry to bring this up, I just wanted to check whether this
> has been applied in the following pulls or not.
>
>      Thanks!
>
>      José.