From: Greg Kroah-Hartman Date: Sun, 9 Feb 2014 00:26:41 +0000 (-0800) Subject: 3.10-stable patches X-Git-Tag: v3.4.80~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd6f367a140e0e2fd1eef13698a9861073a18e04;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch --- diff --git a/queue-3.10/drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch b/queue-3.10/drm-radeon-warn-users-when-hw_i2c-is-enabled-v2.patch new file mode 100644 index 00000000000..34a5086c000 --- /dev/null +++ b/queue-3.10/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.10/series b/queue-3.10/series index e95f69030d8..3dd40136c34 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -39,3 +39,4 @@ 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