From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 May 2013 14:59:59 +0000 (-0700)
Subject: Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.10-rc2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fea0f9ff56258734ff1c49008c36ef6904b8c541;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Just a few straggling fixes I hoovered up, and an intel fixes pull
  from Daniel which fixes some regressions, and some mgag200 fixes from
  Matrox."

* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
  drm/mgag200: Fix framebuffer base address programming
  drm/mgag200: Convert counter delays to jiffies
  drm/mgag200: Fix writes into MGA1064_PIX_CLK_CTL register
  drm/mgag200: Don't change unrelated registers during modeset
  drm: Only print a debug message when the polled connector has changed
  drm: Make the HPD status updates debug logs more readable
  drm: Use names of ioctls in debug traces
  drm: Remove pointless '-' characters from drm_fb_helper documentation
  drm: Add kernel-doc for drm_fb_helper_funcs->initial_config
  drm: refactor call to request_module
  drm: Don't prune modes loudly when a connector is disconnected
  drm: Add missing break in the command line mode parsing code
  drm/i915: clear the stolen fb before resuming
  Revert "drm/i915: Calculate correct stolen size for GEN7+"
  drm/i915: hsw: fix link training for eDP on port-A
  Revert "drm/i915: revert eDP bpp clamping code changes"
  drm: don't check modeset locks in panic handler
  drm/i915: Fix pipe enabled mask for pipe C in WM calculations
  drm/mm: fix dump table BUG
  drm/i915: Always normalize return timeout for wait_timeout_ioctl
---

fea0f9ff56258734ff1c49008c36ef6904b8c541
diff --cc drivers/gpu/drm/i915/intel_dp.c
index fb2fbc1,b14bec9..3d704b7
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -1953,10 -1962,19 +1962,19 @@@ intel_dp_complete_link_train(struct int
  		++tries;
  	}
  
+ 	intel_dp_set_idle_link_train(intel_dp);
+ 
+ 	intel_dp->DP = DP;
+ 
  	if (channel_eq)
 -		DRM_DEBUG_KMS("Channel EQ done. DP Training successfull\n");
 +		DRM_DEBUG_KMS("Channel EQ done. DP Training successful\n");
  
- 	intel_dp_set_link_train(intel_dp, DP, DP_TRAINING_PATTERN_DISABLE);
+ }
+ 
+ void intel_dp_stop_link_train(struct intel_dp *intel_dp)
+ {
+ 	intel_dp_set_link_train(intel_dp, intel_dp->DP,
+ 				DP_TRAINING_PATTERN_DISABLE);
  }
  
  static void