Attachment 82502 Details for Bug 66972 – add module parameter to disable aspm

[patch] add module parameter to disable aspm

0001-drm-radeon-add-a-module-parameter-to-disable-aspm.patch (text/plain), 4.80 KB, created by Alex Deucher on 2013-07-16 20:49:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-07-16 20:49:20 UTC

Size: 4.80 KB

patch

obsolete

>From 0b9d5df9fbe54e5fac9f566db320a7304e662b4b Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Tue, 16 Jul 2013 15:58:50 -0400
>Subject: [PATCH] drm/radeon: add a module parameter to disable aspm
>
>Can cause hangs in some situations.  Set radeon.aspm=0
>to disable aspm.
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/radeon/evergreen.c  |    3 +++
> drivers/gpu/drm/radeon/radeon.h     |    1 +
> drivers/gpu/drm/radeon/radeon_drv.c |    4 ++++
> drivers/gpu/drm/radeon/rv6xx_dpm.c  |   14 ++++++++------
> drivers/gpu/drm/radeon/rv770_dpm.c  |   14 ++++++++------
> drivers/gpu/drm/radeon/si.c         |    3 +++
> 6 files changed, 27 insertions(+), 12 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
>index 526e428..038dcac 100644
>--- a/drivers/gpu/drm/radeon/evergreen.c
>+++ b/drivers/gpu/drm/radeon/evergreen.c
>@@ -5515,6 +5515,9 @@ void evergreen_program_aspm(struct radeon_device *rdev)
> 	 */
> 	bool fusion_platform = false;
> 
>+	if (radeon_aspm == 0)
>+		return;
>+
> 	if (!(rdev->flags & RADEON_IS_PCIE))
> 		return;
> 
>diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
>index 0010817..2f08219 100644
>--- a/drivers/gpu/drm/radeon/radeon.h
>+++ b/drivers/gpu/drm/radeon/radeon.h
>@@ -97,6 +97,7 @@ extern int radeon_msi;
> extern int radeon_lockup_timeout;
> extern int radeon_fastfb;
> extern int radeon_dpm;
>+extern int radeon_aspm;
> 
> /*
>  * Copy from radeon_drv.h so we don't have to include both and have conflicting
>diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
>index e5419b3..29876b1 100644
>--- a/drivers/gpu/drm/radeon/radeon_drv.c
>+++ b/drivers/gpu/drm/radeon/radeon_drv.c
>@@ -167,6 +167,7 @@ int radeon_msi = -1;
> int radeon_lockup_timeout = 10000;
> int radeon_fastfb = 0;
> int radeon_dpm = -1;
>+int radeon_aspm = -1;
> 
> MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
> module_param_named(no_wb, radeon_no_wb, int, 0444);
>@@ -225,6 +226,9 @@ module_param_named(fastfb, radeon_fastfb, int, 0444);
> MODULE_PARM_DESC(dpm, "DPM support (1 = enable, 0 = disable, -1 = auto)");
> module_param_named(dpm, radeon_dpm, int, 0444);
> 
>+MODULE_PARM_DESC(aspm, "ASPM support (1 = enable, 0 = disable, -1 = auto)");
>+module_param_named(aspm, radeon_aspm, int, 0444);
>+
> static struct pci_device_id pciidlist[] = {
> 	radeon_PCI_IDS
> };
>diff --git a/drivers/gpu/drm/radeon/rv6xx_dpm.c b/drivers/gpu/drm/radeon/rv6xx_dpm.c
>index 8303de2..65e33f3 100644
>--- a/drivers/gpu/drm/radeon/rv6xx_dpm.c
>+++ b/drivers/gpu/drm/radeon/rv6xx_dpm.c
>@@ -1763,12 +1763,14 @@ void rv6xx_setup_asic(struct radeon_device *rdev)
> {
> 	r600_enable_acpi_pm(rdev);
> 
>-	if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L0s)
>-		rv6xx_enable_l0s(rdev);
>-	if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L1)
>-		rv6xx_enable_l1(rdev);
>-	if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_TURNOFFPLL_ASPML1)
>-		rv6xx_enable_pll_sleep_in_l1(rdev);
>+	if (radeon_aspm != 0) {
>+		if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L0s)
>+			rv6xx_enable_l0s(rdev);
>+		if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L1)
>+			rv6xx_enable_l1(rdev);
>+		if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_TURNOFFPLL_ASPML1)
>+			rv6xx_enable_pll_sleep_in_l1(rdev);
>+	}
> }
> 
> void rv6xx_dpm_display_configuration_changed(struct radeon_device *rdev)
>diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c
>index d914e04..2d34792 100644
>--- a/drivers/gpu/drm/radeon/rv770_dpm.c
>+++ b/drivers/gpu/drm/radeon/rv770_dpm.c
>@@ -2099,12 +2099,14 @@ void rv770_dpm_setup_asic(struct radeon_device *rdev)
> 
> 	rv770_enable_acpi_pm(rdev);
> 
>-	if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L0s)
>-		rv770_enable_l0s(rdev);
>-	if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L1)
>-		rv770_enable_l1(rdev);
>-	if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_TURNOFFPLL_ASPML1)
>-		rv770_enable_pll_sleep_in_l1(rdev);
>+	if (radeon_aspm != 0) {
>+		if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L0s)
>+			rv770_enable_l0s(rdev);
>+		if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L1)
>+			rv770_enable_l1(rdev);
>+		if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_TURNOFFPLL_ASPML1)
>+			rv770_enable_pll_sleep_in_l1(rdev);
>+	}
> }
> 
> void rv770_dpm_display_configuration_changed(struct radeon_device *rdev)
>diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
>index d3f0507..d325280 100644
>--- a/drivers/gpu/drm/radeon/si.c
>+++ b/drivers/gpu/drm/radeon/si.c
>@@ -7053,6 +7053,9 @@ static void si_program_aspm(struct radeon_device *rdev)
> 	bool disable_l0s = false, disable_l1 = false, disable_plloff_in_l1 = false;
> 	bool disable_clkreq = false;
> 
>+	if (radeon_aspm == 0)
>+		return;
>+
> 	if (!(rdev->flags & RADEON_IS_PCIE))
> 		return;
> 
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 66972: 82496 | 82502 | 82518 | 82547

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.