From: Greg Kroah-Hartman Date: Sun, 9 Feb 2014 00:26:45 +0000 (-0800) Subject: 3.12-stable patches X-Git-Tag: v3.4.80~55 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eaba4f73a45a070eae3a95768e1b5b07e7159dbc;p=thirdparty%2Fkernel%2Fstable-queue.git 3.12-stable patches added patches: drm-radeon-dpm-disable-mclk-switching-on-desktop-rv770.patch drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch --- diff --git a/queue-3.12/drm-radeon-dpm-disable-mclk-switching-on-desktop-rv770.patch b/queue-3.12/drm-radeon-dpm-disable-mclk-switching-on-desktop-rv770.patch new file mode 100644 index 00000000000..508302d6d18 --- /dev/null +++ b/queue-3.12/drm-radeon-dpm-disable-mclk-switching-on-desktop-rv770.patch @@ -0,0 +1,39 @@ +From 8097d94116d0c17e774ba4c8256e774018dc2a46 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 7 Jan 2014 13:51:51 -0500 +Subject: drm/radeon/dpm: disable mclk switching on desktop RV770 + +From: Alex Deucher + +commit 8097d94116d0c17e774ba4c8256e774018dc2a46 upstream. + +Mclk switching doesn't seem to work reliably on these +cards. Most RV770 boards specify the same mclk for all +performance levels anyway so in most cases, this has +no affect. + +Bug: +https://bugs.freedesktop.org/show_bug.cgi?id=73067 + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/rv770_dpm.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/gpu/drm/radeon/rv770_dpm.c ++++ b/drivers/gpu/drm/radeon/rv770_dpm.c +@@ -2531,6 +2531,12 @@ bool rv770_dpm_vblank_too_short(struct r + (rdev->pdev->subsystem_device == 0x1c42)) + switch_limit = 200; + ++ /* RV770 */ ++ /* mclk switching doesn't seem to work reliably on desktop RV770s */ ++ if ((rdev->family == CHIP_RV770) && ++ !(rdev->flags & RADEON_IS_MOBILITY)) ++ switch_limit = 0xffffffff; /* disable mclk switching */ ++ + if (vblank_time < switch_limit) + return true; + else diff --git a/queue-3.12/drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch b/queue-3.12/drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch new file mode 100644 index 00000000000..34a5086c000 --- /dev/null +++ b/queue-3.12/drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch @@ -0,0 +1,39 @@ +From d195178297de9a91246519dbfa98952b70f9a9b6 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 7 Jan 2014 10:05:02 -0500 +Subject: drm/radeon: warn users when hw_i2c is enabled (v2) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Alex Deucher + +commit d195178297de9a91246519dbfa98952b70f9a9b6 upstream. + +The hw i2c engines are disabled by default as the +current implementation is still experimental. Print +a warning when users enable it so that it's obvious +when the option is enabled. + +v2: check for non-0 rather than 1 + +Signed-off-by: Alex Deucher +Reviewed-by: Christian König +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/radeon_i2c.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/gpu/drm/radeon/radeon_i2c.c ++++ b/drivers/gpu/drm/radeon/radeon_i2c.c +@@ -1020,6 +1020,9 @@ void radeon_i2c_destroy(struct radeon_i2 + /* Add the default buses */ + void radeon_i2c_init(struct radeon_device *rdev) + { ++ if (radeon_hw_i2c) ++ DRM_INFO("hw_i2c forced on, you may experience display detection problems!\n"); ++ + if (rdev->is_atom_bios) + radeon_atombios_i2c_init(rdev); + else diff --git a/queue-3.12/series b/queue-3.12/series index 893a8dc18f2..06f91f1412d 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -54,3 +54,5 @@ dm-wait-until-embedded-kobject-is-released-before-destroying-a-device.patch dm-space-map-common-make-sure-new-space-is-used-during-extend.patch dm-space-map-metadata-fix-extending-the-space-map.patch dm-space-map-metadata-fix-bug-in-resizing-of-thin-metadata.patch +drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch +drm-radeon-dpm-disable-mclk-switching-on-desktop-rv770.patch