drm/i915: Delay DP i2c initialization until panel power timings are computed
authorKeith Packard <keithp@keithp.com>
Wed, 28 Sep 2011 23:31:53 +0000 (16:31 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 6 Oct 2011 02:56:50 +0000 (19:56 -0700)
On eDP, DDC requires panel power, but turning that on uses the panel
power sequencing timing values fetch from the DPCD data.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_dp.c

index 68bcd77962e93955ecfe41c369035a468176d12d..0c19b39b7cb8647a1ccf08b388d85bd5fdd85b1d 100644 (file)
@@ -2079,8 +2079,6 @@ intel_dp_init(struct drm_device *dev, int output_reg)
                        break;
        }
 
-       intel_dp_i2c_init(intel_dp, intel_connector, name);
-
        /* Cache some DPCD data in the eDP case */
        if (is_edp(intel_dp)) {
                bool ret;
@@ -2112,6 +2110,8 @@ intel_dp_init(struct drm_device *dev, int output_reg)
                }
        }
 
+       intel_dp_i2c_init(intel_dp, intel_connector, name);
+
        intel_encoder->hot_plug = intel_dp_hot_plug;
 
        if (is_edp(intel_dp)) {