drm/i915: slightly improve gt enable/disable routines
authorEugeni Dodonov <eugeni.dodonov@intel.com>
Mon, 2 Jul 2012 14:51:06 +0000 (11:51 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 5 Jul 2012 07:56:02 +0000 (09:56 +0200)
Just a cosmetic change to simplify the if statement.

Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_pm.c

index 4c6c26c..e4c7eac 100644 (file)
@@ -3240,7 +3240,7 @@ void intel_disable_gt_powersave(struct drm_device *dev)
 {
        if (IS_IRONLAKE_M(dev))
                ironlake_disable_drps(dev);
-       if (INTEL_INFO(dev)->gen >= 6 && !IS_VALLEYVIEW(dev))
+       else if (INTEL_INFO(dev)->gen >= 6 && !IS_VALLEYVIEW(dev))
                gen6_disable_rps(dev);
 }
 
@@ -3250,9 +3250,7 @@ void intel_enable_gt_powersave(struct drm_device *dev)
                ironlake_enable_drps(dev);
                ironlake_enable_rc6(dev);
                intel_init_emon(dev);
-       }
-
-       if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
+       } else if ((IS_GEN6(dev) || IS_GEN7(dev)) && !IS_VALLEYVIEW(dev)) {
                gen6_enable_rps(dev);
                gen6_update_ring_freq(dev);
        }