From 98b6aefb7d7502453b06e7b65bc3c77036e37492 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 18 Mar 2011 09:06:49 +0000 Subject: [PATCH] --- yaml --- r: 242315 b: refs/heads/master c: 48898b038b69ef4801f0e059026c8f6920684677 h: refs/heads/master i: 242313: 2fd147ecd1b927638d45bcc0af8291bd0ce60614 242311: cd1ff14c5426f79b094e88bdb8ee07f27f3ffefd v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f5b66d712e57..d15c75b68412 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29c5a587284195278e233eec5c2234c24fb2c204 +refs/heads/master: 48898b038b69ef4801f0e059026c8f6920684677 diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c index d29e33f815d7..0daefca5cbb8 100644 --- a/trunk/drivers/gpu/drm/i915/intel_dp.c +++ b/trunk/drivers/gpu/drm/i915/intel_dp.c @@ -1957,9 +1957,9 @@ intel_dp_init(struct drm_device *dev, int output_reg) DP_NO_AUX_HANDSHAKE_LINK_TRAINING; } else { /* if this fails, presume the device is a ghost */ - DRM_ERROR("failed to retrieve link info\n"); - intel_dp_destroy(&intel_connector->base); + DRM_INFO("failed to retrieve link info, disabling eDP\n"); intel_dp_encoder_destroy(&intel_dp->base.base); + intel_dp_destroy(&intel_connector->base); return; } }