diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index d29e33f815d7..cb8578b7e443 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -213,7 +213,7 @@ intel_dp_mode_valid(struct drm_connector *connector, | |||
213 | return MODE_PANEL; | 213 | return MODE_PANEL; |
214 | } | 214 | } |
215 | 215 | ||
216 | /* only refuse the mode on non eDP since we have seen some wierd eDP panels | 216 | /* only refuse the mode on non eDP since we have seen some weird eDP panels |
217 | which are outside spec tolerances but somehow work by magic */ | 217 | which are outside spec tolerances but somehow work by magic */ |
218 | if (!is_edp(intel_dp) && | 218 | if (!is_edp(intel_dp) && |
219 | (intel_dp_link_required(connector->dev, intel_dp, mode->clock) | 219 | (intel_dp_link_required(connector->dev, intel_dp, mode->clock) |
@@ -1957,9 +1957,9 @@ intel_dp_init(struct drm_device *dev, int output_reg) | |||
1957 | DP_NO_AUX_HANDSHAKE_LINK_TRAINING; | 1957 | DP_NO_AUX_HANDSHAKE_LINK_TRAINING; |
1958 | } else { | 1958 | } else { |
1959 | /* if this fails, presume the device is a ghost */ | 1959 | /* if this fails, presume the device is a ghost */ |
1960 | DRM_ERROR("failed to retrieve link info\n"); | 1960 | DRM_INFO("failed to retrieve link info, disabling eDP\n"); |
1961 | intel_dp_destroy(&intel_connector->base); | ||
1962 | intel_dp_encoder_destroy(&intel_dp->base.base); | 1961 | intel_dp_encoder_destroy(&intel_dp->base.base); |
1962 | intel_dp_destroy(&intel_connector->base); | ||
1963 | return; | 1963 | return; |
1964 | } | 1964 | } |
1965 | } | 1965 | } |