From 670aceacef9a254cec2f0e019d386f870cdfbbdb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 18 Nov 2011 14:25:38 -0800 Subject: [PATCH] delete drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch from 3.0 and 3.1 --- ...s-fix-up-gpio-i2c-mask-bits-for-r4xx.patch | 44 ------------------- queue-3.0/series | 1 - ...s-fix-up-gpio-i2c-mask-bits-for-r4xx.patch | 44 ------------------- queue-3.1/series | 1 - 4 files changed, 90 deletions(-) delete mode 100644 queue-3.0/drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch delete mode 100644 queue-3.1/drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch diff --git a/queue-3.0/drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch b/queue-3.0/drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch deleted file mode 100644 index fd0cd2b4375..00000000000 --- a/queue-3.0/drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6c47e5c23aa2a7c54ad7ac13af4bd56cd9e703bf Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Mon, 14 Nov 2011 14:32:01 -0500 -Subject: drm/radeon/kms: fix up gpio i2c mask bits for r4xx - -From: Alex Deucher - -commit 6c47e5c23aa2a7c54ad7ac13af4bd56cd9e703bf upstream. - -Fixes i2c test failures when i2c_algo_bit.bit_test=1. - -The hw doesn't actually require a mask, so just set it -to the default mask bits for r1xx-r4xx radeon ddc. - -Signed-off-by: Alex Deucher -Cc: Jean Delvare -Signed-off-by: Dave Airlie -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/radeon/radeon_atombios.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/drivers/gpu/drm/radeon/radeon_atombios.c -+++ b/drivers/gpu/drm/radeon/radeon_atombios.c -@@ -85,6 +85,18 @@ static inline struct radeon_i2c_bus_rec - for (i = 0; i < num_indices; i++) { - gpio = &i2c_info->asGPIO_Info[i]; - -+ /* r4xx mask is technically not used by the hw, so patch in the legacy mask bits */ -+ if ((rdev->family == CHIP_R420) || -+ (rdev->family == CHIP_R423) || -+ (rdev->family == CHIP_RV410)) { -+ if ((le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x0018) || -+ (le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x0019) || -+ (le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x001a)) { -+ gpio->ucClkMaskShift = 0x19; -+ gpio->ucDataMaskShift = 0x18; -+ } -+ } -+ - /* some evergreen boards have bad data for this entry */ - if (ASIC_IS_DCE4(rdev)) { - if ((i == 7) && diff --git a/queue-3.0/series b/queue-3.0/series index ebbbfa0b5cd..fa3983eb01b 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -11,7 +11,6 @@ keys-fix-a-null-pointer-deref-in-the-user-defined-key-type.patch hfs-add-sanity-check-for-file-name-length.patch revert-leds-save-the-delay-values-after-a-successful-call-to-blink_set.patch drm-radeon-add-some-missing-firemv-pci-ids.patch -drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch drm-i915-enable-ring-freq-scaling-rc6-and-graphics-turbo-on-ivy-bridge-v3.patch sfi-table-irq-0xff-means-no-interrupt.patch x86-mrst-use-a-temporary-variable-for-sfi-irq.patch diff --git a/queue-3.1/drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch b/queue-3.1/drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch deleted file mode 100644 index fd0cd2b4375..00000000000 --- a/queue-3.1/drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6c47e5c23aa2a7c54ad7ac13af4bd56cd9e703bf Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Mon, 14 Nov 2011 14:32:01 -0500 -Subject: drm/radeon/kms: fix up gpio i2c mask bits for r4xx - -From: Alex Deucher - -commit 6c47e5c23aa2a7c54ad7ac13af4bd56cd9e703bf upstream. - -Fixes i2c test failures when i2c_algo_bit.bit_test=1. - -The hw doesn't actually require a mask, so just set it -to the default mask bits for r1xx-r4xx radeon ddc. - -Signed-off-by: Alex Deucher -Cc: Jean Delvare -Signed-off-by: Dave Airlie -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/radeon/radeon_atombios.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/drivers/gpu/drm/radeon/radeon_atombios.c -+++ b/drivers/gpu/drm/radeon/radeon_atombios.c -@@ -85,6 +85,18 @@ static inline struct radeon_i2c_bus_rec - for (i = 0; i < num_indices; i++) { - gpio = &i2c_info->asGPIO_Info[i]; - -+ /* r4xx mask is technically not used by the hw, so patch in the legacy mask bits */ -+ if ((rdev->family == CHIP_R420) || -+ (rdev->family == CHIP_R423) || -+ (rdev->family == CHIP_RV410)) { -+ if ((le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x0018) || -+ (le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x0019) || -+ (le16_to_cpu(gpio->usClkMaskRegisterIndex) == 0x001a)) { -+ gpio->ucClkMaskShift = 0x19; -+ gpio->ucDataMaskShift = 0x18; -+ } -+ } -+ - /* some evergreen boards have bad data for this entry */ - if (ASIC_IS_DCE4(rdev)) { - if ((i == 7) && diff --git a/queue-3.1/series b/queue-3.1/series index e826a02628e..6b19103f9e9 100644 --- a/queue-3.1/series +++ b/queue-3.1/series @@ -13,7 +13,6 @@ keys-fix-a-null-pointer-deref-in-the-user-defined-key-type.patch hfs-add-sanity-check-for-file-name-length.patch revert-leds-save-the-delay-values-after-a-successful-call-to-blink_set.patch drm-radeon-add-some-missing-firemv-pci-ids.patch -drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch staging-brcm80211-fill-in-proper-rx-rate-in-mac80211-rx-status.patch b43-refuse-to-load-unsupported-firmware.patch mfd-fix-twl4030-dependencies-for-audio-codec.patch -- 2.47.3