Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next

Browse source

-next reported a messy merge, so I've merged my upstream pull into
my -next tree.

Conflicts:
	drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

...

This commit is contained in:

Dave Airlie 2011-12-21 09:50:56 +00:00

parent 3e54f5b72b 6abff3c780

commit 4cf73129cb

41 changed files with 1943 additions and 411 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

5

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

View file

8

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c

View file

14

drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c

View file

388

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

View file

5

drivers/gpu/drm/vmwgfx/vmwgfx_kms.h

View file

22

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

View file

23

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

View file