commit | 4604202ca8d2a5e33b4bca0812b5d92975ed1bd8 | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Fri Mar 25 16:02:06 2016 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Fri Mar 25 16:02:06 2016 +1000 |
tree | 520ea356b99bf0e8b314bafd1f09d0967fb3cd0a | |
parent | 17efca93c8728445522dedafc033b3384a26a39d [diff] | |
parent | 1135035d9275ef9aecad23fc715a69ff78904adf [diff] |
Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-next some amd fixes * 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux: drm/radeon/mst: cleanup code indentation drm/radeon/mst: fix regression in lane/link handling. drm/amdgpu: add invalidate_page callback for userptrs drm/amdgpu: Revert "remove the userptr rmn->lock" drm/amdgpu: clean up path handling for powerplay drm/amd/powerplay: fix memory leak of tdp_table