From 40e4e47a38da481bf671d0665637e0aef1ea1e03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Fri, 17 May 2019 22:31:30 +0300 Subject: [PATCH] drm/i915: Dump failed crtc states during atomic check MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Currently we're only dumping the failed crtc state if intel_modeset_pipe_config() fails. Let's do the state dump if anything else fails afterwards. The downside is that we lose the immediate knowledge which crtc caused the failure (unless a lower level function indicates it with an additional debug print) but having the full state dumped seems like something that could be beneficial. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20190517193132.8140-12-ville.syrjala@linux.intel.com Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/i915/intel_display.c | 36 ++++++++++++++++++---------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 048cb8d7ae65b..240e5f1b33ad9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13369,7 +13369,7 @@ static int intel_atomic_check(struct drm_device *dev, ret = drm_atomic_helper_check_modeset(dev, &state->base); if (ret) - return ret; + goto fail; for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { @@ -13382,12 +13382,8 @@ static int intel_atomic_check(struct drm_device *dev, } ret = intel_modeset_pipe_config(new_crtc_state); - if (ret == -EDEADLK) - return ret; - if (ret) { - intel_dump_pipe_config(new_crtc_state, "[failed]"); - return ret; - } + if (ret) + goto fail; if (intel_pipe_config_compare(dev_priv, old_crtc_state, new_crtc_state, true)) { @@ -13401,32 +13397,32 @@ static int intel_atomic_check(struct drm_device *dev, ret = drm_dp_mst_atomic_check(&state->base); if (ret) - return ret; + goto fail; if (any_ms) { ret = intel_modeset_checks(state); if (ret) - return ret; + goto fail; } else { state->cdclk.logical = dev_priv->cdclk.logical; } ret = icl_add_linked_planes(state); if (ret) - return ret; + goto fail; ret = drm_atomic_helper_check_planes(dev, &state->base); if (ret) - return ret; + goto fail; intel_fbc_choose_crtc(dev_priv, state); ret = calc_watermark_data(state); if (ret) - return ret; + goto fail; ret = intel_bw_atomic_check(state); if (ret) - return ret; + goto fail; for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { @@ -13440,6 +13436,20 @@ static int intel_atomic_check(struct drm_device *dev, } return 0; + + fail: + if (ret == -EDEADLK) + return ret; + + /* + * FIXME would probably be nice to know which crtc specifically + * caused the failure, in cases where we can pinpoint it. + */ + for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, + new_crtc_state, i) + intel_dump_pipe_config(new_crtc_state, "[failed]"); + + return ret; } static int intel_atomic_prepare_commit(struct drm_device *dev, -- 2.39.5