This is a note to let you know that I've just added the patch titled
drm/radeon/kms: fix i2c pad masks on rs4xx
to the 2.6.36-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-radeon-kms-fix-i2c-pad-masks-on-rs4xx.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From be66305718bee9927e6acc6b75618ce3cd745718 Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Thu, 18 Nov 2010 17:18:08 -0500
Subject: drm/radeon/kms: fix i2c pad masks on rs4xx
From: Alex Deucher <[email protected]>
commit be66305718bee9927e6acc6b75618ce3cd745718 upstream.
These got lost in the last i2c cleanup. Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=23222
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/radeon_combios.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -571,6 +571,7 @@ static struct radeon_i2c_bus_rec combios
}
if (clk_mask && data_mask) {
+ /* system specific masks */
i2c.mask_clk_mask = clk_mask;
i2c.mask_data_mask = data_mask;
i2c.a_clk_mask = clk_mask;
@@ -579,7 +580,19 @@ static struct radeon_i2c_bus_rec combios
i2c.en_data_mask = data_mask;
i2c.y_clk_mask = clk_mask;
i2c.y_data_mask = data_mask;
+ } else if ((ddc_line == RADEON_GPIOPAD_MASK) ||
+ (ddc_line == RADEON_MDGPIO_MASK)) {
+ /* default gpiopad masks */
+ i2c.mask_clk_mask = (0x20 << 8);
+ i2c.mask_data_mask = 0x80;
+ i2c.a_clk_mask = (0x20 << 8);
+ i2c.a_data_mask = 0x80;
+ i2c.en_clk_mask = (0x20 << 8);
+ i2c.en_data_mask = 0x80;
+ i2c.y_clk_mask = (0x20 << 8);
+ 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.a_clk_mask = RADEON_GPIO_A_1;
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.36/drm-radeon-kms-fix-regression-in-rs4xx-i2c-setup.patch
queue-2.6.36/drm-radeon-kms-fix-i2c-pad-masks-on-rs4xx.patch
queue-2.6.36/drm-radeon-kms-fix-2d-tile-height-alignment-in-the-r600-cs-checker.patch
queue-2.6.36/drm-radeon-kms-add-workaround-for-dce3-ddc-line-vbios-bug.patch
queue-2.6.36/drm-radeon-kms-fix-resume-regression-for-some-r5xx-laptops.patch
queue-2.6.36/drm-radeon-kms-fix-thermal-sensor-reporting-on-rv6xx.patch
queue-2.6.36/drm-radeon-kms-fix-interlaced-and-doublescan-handling.patch
queue-2.6.36/drm-radeon-kms-make-sure-blit-addr-masks-are-64-bit.patch
queue-2.6.36/drm-radeon-kms-register-an-i2c-adapter-name-for-the-dp-aux-bus.patch
queue-2.6.36/drm-radeon-kms-fix-handling-of-tex-lookup-disable-in-cs-checker-on-r2xx.patch
queue-2.6.36/drm-radeon-kms-properly-compute-group_size-on-6xx-7xx.patch
queue-2.6.36/drm-radeon-kms-mc-vram-map-needs-to-be-pci-aperture-size.patch
queue-2.6.36/drm-radeon-kms-atom-set-sane-defaults-in-atombios_get_encoder_mode.patch
queue-2.6.36/drm-radeon-kms-fix-typos-in-disabled-vbios-code.patch
queue-2.6.36/drm-radeon-kms-don-t-disable-shared-encoders-on-pre-dce3-display-blocks.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
