Attachment 42878 Details for Bug 33851 – dynamically allocate power state space

[patch] dynamically allocate power state space

0001-drm-radeon-kms-dynamically-allocate-power-state-spac.patch (text/plain), 6.12 KB, created by Alex Deucher on 2011-02-02 15:40:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2011-02-02 15:40:30 UTC

Size: 6.12 KB

patch

obsolete

>From 619aaf3fb4bd7aee64e17aac68396666dbdf9b78 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Wed, 2 Feb 2011 18:37:34 -0500
>Subject: [PATCH] drm/radeon/kms: dynamically allocate power state space
>
>We previously used a static array, but some new systems
>had more states then we had array space, so dynamically
>allocate space based on the number of states in the vbios.
>
>Fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=33851
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>Cc: stable@kernel.org
>---
> drivers/gpu/drm/radeon/radeon.h          |    3 +-
> drivers/gpu/drm/radeon/radeon_atombios.c |   40 ++++++++++++++++++++---------
> drivers/gpu/drm/radeon/radeon_combios.c  |   11 ++++++++
> drivers/gpu/drm/radeon/radeon_pm.c       |    3 ++
> 4 files changed, 42 insertions(+), 15 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
>index 49a6890..9ce54e3 100644
>--- a/drivers/gpu/drm/radeon/radeon.h
>+++ b/drivers/gpu/drm/radeon/radeon.h
>@@ -814,8 +814,7 @@ struct radeon_pm {
> 	fixed20_12		sclk;
> 	fixed20_12		mclk;
> 	fixed20_12		needed_bandwidth;
>-	/* XXX: use a define for num power modes */
>-	struct radeon_power_state power_state[8];
>+	struct radeon_power_state *power_state;
> 	/* number of valid power states */
> 	int                     num_power_states;
> 	int                     current_power_state_index;
>diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
>index b64e603..5c1cc7a 100644
>--- a/drivers/gpu/drm/radeon/radeon_atombios.c
>+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
>@@ -1977,6 +1977,9 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev)
> 	num_modes = power_info->info.ucNumOfPowerModeEntries;
> 	if (num_modes > ATOM_MAX_NUMBEROF_POWER_BLOCK)
> 		num_modes = ATOM_MAX_NUMBEROF_POWER_BLOCK;
>+	rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state) * num_modes, GFP_KERNEL);
>+	if (!rdev->pm.power_state)
>+		return state_index;
> 	/* last mode is usually default, array is low to high */
> 	for (i = 0; i < num_modes; i++) {
> 		rdev->pm.power_state[state_index].clock_info[0].voltage.type = VOLTAGE_NONE;
>@@ -2328,6 +2331,10 @@ static int radeon_atombios_parse_power_table_4_5(struct radeon_device *rdev)
> 	power_info = (union power_info *)(mode_info->atom_context->bios + data_offset);
> 
> 	radeon_atombios_add_pplib_thermal_controller(rdev, &power_info->pplib.sThermalController);
>+	rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state) *
>+				       power_info->pplib.ucNumStates, GFP_KERNEL);
>+	if (!rdev->pm.power_state)
>+		return state_index;
> 	/* first mode is usually default, followed by low to high */
> 	for (i = 0; i < power_info->pplib.ucNumStates; i++) {
> 		mode_index = 0;
>@@ -2408,6 +2415,10 @@ static int radeon_atombios_parse_power_table_6(struct radeon_device *rdev)
> 	non_clock_info_array = (struct NonClockInfoArray *)
> 		(mode_info->atom_context->bios + data_offset +
> 		 power_info->pplib.usNonClockInfoArrayOffset);
>+	rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state) *
>+				       state_array->ucNumEntries, GFP_KERNEL);
>+	if (!rdev->pm.power_state)
>+		return state_index;
> 	for (i = 0; i < state_array->ucNumEntries; i++) {
> 		mode_index = 0;
> 		power_state = (union pplib_power_state *)&state_array->states[i];
>@@ -2481,19 +2492,22 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev)
> 			break;
> 		}
> 	} else {
>-		/* add the default mode */
>-		rdev->pm.power_state[state_index].type =
>-			POWER_STATE_TYPE_DEFAULT;
>-		rdev->pm.power_state[state_index].num_clock_modes = 1;
>-		rdev->pm.power_state[state_index].clock_info[0].mclk = rdev->clock.default_mclk;
>-		rdev->pm.power_state[state_index].clock_info[0].sclk = rdev->clock.default_sclk;
>-		rdev->pm.power_state[state_index].default_clock_mode =
>-			&rdev->pm.power_state[state_index].clock_info[0];
>-		rdev->pm.power_state[state_index].clock_info[0].voltage.type = VOLTAGE_NONE;
>-		rdev->pm.power_state[state_index].pcie_lanes = 16;
>-		rdev->pm.default_power_state_index = state_index;
>-		rdev->pm.power_state[state_index].flags = 0;
>-		state_index++;
>+		rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state), GFP_KERNEL);
>+		if (rdev->pm.power_state) {
>+			/* add the default mode */
>+			rdev->pm.power_state[state_index].type =
>+				POWER_STATE_TYPE_DEFAULT;
>+			rdev->pm.power_state[state_index].num_clock_modes = 1;
>+			rdev->pm.power_state[state_index].clock_info[0].mclk = rdev->clock.default_mclk;
>+			rdev->pm.power_state[state_index].clock_info[0].sclk = rdev->clock.default_sclk;
>+			rdev->pm.power_state[state_index].default_clock_mode =
>+				&rdev->pm.power_state[state_index].clock_info[0];
>+			rdev->pm.power_state[state_index].clock_info[0].voltage.type = VOLTAGE_NONE;
>+			rdev->pm.power_state[state_index].pcie_lanes = 16;
>+			rdev->pm.default_power_state_index = state_index;
>+			rdev->pm.power_state[state_index].flags = 0;
>+			state_index++;
>+		}
> 	}
> 
> 	rdev->pm.num_power_states = state_index;
>diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
>index 591fcae..d27ef74 100644
>--- a/drivers/gpu/drm/radeon/radeon_combios.c
>+++ b/drivers/gpu/drm/radeon/radeon_combios.c
>@@ -2442,6 +2442,17 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
> 
> 	rdev->pm.default_power_state_index = -1;
> 
>+	/* allocate 2 power states */
>+	rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state) * 2, GFP_KERNEL);
>+	if (!rdev->pm.power_state) {
>+		rdev->pm.default_power_state_index = state_index;
>+		rdev->pm.num_power_states = 0;
>+
>+		rdev->pm.current_power_state_index = rdev->pm.default_power_state_index;
>+		rdev->pm.current_clock_mode_index = 0;
>+		return;
>+	}
>+
> 	if (rdev->flags & RADEON_IS_MOBILITY) {
> 		offset = combios_get_table_offset(dev, COMBIOS_POWERPLAY_INFO_TABLE);
> 		if (offset) {
>diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
>index 8136200..2aed03b 100644
>--- a/drivers/gpu/drm/radeon/radeon_pm.c
>+++ b/drivers/gpu/drm/radeon/radeon_pm.c
>@@ -646,6 +646,9 @@ void radeon_pm_fini(struct radeon_device *rdev)
> #endif
> 	}
> 
>+	if (rdev->pm.power_state)
>+		kfree(rdev->pm.power_state);
>+
> 	radeon_hwmon_fini(rdev);
> }
> 
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 33851: 42866 | 42867 | 42868 | 42875 | 42878 | 42879

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.