Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes

Browse source

A couple of fixes. The biggest thing is the DMA buffer accounting that was
incorrect.

* 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Add our connectors to sysfs
  drm/vmwgfx: Fix dma buffer memory size accounting
  drm/vmwgfx: Fix up and comment the dumb buffer implementation
  drm/vmwgfx: Correctly set the enabled state on crtcs

...

This commit is contained in:

Dave Airlie 2013-12-05 09:18:25 +10:00

parent 8ecffd7914 6a0a7a9ead

commit 10c028e94e

6 changed files with 94 additions and 37 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

2

drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c

View file

1

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

View file

1

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

View file

4

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

View file

118

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

View file

5

drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

View file