Skip to content
Commit fc16fc4d authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Some final bits for 4.1.  Some fixes for userptrs and allow a new
packet for VCE to enable some new features in mesa.

* 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: allow creating overlapping userptrs
  drm/radeon: add userptr config option
  drm/radeon: add video usability info support for VCE
parents 665ae581 49ecb10e
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment