diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-04-20 19:20:15 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-05-10 13:19:14 -0700 |
| commit | be925587570a745944d99042368f72496bc28a70 (patch) | |
| tree | 88d6a565465b737ed45d8dc8d1ff743a47463401 | |
| parent | 7173188d5d5e50b95c588dbae3b3bc78fde4138e (diff) | |
| download | kernel_samsung_smdk4412-be925587570a745944d99042368f72496bc28a70.zip kernel_samsung_smdk4412-be925587570a745944d99042368f72496bc28a70.tar.gz kernel_samsung_smdk4412-be925587570a745944d99042368f72496bc28a70.tar.bz2 | |
drm/i915: Propagate failure to set mode for load-detect pipe
Check the return value from drm_crtc_set_mode(), report the failure
via a debug message and propagate the error back to the caller. This
prevents us from blissfully continuing to do the load detection on a
disabled pipe. Fortunately actual failure for modesetting is very rare,
and reported failures even rarer.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 228621d..943bcbc 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5551,7 +5551,11 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, if (!crtc->enabled) { if (!mode) mode = &load_detect_mode; - drm_crtc_helper_set_mode(crtc, mode, 0, 0, crtc->fb); + + if (!drm_crtc_helper_set_mode(crtc, mode, 0, 0, crtc->fb)) { + DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n"); + return false; + } } else { if (intel_crtc->dpms_mode != DRM_MODE_DPMS_ON) { crtc_funcs = crtc->helper_private; |