From: Ville Syrjälä Date: Fri, 17 Nov 2017 19:19:17 +0000 (+0200) Subject: drm/i915: Add rudimentary plane state verification X-Git-Tag: v4.16-rc1~96^2~27^2~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cff109f06dfebc379a5a36d49b541212caaec607;p=thirdparty%2Flinux.git drm/i915: Add rudimentary plane state verification Check that the planes are in the state we expect them to be. For now we can only check whether each plane is correctly enabled or disabled. In the future we may want to expand the plane state readout to support a more thorough verification. v2: Verify all planes part of the state as long as at least one crtc is doing a modeset (Daniel) v3: Fix typoes (James) Cc: James Ausmus Cc: Daniel Vetter Suggested-by: Daniel Vetter Reviewed-by: James Ausmus Link: https://patchwork.freedesktop.org/patch/msgid/20171117191917.11506-11-ville.syrjala@linux.intel.com Signed-off-by: Ville Syrjälä --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ed58311e8da06..5ca7b33554ef4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11600,6 +11600,18 @@ verify_crtc_state(struct drm_crtc *crtc, } } +static void +intel_verify_planes(struct intel_atomic_state *state) +{ + struct intel_plane *plane; + const struct intel_plane_state *plane_state; + int i; + + for_each_new_intel_plane_in_state(state, plane, + plane_state, i) + assert_plane(plane, plane_state->base.visible); +} + static void verify_single_dpll_state(struct drm_i915_private *dev_priv, struct intel_shared_dpll *pll, @@ -12393,6 +12405,9 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) intel_modeset_verify_crtc(crtc, state, old_crtc_state, new_crtc_state); } + if (intel_state->modeset) + intel_verify_planes(intel_state); + if (intel_state->modeset && intel_can_enable_sagv(state)) intel_enable_sagv(dev_priv);