Commit b72447cd authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Dave Airlie

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent 35f2c3ae
...@@ -292,8 +292,6 @@ void intel_fb_restore_mode(struct drm_device *dev) ...@@ -292,8 +292,6 @@ void intel_fb_restore_mode(struct drm_device *dev)
{ {
int ret; int ret;
drm_i915_private_t *dev_priv = dev->dev_private; 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) if (INTEL_INFO(dev)->num_pipes == 0)
return; return;
...@@ -304,10 +302,5 @@ void intel_fb_restore_mode(struct drm_device *dev) ...@@ -304,10 +302,5 @@ void intel_fb_restore_mode(struct drm_device *dev)
if (ret) if (ret)
DRM_DEBUG("failed to restore crtc mode\n"); 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); drm_modeset_unlock_all(dev);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment