Merge drm/drm-next into drm-misc-next

Christian needs some patches from drm/next

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 485f249d063a720bcd60af782086166b55653d57,1345f7eba011bf49414b4d46f8123a1b36ec7126..fe4e5880509d0a6acf494b9f58bb8ffed83370b0
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@@ -56,7 -77,11 +56,8 @@@ static void amdgpu_bo_destroy(struct tt
  {
        struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
        struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo);
+       struct amdgpu_bo_user *ubo;
  
 -      if (bo->tbo.pin_count > 0)
 -              amdgpu_bo_subtract_pin_size(bo);
 -
        amdgpu_bo_kunmap(bo);
  
        if (bo->tbo.base.import_attach)

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
Simple merge

diff --cc drivers/gpu/drm/bridge/Kconfig
Simple merge

diff --cc drivers/gpu/drm/drm_atomic.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
index e1ae7b804c0146e40172cafb37a012e3289d10c9,c2329bc44f558d533784a33b1788e8d0655e0498..7fe7bc4d6ca90764673b69708d028a5421f7ca94
--- 1/drivers/gpu/drm/i915/i915_drv.c
--- 2/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -38,9 -38,7 +38,8 @@@
  #include <linux/slab.h>
  #include <linux/vga_switcheroo.h>
  #include <linux/vt.h>
- #include <acpi/video.h>
  
 +#include <drm/drm_aperture.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_ioctl.h>
  #include <drm/drm_irq.h>

diff --cc drivers/gpu/drm/imx/imx-drm-core.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_bo.c
Simple merge

diff --cc drivers/gpu/drm/tegra/dc.c
Simple merge

diff --cc include/drm/ttm/ttm_bo_api.h
Simple merge