Merge branch 'drm-vmware-next' into drm-core-next

Browse source

* drm-vmware-next:
  drm/vmwgfx: Bump minor and driver date
  drm/vmwgfx: Save at least one screen layout
  drm/vmwgfx: Add modinfo version
  drm/vmwgfx: Add a parameter to get the max fb size
  drm/vmwgfx: Don't flush fb if we're in the suspended state.
  drm/vmwgfx: Prune modes based on available VRAM size
  drm/vmwgfx: Take the ttm lock around the dirty ioctl
  drm: vmwgfx: Add a struct drm_file parameter to the dirty framebuffer callback
  drm/vmwgfx: Add new-style PM hooks to improve hibernation behavior
  drm/vmwgfx: Fix ACPI S3 & S4 functionality.
  drm/vmwgfx: Really support other depths than 32

...

This commit is contained in:

Dave Airlie 2010-10-06 11:47:56 +10:00

parent fb7ba2114b 8aea528736

commit e6b46ee712

9 changed files with 318 additions and 53 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/gpu/drm/drm_crtc.c

View file

112

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

View file

11

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

View file

10

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

View file

3

drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c

View file

200

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

View file

28

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

View file

3

include/drm/drm_crtc.h

View file

1

include/drm/vmwgfx_drm.h

View file