2019-09-11 08:50:38

by Benjamin GAIGNARD

Subject: [PATCH] drm: fix warnings in DSC

Remove always false comparisons due to limited range of nfl_bpg_offset
and scale_increment_interval fields.
Warnings detected when compiling with W=1.

Signed-off-by: Benjamin Gaignard <[email protected]>
---
drivers/gpu/drm/drm_dsc.c | 11 -----------
1 file changed, 11 deletions(-)

diff --git a/drivers/gpu/drm/drm_dsc.c b/drivers/gpu/drm/drm_dsc.c
index 77f4e5ae4197..27e5c6036658 100644
--- a/drivers/gpu/drm/drm_dsc.c
+++ b/drivers/gpu/drm/drm_dsc.c
@@ -336,12 +336,6 @@ int drm_dsc_compute_rc_parameters(struct drm_dsc_config *vdsc_cfg)
else
vdsc_cfg->nfl_bpg_offset = 0;

- /* 2^16 - 1 */
- if (vdsc_cfg->nfl_bpg_offset > 65535) {
- DRM_DEBUG_KMS("NflBpgOffset is too large for this slice height\n");
- return -ERANGE;
- }
-
/* Number of groups used to code the entire slice */
groups_total = groups_per_line * vdsc_cfg->slice_height;

@@ -371,11 +365,6 @@ int drm_dsc_compute_rc_parameters(struct drm_dsc_config *vdsc_cfg)
vdsc_cfg->scale_increment_interval = 0;
}

- if (vdsc_cfg->scale_increment_interval > 65535) {
- DRM_DEBUG_KMS("ScaleIncrementInterval is large for slice height\n");
- return -ERANGE;
- }
-
/*
* DSC spec mentions that bits_per_pixel specifies the target
* bits/pixel (bpp) rate that is used by the encoder,
--
2.15.0

2019-09-11 13:43:24

by Harry Wentland

Subject: Re: [PATCH] drm: fix warnings in DSC

On 2019-09-11 4:47 a.m., Benjamin Gaignard wrote:
> Remove always false comparisons due to limited range of nfl_bpg_offset
> and scale_increment_interval fields.
> Warnings detected when compiling with W=1.
>
> Signed-off-by: Benjamin Gaignard <[email protected]>

Reviewed-by: Harry Wentland <[email protected]>

Harry

> ---
> drivers/gpu/drm/drm_dsc.c | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_dsc.c b/drivers/gpu/drm/drm_dsc.c
> index 77f4e5ae4197..27e5c6036658 100644
> --- a/drivers/gpu/drm/drm_dsc.c
> +++ b/drivers/gpu/drm/drm_dsc.c
> @@ -336,12 +336,6 @@ int drm_dsc_compute_rc_parameters(struct drm_dsc_config *vdsc_cfg)
> else
> vdsc_cfg->nfl_bpg_offset = 0;
>
> - /* 2^16 - 1 */
> - if (vdsc_cfg->nfl_bpg_offset > 65535) {
> - DRM_DEBUG_KMS("NflBpgOffset is too large for this slice height\n");
> - return -ERANGE;
> - }
> -
> /* Number of groups used to code the entire slice */
> groups_total = groups_per_line * vdsc_cfg->slice_height;
>
> @@ -371,11 +365,6 @@ int drm_dsc_compute_rc_parameters(struct drm_dsc_config *vdsc_cfg)
> vdsc_cfg->scale_increment_interval = 0;
> }
>
> - if (vdsc_cfg->scale_increment_interval > 65535) {
> - DRM_DEBUG_KMS("ScaleIncrementInterval is large for slice height\n");
> - return -ERANGE;
> - }
> -
> /*
> * DSC spec mentions that bits_per_pixel specifies the target
> * bits/pixel (bpp) rate that is used by the encoder,
>

2019-09-16 20:24:14

by Benjamin Gaignard

Subject: Re: [PATCH] drm: fix warnings in DSC

Le mer. 11 sept. 2019 à 15:41, Harry Wentland <[email protected]> a écrit :
>
> On 2019-09-11 4:47 a.m., Benjamin Gaignard wrote:
> > Remove always false comparisons due to limited range of nfl_bpg_offset
> > and scale_increment_interval fields.
> > Warnings detected when compiling with W=1.
> >
> > Signed-off-by: Benjamin Gaignard <[email protected]>
>
> Reviewed-by: Harry Wentland <[email protected]>

Applied on drm-misc-next
Thanks,
Benjamin

>
> Harry
>
> > ---
> > drivers/gpu/drm/drm_dsc.c | 11 -----------
> > 1 file changed, 11 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_dsc.c b/drivers/gpu/drm/drm_dsc.c
> > index 77f4e5ae4197..27e5c6036658 100644
> > --- a/drivers/gpu/drm/drm_dsc.c
> > +++ b/drivers/gpu/drm/drm_dsc.c
> > @@ -336,12 +336,6 @@ int drm_dsc_compute_rc_parameters(struct drm_dsc_config *vdsc_cfg)
> > else
> > vdsc_cfg->nfl_bpg_offset = 0;
> >
> > - /* 2^16 - 1 */
> > - if (vdsc_cfg->nfl_bpg_offset > 65535) {
> > - DRM_DEBUG_KMS("NflBpgOffset is too large for this slice height\n");
> > - return -ERANGE;
> > - }
> > -
> > /* Number of groups used to code the entire slice */
> > groups_total = groups_per_line * vdsc_cfg->slice_height;
> >
> > @@ -371,11 +365,6 @@ int drm_dsc_compute_rc_parameters(struct drm_dsc_config *vdsc_cfg)
> > vdsc_cfg->scale_increment_interval = 0;
> > }
> >
> > - if (vdsc_cfg->scale_increment_interval > 65535) {
> > - DRM_DEBUG_KMS("ScaleIncrementInterval is large for slice height\n");
> > - return -ERANGE;
> > - }
> > -
> > /*
> > * DSC spec mentions that bits_per_pixel specifies the target
> > * bits/pixel (bpp) rate that is used by the encoder,
> >