aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-09-28 19:31:53 -0400
committerKeith Packard <keithp@keithp.com>2011-10-05 22:56:50 -0400
commit552fb0b7a6e8079339913512b75d8c203f54bfdf (patch)
treef0a3fe900b8ad62f9b19be7ff360a520e4619c84 /drivers/gpu
parent245e2708773796aaa13e97523e035676b008b337 (diff)
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')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c4
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 68bcd77962e..0c19b39b7cb 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)
2079 break; 2079 break;
2080 } 2080 }
2081 2081
2082 intel_dp_i2c_init(intel_dp, intel_connector, name);
2083
2084 /* Cache some DPCD data in the eDP case */ 2082 /* Cache some DPCD data in the eDP case */
2085 if (is_edp(intel_dp)) { 2083 if (is_edp(intel_dp)) {
2086 bool ret; 2084 bool ret;
@@ -2112,6 +2110,8 @@ intel_dp_init(struct drm_device *dev, int output_reg)
2112 } 2110 }
2113 } 2111 }
2114 2112
2113 intel_dp_i2c_init(intel_dp, intel_connector, name);
2114
2115 intel_encoder->hot_plug = intel_dp_hot_plug; 2115 intel_encoder->hot_plug = intel_dp_hot_plug;
2116 2116
2117 if (is_edp(intel_dp)) { 2117 if (is_edp(intel_dp)) {