OSDN Git Service

Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <maxime@cerno.tech>
Mon, 25 Oct 2021 13:27:56 +0000 (15:27 +0200)
committerMaxime Ripard <maxime@cerno.tech>
Mon, 25 Oct 2021 13:27:56 +0000 (15:27 +0200)
commit736638246ec215f999dd132334d2d7c49bcb85c7
tree6c79e96f8dccb0514d918cf279915695ffb3aeea
parent525bbf72dbe0004a009dc39b239dec74e8007f6f
parent6f2f7c83303d2227f47551423e507d77d9ea01c7
Merge drm/drm-next into drm-misc-next

drm-misc-next hasn't been updated in a while and I need a post -rc2
state to merge some vc4 patches.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
drivers/gpu/drm/drm_dp_helper.c
drivers/gpu/drm/drm_modeset_lock.c
drivers/gpu/drm/i915/i915_request.c
include/drm/drm_connector.h
include/drm/drm_dp_helper.h
include/linux/dma-resv.h