| From 286e0c94f9c3f292cb38a977fbbde3433347a868 Mon Sep 17 00:00:00 2001 |
| From: Jean Delvare <jdelvare@suse.de> |
| Date: Thu, 6 Oct 2011 18:16:24 +0200 |
| Subject: drm/radeon/kms: Fix I2C mask definitions |
| |
| From: Jean Delvare <jdelvare@suse.de> |
| |
| commit 286e0c94f9c3f292cb38a977fbbde3433347a868 upstream. |
| |
| 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> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| 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; |
