[Intel-gfx] [PATCH] drm/i915: Fix bad comparison in skl_compute_plane_wm.

Mahesh Kumar mahesh1.kumar at intel.com
Mon Jul 17 12:06:55 UTC 2017


Reviewed-by: Mahesh Kumar <mahesh1.kumar at intel.com>


On Monday 17 July 2017 04:43 PM, Maarten Lankhorst wrote:
> ddb_allocation && ddb_allocation / blocks_per_line >= 1 is the same
> as ddb_allocation >= blocks_per_line, so use the latter to simplify
> this.
>
> This fixes the following compiler warning:
>
> drivers/gpu/drm/i915/intel_pm.c:4467]: (warning) Comparison of a
> boolean expression with an integer other than 0 or 1.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Fixes: d555cb5827d6 ("drm/i915/skl+: use linetime latency if ddb size is not available")
> Cc: "Mahesh Kumar" <mahesh1.kumar at intel.com>
> Reported-by: David Binderman <dcb314 at hotmail.com>
> Cc: David Binderman <dcb314 at hotmail.com>
> Cc: <drm-intel-fixes at lists.freedesktop.org> # v4.13-rc1+
> ---
>   drivers/gpu/drm/i915/intel_pm.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 78b9acfc64c0..b9b3d8d45016 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4681,8 +4681,8 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
>   		if ((cpp * cstate->base.adjusted_mode.crtc_htotal / 512 < 1) &&
>   		    (plane_bytes_per_line / 512 < 1))
>   			selected_result = method2;
> -		else if ((ddb_allocation && ddb_allocation /
> -			fixed_16_16_to_u32_round_up(plane_blocks_per_line)) >= 1)
> +		else if (ddb_allocation >=
> +			 fixed_16_16_to_u32_round_up(plane_blocks_per_line))
>   			selected_result = min_fixed_16_16(method1, method2);
>   		else if (latency >= linetime_us)
>   			selected_result = min_fixed_16_16(method1, method2);



More information about the Intel-gfx mailing list