From 038e03c3610c870be608b0a6f62a79ce04cca6cc Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sun, 9 Sep 2012 13:18:12 +0200 Subject: [PATCH] initizalize crt output first, before anything else --- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e061acd..09dbffd 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7524,6 +7524,8 @@ static void intel_setup_outputs(struct drm_device *dev) bool dpd_is_edp = false; bool has_lvds; + intel_crt_init(dev); + has_lvds = intel_lvds_init(dev); if (!has_lvds && !HAS_PCH_SPLIT(dev)) { /* disable the panel fitter on everything but LVDS */ @@ -7540,8 +7542,6 @@ static void intel_setup_outputs(struct drm_device *dev) intel_dp_init(dev, PCH_DP_D, PORT_D); } - intel_crt_init(dev); - if (IS_HASWELL(dev)) { int found; -- 1.7.10.4