drm/i915: Drop bogus fbdev sprite disable code

plane->enabled is never set, so this code didn't do anything.

Also drm_fb_helper_restore_fbdev_mode() will now disable all cursors
and sprites for us, so we don't have to bother anymore.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 6b7c3ca2c035e5514c2c333877966ff1cb3d3cfd..3b03c3c6cc5d410197082c6fbd2d897c952032f6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -292,8 +292,6 @@ void intel_fb_restore_mode(struct drm_device *dev)
 {
        int ret;
        drm_i915_private_t *dev_priv = dev->dev_private;
-       struct drm_mode_config *config = &dev->mode_config;
-       struct drm_plane *plane;
 
        if (INTEL_INFO(dev)->num_pipes == 0)
                return;
@@ -304,10 +302,5 @@ void intel_fb_restore_mode(struct drm_device *dev)
        if (ret)
                DRM_DEBUG("failed to restore crtc mode\n");
 
-       /* Be sure to shut off any planes that may be active */
-       list_for_each_entry(plane, &config->plane_list, head)
-               if (plane->enabled)
-                       plane->funcs->disable_plane(plane);
-
        drm_modeset_unlock_all(dev);
 }