diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 7cdb8861bb7c57811897504d8f8954a1569d91e2..f475414671d8bdd5752a41fa8f4f6339470e365c 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);