diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-06-03 09:11:41 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2013-06-17 05:42:45 -0400 |
| commit | b72447cdf1298b46af87d754bfb5d3db6eb7dbfe (patch) | |
| tree | 646f012bff068582ddc3cb17420f5e8a79e3bd99 | |
| parent | 35f2c3ae764ec8d458d6b9c78826d23c112abc7a (diff) | |
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>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 7 |
1 files changed, 0 insertions, 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) | |||
| 292 | { | 292 | { |
| 293 | int ret; | 293 | int ret; |
| 294 | drm_i915_private_t *dev_priv = dev->dev_private; | 294 | drm_i915_private_t *dev_priv = dev->dev_private; |
| 295 | struct drm_mode_config *config = &dev->mode_config; | ||
| 296 | struct drm_plane *plane; | ||
| 297 | 295 | ||
| 298 | if (INTEL_INFO(dev)->num_pipes == 0) | 296 | if (INTEL_INFO(dev)->num_pipes == 0) |
| 299 | return; | 297 | return; |
| @@ -304,10 +302,5 @@ void intel_fb_restore_mode(struct drm_device *dev) | |||
| 304 | if (ret) | 302 | if (ret) |
| 305 | DRM_DEBUG("failed to restore crtc mode\n"); | 303 | DRM_DEBUG("failed to restore crtc mode\n"); |
| 306 | 304 | ||
| 307 | /* Be sure to shut off any planes that may be active */ | ||
| 308 | list_for_each_entry(plane, &config->plane_list, head) | ||
| 309 | if (plane->enabled) | ||
| 310 | plane->funcs->disable_plane(plane); | ||
| 311 | |||
| 312 | drm_modeset_unlock_all(dev); | 305 | drm_modeset_unlock_all(dev); |
| 313 | } | 306 | } |
