commit | fc16fc4d69d5f1b67d3d6ac97bd3b4e1cc3f74cc | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Thu Apr 16 08:00:06 2015 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Thu Apr 16 08:00:06 2015 +1000 |
tree | b91ebdc1c6621a8787b3994e45b5d8e02de5340e | |
parent | 665ae581ae82ed6a28980a32b9d37345db4eed32 [diff] | |
parent | 49ecb10e01c68b05dcb73005a54430c15caa05d0 [diff] |
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