Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2011-10-11 14:56:37 +0200
committerJean Delvare <jdelvare@suse.de>2011-10-11 14:56:37 +0200
commitd4a7ce4367bc69f763c0e016ba8a34efcbe85026 (patch)
treeca1530b4d9dbbb78f87795d7002645550f589dbc
parent433f3389a6c6518d646e0e2cc49eae130fe124ad (diff)
drm/radeon/kms: Fix I2C mask definitions (bnc#712023).
-rw-r--r--patches.fixes/drm-radeon-kms-fix-i2c-masks.patch30
-rw-r--r--series.conf1
2 files changed, 31 insertions, 0 deletions
diff --git a/patches.fixes/drm-radeon-kms-fix-i2c-masks.patch b/patches.fixes/drm-radeon-kms-fix-i2c-masks.patch
new file mode 100644
index 0000000000..f9ae0a9e7f
--- /dev/null
+++ b/patches.fixes/drm-radeon-kms-fix-i2c-masks.patch
@@ -0,0 +1,30 @@
+From: Jean Delvare <jdelvare@suse.de>
+Subject: drm/radeon/kms: Fix I2C mask definitions
+Patch-mainline: Not yet, should happen soon
+References: bnc#712023
+
+Commit 9b9fe724 accidentally used RADEON_GPIO_EN_* where
+RADEON_GPIO_MASK_* was intended. This caused improper initialization
+of I2C buses, mostly visible when setting i2c_algo_bit.bit_test=1.
+Using the right constants fixes the problem.
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: Jerome Glisse <j.glisse@gmail.com>
+---
+ drivers/gpu/drm/radeon/radeon_combios.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_combios.c
++++ b/drivers/gpu/drm/radeon/radeon_combios.c
+@@ -620,8 +620,8 @@ static struct radeon_i2c_bus_rec combios
+ i2c.y_data_mask = 0x80;
+ } else {
+ /* default masks for ddc pads */
+- i2c.mask_clk_mask = RADEON_GPIO_EN_1;
+- i2c.mask_data_mask = RADEON_GPIO_EN_0;
++ i2c.mask_clk_mask = RADEON_GPIO_MASK_1;
++ i2c.mask_data_mask = RADEON_GPIO_MASK_0;
+ i2c.a_clk_mask = RADEON_GPIO_A_1;
+ i2c.a_data_mask = RADEON_GPIO_A_0;
+ i2c.en_clk_mask = RADEON_GPIO_EN_1;
diff --git a/series.conf b/series.conf
index d98fccbeb2..9b9ce0705f 100644
--- a/series.conf
+++ b/series.conf
@@ -370,6 +370,7 @@
########################################################
# DRM/Video
########################################################
+ patches.fixes/drm-radeon-kms-fix-i2c-masks.patch
########################################################
# video4linux