diff options
| author | Keith Packard <keithp@keithp.com> | 2011-09-28 16:31:53 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-05 19:56:50 -0700 |
| commit | 552fb0b7a6e8079339913512b75d8c203f54bfdf (patch) | |
| tree | f0a3fe900b8ad62f9b19be7ff360a520e4619c84 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | 245e2708773796aaa13e97523e035676b008b337 (diff) | |
| download | op-kernel-dev-552fb0b7a6e8079339913512b75d8c203f54bfdf.zip op-kernel-dev-552fb0b7a6e8079339913512b75d8c203f54bfdf.tar.gz | |
drm/i915: Delay DP i2c initialization until panel power timings are computed
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 68bcd77..0c19b39 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -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)) { |
