Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next

Browse source

Just clearing out my -next queue before I go on vacation.  Two UVD
improvements that depend on the ttm change you just merged.

* 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: preallocate mem for UVD create/destroy msg
  drm/radeon: allow UVD to use a second 256MB segment

...

This commit is contained in:

Dave Airlie 2014-08-28 13:45:45 +10:00

parent 6adae108b2 feba9b0bcf

commit 04cd214516

3 changed files with 48 additions and 79 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/radeon/radeon.h

View file

5

drivers/gpu/drm/radeon/radeon_object.c

View file

119

drivers/gpu/drm/radeon/radeon_uvd.c

View file