aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2014-09-10 11:16:55 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-10-24 10:34:06 -0400
commit0b14cbd2f58199a024acbe2994bb27533c97d756 (patch)
tree1591cf2fddd68ab8f962a6c46d132a7fdce88063 /drivers/gpu/drm/i915/i915_drv.c
parent409ee761fdc3b39e34ffccea375e7f0f13fce9cc (diff)
drm/i915: remove dead code from legacy suspend handler
The legacy DRM suspend logic (effective in UMS) doesn't handle any S4 thaw events so we don't need to care about it either. Only S3 suspend and S4 freeze events are handled. Leave an assert behind to be sure. Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index a05a1d083e95..f7bc3e980d8e 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -640,9 +640,9 @@ int i915_suspend(struct drm_device *dev, pm_message_t state)
640 return -ENODEV; 640 return -ENODEV;
641 } 641 }
642 642
643 if (state.event == PM_EVENT_PRETHAW) 643 if (WARN_ON_ONCE(state.event != PM_EVENT_SUSPEND &&
644 return 0; 644 state.event != PM_EVENT_FREEZE))
645 645 return -EINVAL;
646 646
647 if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) 647 if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
648 return 0; 648 return 0;