Message ID | 1377291023-22350-1-git-send-email-imre.deak@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Aug 23, 2013 at 11:50:23PM +0300, Imre Deak wrote: > Fix the typo introduced in > > commit 1a2eb4604b85c5efb343da8a4dcf41288fcfca85 > Author: Keith Packard <keithp@keithp.com> > Date: Wed Nov 16 16:26:07 2011 -0800 > > drm/i915: Hook up Ivybridge eDP > > This fixes eDP link-training failures and cases where all voltage swing > /pre-emphasis levels were tried and failed during clock recovery and - > as a fallback - we go on to do channel equalization with the last voltage > swing/pre-emphasis level which will succeed. Both issues can lead to a > blank screen. > > v2: > - improve commit message > > CC: stable@vger.kernel.org > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64880 > Tested-by: Jeremy Moles <cubicool@gmail.com> > Signed-off-by: Imre Deak <imre.deak@intel.com> Picked up for -fixes, thanks for the patch. Although I've frobbed the commit message a bit more and dropped the "typo" part. Since patches with "typo" headlines really don't belong into post -rc6 pull requests ;-) -Daniel
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 2b96d6b..019fd1f 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4525,7 +4525,7 @@ #define EDP_LINK_TRAIN_600MV_0DB_IVB (0x30 <<22) #define EDP_LINK_TRAIN_600MV_3_5DB_IVB (0x36 <<22) #define EDP_LINK_TRAIN_800MV_0DB_IVB (0x38 <<22) -#define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x33 <<22) +#define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x3e <<22) /* legacy values */ #define EDP_LINK_TRAIN_500MV_0DB_IVB (0x00 <<22)