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

This makes, arguably, the condition on state easier to read.

Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index b23cd63b9fdaa5481902f859af33e3f3d8b03a54..381c9dd4ab6016b5f04898141d237125efd58faf 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -546,7 +546,7 @@ static int i915_drm_freeze(struct drm_device *dev)
        intel_opregion_fini(dev);
 
        console_lock();
-       intel_fbdev_set_suspend(dev, 1);
+       intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED);
        console_unlock();
 
        return 0;
@@ -590,7 +590,7 @@ void intel_console_resume(struct work_struct *work)
        struct drm_device *dev = dev_priv->dev;
 
        console_lock();
-       intel_fbdev_set_suspend(dev, 0);
+       intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING);
        console_unlock();
 }
 
@@ -659,7 +659,7 @@ static int __i915_drm_thaw(struct drm_device *dev)
         * path of resume if possible.
         */
        if (console_trylock()) {
-               intel_fbdev_set_suspend(dev, 0);
+               intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING);
                console_unlock();
        } else {
                schedule_work(&dev_priv->console_resume_work);

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 7a77d4cf96c2c3d3149f7e1fbd65876c6e1a803c..244060ad354bcb12b18eb018a11b1de23111cfc4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -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
         * 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);
 
        fb_set_suspend(info, state);