From: Dave Airlie <airlied@redhat.com>
Date: Tue, 1 Jun 2010 01:32:06 +0000 (+1000)
Subject: Merge branch 'drm-vmware-fixes' into drm-testing
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c09a35028567ae2c11d627bf69134b87a3c0efae;p=linux-beck.git

Merge branch 'drm-vmware-fixes' into drm-testing

* drm-vmware-fixes:
  drm/vmwgfx: Remove some leftover debug messages.
  drm/vmwgfx: Print warnings in kernel log about bo pinning that fails.
  drm/vmwgfx: Unpause overlay on update.
  drm/vmwgfx: Some modesetting cleanups and fixes.
  drm/vmwgfx: Don't use SVGA_REG_ENABLE in modesetting code.
  drm/vmwgfx: Remove duplicate member from struct vmw_legacy_display_unit.
  drm/vmwgfx: Reserve first part of VRAM for framebuffer.
  drm/vmwgfx: Support older hardware.
  drm/vmwgfx: Get connector status from detection function.
  drm/vmwgfx: Add kernel throttling support. Bump minor.
  drm/vmwgfx: Make sure to unpin old and pin new framebuffer.
  drm/vmwgfx: Fix single framebuffer detection.
  drm/vmwgfx: Assume larger framebuffer max size.
---

c09a35028567ae2c11d627bf69134b87a3c0efae