diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-01-28 13:06:02 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-01-28 13:06:02 -0300 |
| commit | 3113f649d07f25338e9897af2010d4099a2dc84d (patch) | |
| tree | 717cb8d65f7e94f1e0f4320f1cd31fbc7602e4d7 /patches | |
| parent | 9cc8f74123e7e4c5663109d2f16d8ae20eb8fa85 (diff) | |
| parent | 571039b294f41d0500dd5dd3a91233ef05504b35 (diff) | |
Merge https://projects.archlinux.org/git/linux-2.6-ARCH
Conflicts:
PATCHCFG
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/fix-i915.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/patches/fix-i915.patch b/patches/fix-i915.patch new file mode 100644 index 0000000..3b63136 --- /dev/null +++ b/patches/fix-i915.patch @@ -0,0 +1,26 @@ +Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> +Tested-by: Santi <santi@agolina.net> +--- + drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c +index dc83b7a..c8f67bf 100644 +--- a/drivers/gpu/drm/i915/intel_tv.c ++++ b/drivers/gpu/drm/i915/intel_tv.c +@@ -1267,6 +1267,15 @@ + DAC_B_0_7_V | + DAC_C_0_7_V); + ++ /* ++ * The TV sense state should be cleared to zero on cantiga platform. Otherwise ++ * the TV is misdetected. This is hardware requirement. ++ */ ++ if (IS_GM45(dev)) ++ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL | ++ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL); ++ ++ + I915_WRITE(TV_CTL, tv_ctl); + I915_WRITE(TV_DAC, tv_dac); + POSTING_READ(TV_DAC); |