Attachment 67953 Details for Bug 49981 – proposed patch

[patch] proposed patch

49981v2.patch (text/plain), 11.07 KB, created by graham on 2012-10-01 21:44:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: graham

Created: 2012-10-01 21:44:44 UTC

Size: 11.07 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
>index 853800e..1e0dc3c 100644
>--- a/drivers/gpu/drm/radeon/ni.c
>+++ b/drivers/gpu/drm/radeon/ni.c
>@@ -1561,3 +1561,182 @@ void cayman_vm_set_page(struct radeon_device *rdev, struct radeon_vm *vm,
> 	addr |= flags;
> 	writeq(addr, ptr + (pfn * 8));
> }
>+/* 
>+ * Northern Islands PM
>+ */
>+void ni_pm_init_profile(struct radeon_device *rdev)
>+{
>+	int idx;
>+	
>+	/* default */
>+	
>+	rdev->pm.profiles[PM_PROFILE_DEFAULT_IDX].dpms_off_ps_idx = rdev->pm.default_power_state_index;
>+	rdev->pm.profiles[PM_PROFILE_DEFAULT_IDX].dpms_on_ps_idx = rdev->pm.default_power_state_index;
>+	rdev->pm.profiles[PM_PROFILE_DEFAULT_IDX].dpms_off_cm_idx = 0;
>+	rdev->pm.profiles[PM_PROFILE_DEFAULT_IDX].dpms_on_cm_idx = 2;
>+	
>+	/* single head */
>+	
>+	if (rdev->flags & RADEON_IS_MOBILITY)
>+		idx = radeon_pm_get_type_index(rdev, POWER_STATE_TYPE_BATTERY, 0);
>+	else
>+		idx = radeon_pm_get_type_index(rdev, POWER_STATE_TYPE_PERFORMANCE, 0);
>+	 /* low sh */
>+	rdev->pm.profiles[PM_PROFILE_LOW_SH_IDX].dpms_off_ps_idx = idx;
>+	rdev->pm.profiles[PM_PROFILE_LOW_SH_IDX].dpms_on_ps_idx = idx;
>+	rdev->pm.profiles[PM_PROFILE_LOW_SH_IDX].dpms_off_cm_idx = 0;
>+	rdev->pm.profiles[PM_PROFILE_LOW_SH_IDX].dpms_on_cm_idx = 0;
>+	 /* mid sh */
>+	rdev->pm.profiles[PM_PROFILE_MID_SH_IDX].dpms_off_ps_idx = idx;
>+	rdev->pm.profiles[PM_PROFILE_MID_SH_IDX].dpms_on_ps_idx = idx;
>+	rdev->pm.profiles[PM_PROFILE_MID_SH_IDX].dpms_off_cm_idx = 0;
>+	rdev->pm.profiles[PM_PROFILE_MID_SH_IDX].dpms_on_cm_idx = 1;
>+	 /* high sh */
>+	rdev->pm.profiles[PM_PROFILE_HIGH_SH_IDX].dpms_off_ps_idx = idx;
>+	rdev->pm.profiles[PM_PROFILE_HIGH_SH_IDX].dpms_on_ps_idx = idx;
>+	rdev->pm.profiles[PM_PROFILE_HIGH_SH_IDX].dpms_off_cm_idx = 0;
>+	rdev->pm.profiles[PM_PROFILE_HIGH_SH_IDX].dpms_on_cm_idx = 2;
>+	
>+	/* mult head */
>+	
>+	if (rdev->pm.num_power_states < 4) {
>+		/* TURKS and maybe CAICOS, effectively full power on all 
>+		 * ref: http://david.woodhou.se/dmesg-boot-to-DIS
>+		 */
>+		idx = radeon_pm_get_type_index(rdev, POWER_STATE_TYPE_PERFORMANCE, 0);
>+		/* low mh */
>+		rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_ps_idx = idx;
>+		rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_ps_idx = 2;
>+		rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_cm_idx = 0;
>+		rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_cm_idx = 0;
>+		/* mid mh */
>+		rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_ps_idx = idx;
>+		rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_ps_idx = 2;
>+		rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_cm_idx = 0;
>+		rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_cm_idx = 1;
>+		/* high mh */
>+		rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_ps_idx = idx;
>+		rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_ps_idx = 2;
>+		rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_cm_idx = 0;
>+		rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_cm_idx = 2;
>+	}
>+	else {
>+		if (rdev->flags & RADEON_IS_MOBILITY){
>+			if ((rdev->family == CHIP_CAICOS) 
>+				&& (rdev->pm.num_power_states == 6)){		
>+				/*
>+				* ref: https://bugs.freedesktop.org/attachment.cgi?id=67893
>+				* ref: https://bugs.freedesktop.org/attachment.cgi?id=66430
>+				*/
>+				/*
>+				* Assume laptop is plugged in when running dualhead, switch to 
>+				* dualhead idle and performance profile
>+				*/
>+				/* low mh */
>+				idx = radeon_pm_get_type_index(rdev, POWER_STATE_TYPE_BATTERY, 0);
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_ps_idx = idx;
>+			
>+				//last(3rd) battery state is dualhead idle
>+				idx = radeon_pm_get_type_index(rdev, POWER_STATE_TYPE_BATTERY, 2);
>+			
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_cm_idx = 0; //300 mhz
>+				
>+				idx = radeon_pm_get_type_index(rdev, POWER_STATE_TYPE_PERFORMANCE, 0);
>+				/* mid mh */
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_cm_idx = 1; //400mhz
>+				/* high mh */
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_cm_idx = 2; //700mhz
>+			}
>+			else {
>+				/* r600 fallback */
>+				/* low mh */
>+				idx = radeon_pm_get_type_index(rdev, POWER_STATE_TYPE_BATTERY, 1);
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_cm_idx = 0;
>+				/* mid mh */
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_cm_idx = 1;
>+				/* high mh */
>+				idx = radeon_pm_get_type_index(rdev, POWER_STATE_TYPE_PERFORMANCE, 1);
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_cm_idx = 2;
>+			}
>+		}
>+		else {
>+			if ((rdev->family == CHIP_BARTS) && (rdev->pm.num_power_states == 4)) {
>+				/*
>+				* ref: https://bugs.freedesktop.org/attachment.cgi?id=67903
>+				* ref: https://bugs.freedesktop.org/attachment.cgi?id=67892
>+				*/
>+				/* low mh */
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_ps_idx = 1;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_ps_idx = 2;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_cm_idx = 0;  //300mhz
>+				/* mid mh */
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_ps_idx = 1;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_ps_idx = 1;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_cm_idx = 1; //775mhz
>+				/* high mh */
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_ps_idx = 1;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_ps_idx = 1;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_cm_idx = 2; //900mhz
>+			}
>+			else if ((rdev->family == CHIP_CAYMAN) && (rdev->pm.num_power_states == 4)) {
>+				/*
>+				* ref: http://lists.freedesktop.org/archives/dri-devel/2011-December/017622.html
>+				*/
>+				/* low mh */
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_ps_idx = 1;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_ps_idx = 2;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_cm_idx = 1; //500mhz (too high still)
>+				/* mid mh */
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_ps_idx = 1;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_ps_idx = 2;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_cm_idx = 2; //725mhz
>+				/* high mh */
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_ps_idx = 1;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_ps_idx = 1;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_cm_idx = 2; //800mhz
>+			}
>+			else {
>+				/* r600 fallback */
>+				/* low mh */
>+				idx = radeon_pm_get_type_index(rdev, POWER_STATE_TYPE_PERFORMANCE, 1);
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_cm_idx = 0;
>+				/* mid mh */
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_cm_idx = 1;
>+				/* high mh */
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_ps_idx = idx;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_off_cm_idx = 0;
>+				rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_cm_idx = 2;
>+			}
>+		}
>+	}
>+}
>\ No newline at end of file
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index d79c639..a4a7530 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -470,7 +470,7 @@ void r600_pm_init_profile(struct radeon_device *rdev)
> 			rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_ps_idx = 2;
> 			rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_off_cm_idx = 0;
> 			rdev->pm.profiles[PM_PROFILE_LOW_MH_IDX].dpms_on_cm_idx = 0;
>-			/* low mh */
>+			/* mid mh */
> 			rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_ps_idx = 2;
> 			rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_on_ps_idx = 2;
> 			rdev->pm.profiles[PM_PROFILE_MID_MH_IDX].dpms_off_cm_idx = 0;
>diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
>index 973417c..b0ce41b 100644
>--- a/drivers/gpu/drm/radeon/radeon_asic.c
>+++ b/drivers/gpu/drm/radeon/radeon_asic.c
>@@ -1325,7 +1325,7 @@ static struct radeon_asic btc_asic = {
> 		.misc = &evergreen_pm_misc,
> 		.prepare = &evergreen_pm_prepare,
> 		.finish = &evergreen_pm_finish,
>-		.init_profile = &r600_pm_init_profile,
>+		.init_profile = &ni_pm_init_profile,
> 		.get_dynpm_state = &r600_pm_get_dynpm_state,
> 		.get_engine_clock = &radeon_atom_get_engine_clock,
> 		.set_engine_clock = &radeon_atom_set_engine_clock,
>@@ -1429,7 +1429,7 @@ static struct radeon_asic cayman_asic = {
> 		.misc = &evergreen_pm_misc,
> 		.prepare = &evergreen_pm_prepare,
> 		.finish = &evergreen_pm_finish,
>-		.init_profile = &r600_pm_init_profile,
>+		.init_profile = &ni_pm_init_profile,
> 		.get_dynpm_state = &r600_pm_get_dynpm_state,
> 		.get_engine_clock = &radeon_atom_get_engine_clock,
> 		.set_engine_clock = &radeon_atom_set_engine_clock,
>diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
>index 18c38d1..3382547 100644
>--- a/drivers/gpu/drm/radeon/radeon_asic.h
>+++ b/drivers/gpu/drm/radeon/radeon_asic.h
>@@ -422,7 +422,13 @@ int evergreen_blit_init(struct radeon_device *rdev);
> int evergreen_mc_wait_for_idle(struct radeon_device *rdev);
> 
> /*
>+ * ni
>+ */
>+
>+extern void ni_pm_init_profile(struct radeon_device *rdev);
>+/*
>  * cayman
>+ * 
>  */
> void cayman_fence_ring_emit(struct radeon_device *rdev,
> 			    struct radeon_fence *fence);
>@@ -445,6 +451,7 @@ void cayman_vm_set_page(struct radeon_device *rdev, struct radeon_vm *vm,
> 			unsigned pfn, uint64_t addr, uint32_t flags);
> int evergreen_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib);
> 
>+
> /* DCE6 - SI */
> void dce6_bandwidth_update(struct radeon_device *rdev);
>

Actions: View | Splinter Review

Attachments on bug 49981: 62305 | 67892 | 67893 | 67903 | 67937 | 67953 | 74554 | 74606

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.