OSDN Git Service

Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <maxime@cerno.tech>
Mon, 26 Apr 2021 12:03:09 +0000 (14:03 +0200)
committerMaxime Ripard <maxime@cerno.tech>
Mon, 26 Apr 2021 12:03:09 +0000 (14:03 +0200)
commit355b60296143a090039211c5f0e1463f84aab65a
treeb74d4ef2aea66252ea9cf77c847de6c6e72a02b7
parent91185d55b32e7e377f15fb46a62b216f8d3038d4
parenta1a1ca70deb3ec600eeabb21de7f3f48aaae5695
Merge drm/drm-next into drm-misc-next

Christian needs some patches from drm/next

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
15 files changed:
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
drivers/gpu/drm/bridge/Kconfig
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/imx/imx-drm-core.c
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/tegra/dc.c
include/drm/ttm/ttm_bo_api.h