Commit b6f3eff7 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter

drm/i915: Use FBINFO_STATE defines instead of 0 and 1

This makes, arguably, the condition on state easier to read.
Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e596a02c
...@@ -546,7 +546,7 @@ static int i915_drm_freeze(struct drm_device *dev) ...@@ -546,7 +546,7 @@ static int i915_drm_freeze(struct drm_device *dev)
intel_opregion_fini(dev); intel_opregion_fini(dev);
console_lock(); console_lock();
intel_fbdev_set_suspend(dev, 1); intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED);
console_unlock(); console_unlock();
return 0; return 0;
...@@ -590,7 +590,7 @@ void intel_console_resume(struct work_struct *work) ...@@ -590,7 +590,7 @@ void intel_console_resume(struct work_struct *work)
struct drm_device *dev = dev_priv->dev; struct drm_device *dev = dev_priv->dev;
console_lock(); console_lock();
intel_fbdev_set_suspend(dev, 0); intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING);
console_unlock(); console_unlock();
} }
...@@ -659,7 +659,7 @@ static int __i915_drm_thaw(struct drm_device *dev) ...@@ -659,7 +659,7 @@ static int __i915_drm_thaw(struct drm_device *dev)
* path of resume if possible. * path of resume if possible.
*/ */
if (console_trylock()) { if (console_trylock()) {
intel_fbdev_set_suspend(dev, 0); intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING);
console_unlock(); console_unlock();
} else { } else {
schedule_work(&dev_priv->console_resume_work); schedule_work(&dev_priv->console_resume_work);
......
...@@ -275,7 +275,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state) ...@@ -275,7 +275,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state)
* been restored from swap. If the object is stolen however, it will be * been restored from swap. If the object is stolen however, it will be
* full of whatever garbage was left in there. * full of whatever garbage was left in there.
*/ */
if (!state && ifbdev->ifb.obj->stolen) if (state == FBINFO_STATE_RUNNING && ifbdev->ifb.obj->stolen)
memset_io(info->screen_base, 0, info->screen_size); memset_io(info->screen_base, 0, info->screen_size);
fb_set_suspend(info, state); fb_set_suspend(info, state);
......
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