Attachment 41939 Details for Bug 33027 – add gen2 module option

[patch] add gen2 module option

0001-drm-radeon-kms-add-module-option-for-pcie-gen2.patch (text/plain), 3.36 KB, created by Alex Deucher on 2011-01-12 15:01:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2011-01-12 15:01:15 UTC

Size: 3.36 KB

patch

obsolete

>From 607b967594e1d18ee27f7e0039e0bbffa76eec75 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Wed, 12 Jan 2011 17:57:26 -0500
>Subject: [PATCH] drm/radeon/kms: add module option for pcie gen2
>
>Switching to pcie gen2 causes problems on some
>boards.  Add a module option to turn it on/off.
>
>There are gen2 compatability issues with some
>motherboards it seems.
>
>Fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=33027
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/evergreen.c  |    3 +++
> drivers/gpu/drm/radeon/r600.c       |    3 +++
> drivers/gpu/drm/radeon/radeon.h     |    1 +
> drivers/gpu/drm/radeon/radeon_drv.c |    4 ++++
> drivers/gpu/drm/radeon/rv770.c      |    3 +++
> 5 files changed, 14 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
>index 1db2684..7ebc341 100644
>--- a/drivers/gpu/drm/radeon/evergreen.c
>+++ b/drivers/gpu/drm/radeon/evergreen.c
>@@ -3133,6 +3133,9 @@ static void evergreen_pcie_gen2_enable(struct radeon_device *rdev)
> {
> 	u32 link_width_cntl, speed_cntl;
> 
>+	if (radeon_pcie_gen2 == 0)
>+		return;
>+
> 	if (rdev->flags & RADEON_IS_IGP)
> 		return;
> 
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index 203f6a4..becc0a9 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -3648,6 +3648,9 @@ static void r600_pcie_gen2_enable(struct radeon_device *rdev)
> 	u32 link_width_cntl, lanes, speed_cntl, training_cntl, tmp;
> 	u16 link_cntl2;
> 
>+	if (radeon_pcie_gen2 == 0)
>+		return;
>+
> 	if (rdev->flags & RADEON_IS_IGP)
> 		return;
> 
>diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
>index d3b3adc..854ddc6 100644
>--- a/drivers/gpu/drm/radeon/radeon.h
>+++ b/drivers/gpu/drm/radeon/radeon.h
>@@ -92,6 +92,7 @@ extern int radeon_tv;
> extern int radeon_audio;
> extern int radeon_disp_priority;
> extern int radeon_hw_i2c;
>+extern int radeon_pcie_gen2;
> 
> /*
>  * 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 be5cb4f..d5680a0 100644
>--- a/drivers/gpu/drm/radeon/radeon_drv.c
>+++ b/drivers/gpu/drm/radeon/radeon_drv.c
>@@ -104,6 +104,7 @@ int radeon_tv = 1;
> int radeon_audio = 1;
> int radeon_disp_priority = 0;
> int radeon_hw_i2c = 0;
>+int radeon_pcie_gen2 = 0;
> 
> MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
> module_param_named(no_wb, radeon_no_wb, int, 0444);
>@@ -147,6 +148,9 @@ module_param_named(disp_priority, radeon_disp_priority, int, 0444);
> MODULE_PARM_DESC(hw_i2c, "hw i2c engine enable (0 = disable)");
> module_param_named(hw_i2c, radeon_hw_i2c, int, 0444);
> 
>+MODULE_PARM_DESC(pcie_gen2, "PCIE Gen2 mode (1 = enable)");
>+module_param_named(pcie_gen2, radeon_pcie_gen2, int, 0444);
>+
> static int radeon_suspend(struct drm_device *dev, pm_message_t state)
> {
> 	drm_radeon_private_t *dev_priv = dev->dev_private;
>diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
>index 3bf7828..491dc90 100644
>--- a/drivers/gpu/drm/radeon/rv770.c
>+++ b/drivers/gpu/drm/radeon/rv770.c
>@@ -1372,6 +1372,9 @@ static void rv770_pcie_gen2_enable(struct radeon_device *rdev)
> 	u32 link_width_cntl, lanes, speed_cntl, tmp;
> 	u16 link_cntl2;
> 
>+	if (radeon_pcie_gen2 == 0)
>+		return;
>+
> 	if (rdev->flags & RADEON_IS_IGP)
> 		return;
> 
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 33027: 41921 | 41922 | 41923 | 41939 | 41940

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.