Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b75119c authored by Kumar, Mahesh's avatar Kumar, Mahesh Committed by Matt Roper
Browse files

drm/i915/skl: Fail the flip if no FB for WM calculation 



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: default avatarMahesh Kumar <mahesh1.kumar@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517115831.13830-6-mahesh1.kumar@intel.com
parent 7084b50b

drivers/gpu/drm/i915/intel_pm.c

+2 −1
Original line number Diff line number Diff line
@@ -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]);