aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2019-05-17 22:31:30 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2019-06-04 16:42:53 +0300
commit2833920d0ea07f67959940547eb4e6cdccc0f9a4 (patch)
tree6ee37adea7be2117eec835740dcfc62c217b584e /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: Include crtc_state.active in crtc state dumps (diff)
downloadlinux-dev-2833920d0ea07f67959940547eb4e6cdccc0f9a4.tar.xz
linux-dev-2833920d0ea07f67959940547eb4e6cdccc0f9a4.zip
drm/i915: Dump failed crtc states during atomic check
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ä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190517193132.8140-12-ville.syrjala@linux.intel.com Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c36
1 files changed, 23 insertions, 13 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 048cb8d7ae65..240e5f1b33ad 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,