aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-07-23 00:26:12 -0400
committerDave Airlie <airlied@redhat.com>2014-07-23 20:27:42 -0400
commite05444be705b5c7c7f85d7722b6f97f3a6732d54 (patch)
tree8ce893aee80c8ecb6652003afd8495a53cb550b7
parent09b64267c1f72f2670fcde9f11e5453ce365ca23 (diff)
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>
-rw-r--r--drivers/gpu/drm/i915/intel_fbdev.c5
1 files changed, 0 insertions, 5 deletions
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,
375 } 375 }
376 376
377 encoder = connector->encoder; 377 encoder = connector->encoder;
378 if (!encoder) {
379 struct drm_connector_helper_funcs *connector_funcs;
380 connector_funcs = connector->helper_private;
381 encoder = connector_funcs->best_encoder(connector);
382 }
383 if (!encoder || WARN_ON(!encoder->crtc)) { 378 if (!encoder || WARN_ON(!encoder->crtc)) {
384 DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n", 379 DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n",
385 connector->name); 380 connector->name);