Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8d4bb54 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c9a29698

drivers/gpu/drm/i915/intel_sdvo.c

+6 −2
Original line number Diff line number Diff line
@@ -1054,7 +1054,9 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, 
					     intel_sdvo->sdvo_lvds_fixed_mode);

	else

		intel_sdvo_get_dtd_from_mode(&output_dtd, mode);

	(void) intel_sdvo_set_output_timing(intel_sdvo, &output_dtd);

	if (!intel_sdvo_set_output_timing(intel_sdvo, &output_dtd))

		DRM_INFO("Setting output timings on %s failed\n",

			 SDVO_NAME(intel_sdvo));



	/* Set the input timing to the screen. Assume always input 0. */

	if (!intel_sdvo_set_target_input(intel_sdvo))
@@ -1076,7 +1078,9 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, 
	 * adjusted_mode.

	 */

	intel_sdvo_get_dtd_from_mode(&input_dtd, adjusted_mode);

	(void) intel_sdvo_set_input_timing(intel_sdvo, &input_dtd);

	if (!intel_sdvo_set_input_timing(intel_sdvo, &input_dtd))

		DRM_INFO("Setting input timings on %s failed\n",

			 SDVO_NAME(intel_sdvo));



	switch (pixel_multiplier) {

	default: