[Intel-gfx] [PATCH 05/12] drm/i915/skl: Fail the flip if no FB for WM calculation

[Matt Roper]

On Mon, May 15, 2017 at 02:04:30PM +0530, Mahesh Kumar wrote:
> From: "Kumar, Mahesh" <mahesh1.kumar at intel.com>
> 
> Fail the flip if no FB is present but plane_state is set as visible.
> Above is not a valid combination so instead of continue fail the flip.
> 
> Signed-off-by: Mahesh Kumar <mahesh1.kumar at intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index ab056952cfa4..f494af358874 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4408,7 +4408,8 @@ skl_compute_wm_level(const struct drm_i915_private *dev_priv,
>  	if (!intel_pstate)
>  		intel_pstate = to_intel_plane_state(plane->state);
>  
> -	WARN_ON(!intel_pstate->base.fb);
> +	if (WARN_ON(!intel_pstate->base.fb))
> +		return -EINVAL;
>  
>  	ddb_blocks = skl_ddb_entry_size(&ddb->plane[pipe][intel_plane->id]);
>  
> -- 
> 2.11.0
> 

-- 
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795