Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <maxime.ripard@bootlin.com>
Mon, 11 Feb 2019 09:35:35 +0000 (10:35 +0100)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Mon, 11 Feb 2019 09:35:35 +0000 (10:35 +0100)
commitd588100baa28dae6a5c32d02bfe744d0792ed2ad
tree3be3984cea35a07b4259f8ebe55ce0e52e416d1c
parent7bd0a3271e239d34bae5fa51e4f44ed9ee861a59
parent16065fcdd19ddb9e093192914ac863884f308766
Merge drm/drm-next into drm-misc-next

We need to backmerge drm-next to fix the komeda build failure.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_atomic.c
drivers/gpu/drm/i915/intel_atomic_plane.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp_mst.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/rcar-du/rcar_du_crtc.c
drivers/gpu/drm/rcar-du/rcar_du_kms.c
include/drm/ttm/ttm_bo_driver.h
include/uapi/drm/drm_fourcc.h