diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-10 07:55:48 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-22 03:30:47 -0400 |
| commit | c8d4bb54c11c66610aaf8829acff6aa0506c7c29 (patch) | |
| tree | a5223a9fc40472580443a78ca6a2f94225218bce /drivers/gpu/drm/i915/intel_sdvo.c | |
| parent | c9a2969830ae6f8c548f4960751dbb243f6f1f5e (diff) | |
drm/i915: don't silently ignore sdvo mode_set failures
Unfortunately we can't abort a mode_set, but at least tell the user
that something might have gone wrong when setting the sdvo input or
output timing fails.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 7d4d01786daa..a1840f44941b 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
| @@ -1054,7 +1054,9 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, | |||
| 1054 | intel_sdvo->sdvo_lvds_fixed_mode); | 1054 | intel_sdvo->sdvo_lvds_fixed_mode); |
| 1055 | else | 1055 | else |
| 1056 | intel_sdvo_get_dtd_from_mode(&output_dtd, mode); | 1056 | intel_sdvo_get_dtd_from_mode(&output_dtd, mode); |
| 1057 | (void) intel_sdvo_set_output_timing(intel_sdvo, &output_dtd); | 1057 | if (!intel_sdvo_set_output_timing(intel_sdvo, &output_dtd)) |
| 1058 | DRM_INFO("Setting output timings on %s failed\n", | ||
| 1059 | SDVO_NAME(intel_sdvo)); | ||
| 1058 | 1060 | ||
| 1059 | /* Set the input timing to the screen. Assume always input 0. */ | 1061 | /* Set the input timing to the screen. Assume always input 0. */ |
| 1060 | if (!intel_sdvo_set_target_input(intel_sdvo)) | 1062 | if (!intel_sdvo_set_target_input(intel_sdvo)) |
| @@ -1076,7 +1078,9 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, | |||
| 1076 | * adjusted_mode. | 1078 | * adjusted_mode. |
| 1077 | */ | 1079 | */ |
| 1078 | intel_sdvo_get_dtd_from_mode(&input_dtd, adjusted_mode); | 1080 | intel_sdvo_get_dtd_from_mode(&input_dtd, adjusted_mode); |
| 1079 | (void) intel_sdvo_set_input_timing(intel_sdvo, &input_dtd); | 1081 | if (!intel_sdvo_set_input_timing(intel_sdvo, &input_dtd)) |
| 1082 | DRM_INFO("Setting input timings on %s failed\n", | ||
| 1083 | SDVO_NAME(intel_sdvo)); | ||
| 1080 | 1084 | ||
| 1081 | switch (pixel_multiplier) { | 1085 | switch (pixel_multiplier) { |
| 1082 | default: | 1086 | default: |