Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
authorSean Paul <seanpaul@chromium.org>
Thu, 18 May 2017 13:24:30 +0000 (09:24 -0400)
committerSean Paul <seanpaul@chromium.org>
Thu, 18 May 2017 13:24:30 +0000 (09:24 -0400)
commit6b7781b42dc9bc9bcd1523b6c24b876cdda0bef3
treeee55c67e4ea30b9eb44f301ba0bde2e631a26162
parent52d9d38c183bf0e09601d875ea31bb53c05dd8cf
parente98c58e55f68f8785aebfab1f8c9a03d8de0afe1
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next

Picking up drm-next @ 4.12-rc1 in order to apply Michal Hocko's vmalloc patch set

Signed-off-by: Sean Paul <seanpaul@chromium.org>
20 files changed:
drivers/gpu/drm/amd/amdgpu/amdgpu.h
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/amd/amdgpu/ci_dpm.c
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
drivers/gpu/drm/amd/amdgpu/dce_virtual.c
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
drivers/gpu/drm/amd/amdgpu/soc15.c
drivers/gpu/drm/radeon/cik.c
drivers/gpu/drm/sti/sti_compositor.c