[git pull] drm fixes

Dave Airlie airlied at linux.ie
Wed Dec 14 09:27:15 PST 2011


Hi Linus,

simple one just one pci ids patch from Alex,

I know Keith has some patches outstanding in his queue and I know they are 
probably more than you'll want to merge at this point, I'm off until next 
week, so Keith if you do send a pull request you may as well send to 
Linus, since I know Linus can be more lenient on pulls which make the hw 
he uses suck less :-)

The following changes since commit 45e713efe2fa574b6662e7fb63fae9497c5e03d4:

  Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2011-12-05 16:54:15 -0800)

are available in the git repository at:

  git://people.freedesktop.org/~airlied/linux drm-fixes

Alex Deucher (1):
      drm/radeon/kms: fix return type for radeon_encoder_get_dp_bridge_encoder_id

Daniel Vetter (1):
      drm/i915: fix infinite recursion on unbind due to ilk vt-d w/a

Thomas Meyer (1):
      vmwgfx: Use kcalloc instead of kzalloc to allocate array

 drivers/gpu/drm/i915/i915_gem.c          |    7 ++++++-
 drivers/gpu/drm/radeon/radeon_encoders.c |    7 +++----
 drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c    |    4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)


More information about the dri-devel mailing list