Merge v5.4-rc7 into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 13 Nov 2019 19:53:10 +0000 (05:53 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 13 Nov 2019 19:53:10 +0000 (05:53 +1000)
commit77e0723bd27f830d0903225372aa778fe2975648
tree4c035783e014b3a0ac9174390f88dc75150533e4
parent3ca3a9eab7085b3c938b5d088c3020269cfecdc8
parent31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c
Merge v5.4-rc7 into drm-next

We have the i915 security fixes to backmerge, but first
let's clear the decks for other drivers to avoid a bigger
mess.

Signed-off-by: Dave Airlie <airlied@redhat.com>
21 files changed:
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
drivers/gpu/drm/amd/amdgpu/soc15.c
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
drivers/gpu/drm/amd/display/dc/dcn21/Makefile
drivers/gpu/drm/amd/powerplay/navi10_ppt.c
drivers/gpu/drm/amd/powerplay/vega20_ppt.c
drivers/gpu/drm/arm/display/komeda/komeda_kms.c
drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/panfrost/panfrost_drv.c
drivers/gpu/drm/v3d/v3d_gem.c
include/drm/drm_gem_shmem_helper.h