2019-08-05 17:33:56

by Hariprasad Kelam

[permalink] [raw]
Subject: [PATCH] gpu: drm: amd: display: dc: dcn20: Remove redudant condition

Remove redudant codition "dsc_cfg->dc_dsc_cfg.num_slices_v".

fixes coverity defect 1451853

Signed-off-by: Hariprasad Kelam <[email protected]>
---
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
index e870caa..42133bd 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
@@ -302,7 +302,7 @@ static bool dsc_prepare_config(struct display_stream_compressor *dsc, const stru
dsc_cfg->dc_dsc_cfg.linebuf_depth == 0)));
ASSERT(96 <= dsc_cfg->dc_dsc_cfg.bits_per_pixel && dsc_cfg->dc_dsc_cfg.bits_per_pixel <= 0x3ff); // 6.0 <= bits_per_pixel <= 63.9375

- if (!dsc_cfg->dc_dsc_cfg.num_slices_v || !dsc_cfg->dc_dsc_cfg.num_slices_v ||
+ if (!dsc_cfg->dc_dsc_cfg.num_slices_v ||
!(dsc_cfg->dc_dsc_cfg.version_minor == 1 || dsc_cfg->dc_dsc_cfg.version_minor == 2) ||
!dsc_cfg->pic_width || !dsc_cfg->pic_height ||
!((dsc_cfg->dc_dsc_cfg.version_minor == 1 && // v1.1 line buffer depth range:
--
2.7.4


2019-08-06 14:07:51

by Alex Deucher

[permalink] [raw]
Subject: Re: [PATCH] gpu: drm: amd: display: dc: dcn20: Remove redudant condition

On Mon, Aug 5, 2019 at 3:01 PM Hariprasad Kelam
<[email protected]> wrote:
>
> Remove redudant codition "dsc_cfg->dc_dsc_cfg.num_slices_v".
>
> fixes coverity defect 1451853
>
> Signed-off-by: Hariprasad Kelam <[email protected]>
> ---
> drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
> index e870caa..42133bd 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
> @@ -302,7 +302,7 @@ static bool dsc_prepare_config(struct display_stream_compressor *dsc, const stru
> dsc_cfg->dc_dsc_cfg.linebuf_depth == 0)));
> ASSERT(96 <= dsc_cfg->dc_dsc_cfg.bits_per_pixel && dsc_cfg->dc_dsc_cfg.bits_per_pixel <= 0x3ff); // 6.0 <= bits_per_pixel <= 63.9375
>
> - if (!dsc_cfg->dc_dsc_cfg.num_slices_v || !dsc_cfg->dc_dsc_cfg.num_slices_v ||
> + if (!dsc_cfg->dc_dsc_cfg.num_slices_v ||

Harry, can you or Nick check if this should be something else? maybe
a copy paste typo.

Alex

> !(dsc_cfg->dc_dsc_cfg.version_minor == 1 || dsc_cfg->dc_dsc_cfg.version_minor == 2) ||
> !dsc_cfg->pic_width || !dsc_cfg->pic_height ||
> !((dsc_cfg->dc_dsc_cfg.version_minor == 1 && // v1.1 line buffer depth range:
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

2019-08-06 17:50:17

by Harry Wentland

[permalink] [raw]
Subject: [PATCH] drm/amd/display: Add number of slices per line to DSC parameter validation

From: Nikola Cornij <[email protected]>

[why]
Number of slices per line was mistakenly left out

Cc: Hariprasad Kelam <[email protected]>
Signed-off-by: Nikola Cornij <[email protected]>
Signed-off-by: Harry Wentland <[email protected]>
Reviewed-by: Harry Wentland <[email protected]>
---

Thanks, Hariprasad, for your patch. The second condition should actually check
for num_slices_h.

Harry

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
index e870caa8d4fa..adb69c038efb 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
@@ -302,7 +302,7 @@ static bool dsc_prepare_config(struct display_stream_compressor *dsc, const stru
dsc_cfg->dc_dsc_cfg.linebuf_depth == 0)));
ASSERT(96 <= dsc_cfg->dc_dsc_cfg.bits_per_pixel && dsc_cfg->dc_dsc_cfg.bits_per_pixel <= 0x3ff); // 6.0 <= bits_per_pixel <= 63.9375

- if (!dsc_cfg->dc_dsc_cfg.num_slices_v || !dsc_cfg->dc_dsc_cfg.num_slices_v ||
+ if (!dsc_cfg->dc_dsc_cfg.num_slices_v || !dsc_cfg->dc_dsc_cfg.num_slices_h ||
!(dsc_cfg->dc_dsc_cfg.version_minor == 1 || dsc_cfg->dc_dsc_cfg.version_minor == 2) ||
!dsc_cfg->pic_width || !dsc_cfg->pic_height ||
!((dsc_cfg->dc_dsc_cfg.version_minor == 1 && // v1.1 line buffer depth range:
--
2.22.0

2019-08-06 19:05:55

by Alex Deucher

[permalink] [raw]
Subject: Re: [PATCH] drm/amd/display: Add number of slices per line to DSC parameter validation

On Tue, Aug 6, 2019 at 1:45 PM Harry Wentland <[email protected]> wrote:
>
> From: Nikola Cornij <[email protected]>
>
> [why]
> Number of slices per line was mistakenly left out
>
> Cc: Hariprasad Kelam <[email protected]>
> Signed-off-by: Nikola Cornij <[email protected]>
> Signed-off-by: Harry Wentland <[email protected]>
> Reviewed-by: Harry Wentland <[email protected]>

Acked-by: Alex Deucher <[email protected]>

> ---
>
> Thanks, Hariprasad, for your patch. The second condition should actually check
> for num_slices_h.
>
> Harry
>
> drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
> index e870caa8d4fa..adb69c038efb 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c
> @@ -302,7 +302,7 @@ static bool dsc_prepare_config(struct display_stream_compressor *dsc, const stru
> dsc_cfg->dc_dsc_cfg.linebuf_depth == 0)));
> ASSERT(96 <= dsc_cfg->dc_dsc_cfg.bits_per_pixel && dsc_cfg->dc_dsc_cfg.bits_per_pixel <= 0x3ff); // 6.0 <= bits_per_pixel <= 63.9375
>
> - if (!dsc_cfg->dc_dsc_cfg.num_slices_v || !dsc_cfg->dc_dsc_cfg.num_slices_v ||
> + if (!dsc_cfg->dc_dsc_cfg.num_slices_v || !dsc_cfg->dc_dsc_cfg.num_slices_h ||
> !(dsc_cfg->dc_dsc_cfg.version_minor == 1 || dsc_cfg->dc_dsc_cfg.version_minor == 2) ||
> !dsc_cfg->pic_width || !dsc_cfg->pic_height ||
> !((dsc_cfg->dc_dsc_cfg.version_minor == 1 && // v1.1 line buffer depth range:
> --
> 2.22.0
>
> _______________________________________________
> amd-gfx mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx