From: Dave Airlie <airlied@redhat.com>
Date: Wed, 23 Jul 2014 04:26:12 +0000 (+1000)
Subject: drm/i915: fix initial fbdev setup warnings
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e05444be705b;p=deliverable%2Flinux.git

drm/i915: fix initial fbdev setup warnings

This chunk was no longer required from what I can see, or
at least it is doing the wrong thing, as I confused
intel_connector->encoder and connector->encoder. Drop it
for now, to remove the warnings at bootup.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 7cdb8861bb7c..f475414671d8 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -375,11 +375,6 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
 		}
 
 		encoder = connector->encoder;
-		if (!encoder) {
-			struct drm_connector_helper_funcs *connector_funcs;
-			connector_funcs = connector->helper_private;
-			encoder = connector_funcs->best_encoder(connector);
-		}
 		if (!encoder || WARN_ON(!encoder->crtc)) {
 			DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n",
 				      connector->name);