[PULL] drm-intel-fixes

Daniel Vetter daniel at ffwll.ch
Wed May 8 05:17:28 PDT 2013


On Sat, May 04, 2013 at 08:11:25PM +0200, Daniel Vetter wrote:
> Hi Dave,
> 
> A few intel fixes for smaller issues and one revert for an sdv hack which
> we've wanted to kill anyway. Plus two drm patches included for your
> convenience, both regression fixers for mine own screw-ups.

I've smashed a few more fixes on top, both fixes for stolen mem handling.
-Daniel

The following changes since commit 43b27290dd42b40f3f23f49677a7faa5a4eb1eff:

  drm/i915: correct the calculation of first_pd_entry_in_global_pt (2013-04-27 14:07:16 +0200)

are available in the git repository at:

  git://people.freedesktop.org/~danvet/drm-intel for-linux-next

for you to fetch changes up to 1ffc5289bfcf7f4c4e4213240bb4be68c48ce603:

  drm/i915: clear the stolen fb before resuming (2013-05-07 22:25:11 +0200)

----------------------------------------------------------------
Ben Widawsky (1):
      Revert "drm/i915: Calculate correct stolen size for GEN7+"

Chris Wilson (1):
      drm/i915: Always normalize return timeout for wait_timeout_ioctl

Daniel Vetter (3):
      drm/mm: fix dump table BUG
      drm: don't check modeset locks in panic handler
      Revert "drm/i915: revert eDP bpp clamping code changes"

Imre Deak (1):
      drm/i915: hsw: fix link training for eDP on port-A

Jani Nikula (1):
      drm/i915: clear the stolen fb before resuming

Ville Syrjälä (1):
      drm/i915: Fix pipe enabled mask for pipe C in WM calculations

 drivers/gpu/drm/drm_crtc.c          |    4 ++
 drivers/gpu/drm/drm_mm.c            |   34 ++++++++--------
 drivers/gpu/drm/i915/i915_gem.c     |    8 ++--
 drivers/gpu/drm/i915/i915_gem_gtt.c |   15 +------
 drivers/gpu/drm/i915/i915_reg.h     |    2 -
 drivers/gpu/drm/i915/intel_ddi.c    |    5 +++
 drivers/gpu/drm/i915/intel_dp.c     |   77 ++++++++++++++++++++++-------------
 drivers/gpu/drm/i915/intel_drv.h    |    1 +
 drivers/gpu/drm/i915/intel_fb.c     |   16 +++++++-
 drivers/gpu/drm/i915/intel_pm.c     |   44 ++++++++++----------
 10 files changed, 116 insertions(+), 90 deletions(-)
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch


More information about the dri-devel mailing list