drm/i915: fix initial fbdev setup warnings
authorDave Airlie <airlied@redhat.com>
Wed, 23 Jul 2014 04:26:12 +0000 (14:26 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 24 Jul 2014 00:27:42 +0000 (10:27 +1000)
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>
drivers/gpu/drm/i915/intel_fbdev.c

index 7cdb8861bb7c57811897504d8f8954a1569d91e2..f475414671d8bdd5752a41fa8f4f6339470e365c 100644 (file)
@@ -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);