All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/radeon/kms: simplify picking power state
@ 2010-02-11 21:50 Rafał Miłecki
  2010-02-11 22:00 ` Rafał Miłecki
  0 siblings, 1 reply; 8+ messages in thread
From: Rafał Miłecki @ 2010-02-11 21:50 UTC (permalink / raw)
  To: dri-devel, Dave Airlie

---
 drivers/gpu/drm/radeon/radeon_pm.c |   57 +++++++++++------------------------
 1 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index a8e151e..f023435 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -81,60 +81,39 @@ static void radeon_print_power_mode_info(struct radeon_device *rdev)
 static struct radeon_power_state * radeon_pick_power_state(struct radeon_device *rdev,
 							   enum radeon_pm_state_type type)
 {
-	int i;
-	struct radeon_power_state *power_state = NULL;
+	int i, j;
+	enum radeon_pm_state_type wanted_types[2];
+	int wanted_count;
 
 	switch (type) {
 	case POWER_STATE_TYPE_DEFAULT:
 	default:
 		return rdev->pm.default_power_state;
 	case POWER_STATE_TYPE_POWERSAVE:
-		for (i = 0; i < rdev->pm.num_power_states; i++) {
-			if (rdev->pm.power_state[i].type == POWER_STATE_TYPE_POWERSAVE) {
-				power_state = &rdev->pm.power_state[i];
-				break;
-			}
-		}
-		if (power_state == NULL) {
-			for (i = 0; i < rdev->pm.num_power_states; i++) {
-				if (rdev->pm.power_state[i].type == POWER_STATE_TYPE_BATTERY) {
-					power_state = &rdev->pm.power_state[i];
-					break;
-				}
-			}
-		}
+		wanted_types[0] = POWER_STATE_TYPE_POWERSAVE;
+		wanted_types[1] = POWER_STATE_TYPE_BATTERY;
+		wanted_count = 2;
 		break;
 	case POWER_STATE_TYPE_BATTERY:
-		for (i = 0; i < rdev->pm.num_power_states; i++) {
-			if (rdev->pm.power_state[i].type == POWER_STATE_TYPE_BATTERY) {
-				power_state = &rdev->pm.power_state[i];
-				break;
-			}
-		}
-		if (power_state == NULL) {
-			for (i = 0; i < rdev->pm.num_power_states; i++) {
-				if (rdev->pm.power_state[i].type == POWER_STATE_TYPE_POWERSAVE) {
-					power_state = &rdev->pm.power_state[i];
-					break;
-				}
-			}
-		}
+		wanted_types[0] = POWER_STATE_TYPE_BATTERY;
+		wanted_types[1] = POWER_STATE_TYPE_POWERSAVE;
+		wanted_count = 2;
 		break;
 	case POWER_STATE_TYPE_BALANCED:
 	case POWER_STATE_TYPE_PERFORMANCE:
-		for (i = 0; i < rdev->pm.num_power_states; i++) {
-			if (rdev->pm.power_state[i].type == type) {
-				power_state = &rdev->pm.power_state[i];
-				break;
-			}
-		}
+		wanted_types[0] = type;
+		wanted_count = 1;
 		break;
 	}
 
-	if (power_state == NULL)
-		return rdev->pm.default_power_state;
+	for (i = 0; i < wanted_count; i++) {
+		for (j = 0; j < rdev->pm.num_power_states; j++) {
+			if (rdev->pm.power_state[j].type == wanted_types[i])
+				return &rdev->pm.power_state[j];
+		}
+	}
 
-	return power_state;
+	return rdev->pm.default_power_state;
 }
 
 static struct radeon_pm_clock_info * radeon_pick_clock_mode(struct radeon_device *rdev,
-- 
1.6.4.2


------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
--

^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-02-15  9:23 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-11 21:50 [PATCH] drm/radeon/kms: simplify picking power state Rafał Miłecki
2010-02-11 22:00 ` Rafał Miłecki
2010-02-12 15:38   ` Dana Goyette
2010-02-14 22:28     ` Rafał Miłecki
2010-02-15  3:43     ` Alex Deucher
2010-02-15  5:51       ` Dana Goyette
2010-02-15  9:19         ` Rafał Miłecki
2010-02-15  9:23           ` Rafał Miłecki

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.