diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-07-23 14:26:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-07-23 14:26:12 +1000 |
| commit | 638094f91bd4d70b004422ca53451692174d02af (patch) | |
| tree | 5f7b84b76695f3384a2dc21351218a2143a148cf | |
| parent | 088ac7489000069f189828bd916ddf3562609a47 (diff) | |
drm/i915: fix initial fbdev setup warningsdrm-i915-next
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.c | 5 |
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, } 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); |