| From 3437a0f608f9c36c1fc289628202ddc4827921ee Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Mon, 3 Jun 2013 16:11:41 +0300 |
| Subject: drm/i915: Drop bogus fbdev sprite disable code |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| (cherry picked from commit b72447cdf1298b46af87d754bfb5d3db6eb7dbfe) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_fb.c | 7 ------- |
| 1 file changed, 7 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c |
| index 6b7c3ca2c035..3b03c3c6cc5d 100644 |
| --- 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); |
| } |
| -- |
| 1.8.5.rc3 |
| |
