From: Yuanhan Liu <yuanhan.liu@intel.com>
Date: Fri, 18 Mar 2011 07:37:35 +0000 (+0000)
Subject: drm/i915: Re-enable self-refresh
X-Git-Tag: v2.6.39-rc2~3^2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7ccb4a53eb03c9196646ca0c2a97558313e886f1;p=~emulex%2Finfiniband.git

drm/i915: Re-enable self-refresh

A broken implementation of is_pot() prevented the detection of when a
singular pipe was enabled. Eric Anholt pointed out the existence of
is_power_of_2() so use that instead of our broken code!

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35402
Signed-off-by: Yuanhan Liu <yuanhan.liu@intel.com>
Tested-by: xunx.fang@intel.com
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 841f0397288..49c07231302 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3885,10 +3885,7 @@ static bool g4x_compute_srwm(struct drm_device *dev,
 			      display, cursor);
 }
 
-static inline bool single_plane_enabled(unsigned int mask)
-{
-	return mask && (mask & -mask) == 0;
-}
+#define single_plane_enabled(mask) is_power_of_2(mask)
 
 static void g4x_update_wm(struct drm_device *dev)
 {