From 571039b294f41d0500dd5dd3a91233ef05504b35 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 27 Jan 2011 22:59:45 +0100 Subject: add i915 patch to fix #19234 --- PATCHCFG | 5 ++++- patches/fix-i915.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 patches/fix-i915.patch diff --git a/PATCHCFG b/PATCHCFG index c5e3f25..cd496b8 100644 --- a/PATCHCFG +++ b/PATCHCFG @@ -18,13 +18,16 @@ PATCHES=( # fix #22343 udev crashes libata-alignment-2.6.37.patch%1 + # fix #19234 i1915 display size + fix-i915.patch%1 + # add aufs2 support, in reference to: # http://aufs.sourceforge.net aufs2-base-20110124.patch%1 aufs2-standalone-20110124.patch%1 ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.37-2-ARCH" +PATCHNAME="patch-2.6.37-4-ARCH" # Run this before applying patches pre_apply() { 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 +Tested-by: Santi +--- + 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); -- cgit v1.2.3