diff options
author | Dave Airlie <airlied@redhat.com> | 2016-04-29 14:31:44 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-04-29 14:31:44 +1000 |
commit | ea99697814d6e64927e228675a6eb7fa76014648 (patch) | |
tree | 21c53ff0b9cb0e4f13729164aa25ef65763be548 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
parent | d8ba5d60d59fd1db5b53c8a110c2f8321591a9d8 (diff) | |
parent | afc4542105f2b5a3bc6f0f3530d7ccbc94ca90fb (diff) |
Merge branch 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
A few fixes for 4.6.
- revert amdgpu PX commit that was previously reverted on the radeon side
- cleaned up version of the NI+ MC update display fix for radeon
- TTM kref fix
* 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: disable vm interrupts with vm_fault_stop=2
drm/amdgpu: print a message if ATPX dGPU power control is missing
Revert "drm/amdgpu: disable runtime pm on PX laptops without dGPU power control"
drm/radeon: fix vertical bars appear on monitor (v2)
drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
0 files changed, 0 insertions, 0 deletions