drm/i915: Use FBINFO_STATE defines instead of 0 and 1
Subsystems (2)
PATCH 1/1 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 <[email protected]>
Signed-off-by Damien Lespiau <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 6 +++--- drivers/gpu/drm/i915/intel_fb.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +3 -3
@@ -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);
drivers/gpu/drm/i915/intel_fb.c +1 -1
@@ -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);
Signature · 1 line
1.8.1.4
Quoted 4 lines · Damien Lespiau
This makes, arguably, the condition on state easier to read.
Suggested-by Chris Wilson <[email protected]>Signed-off-by Damien Lespiau <[email protected]>
Reviewed-by Chris Wilson <[email protected]>
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Daniel Vetter
AppliedQuoted 6 lines · Chris Wilson
Quoted 4 lines · Damien Lespiau
This makes, arguably, the condition on state easier to read.
Suggested-by Chris Wilson <[email protected]>Signed-off-by Damien Lespiau <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch