Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <maxime@cerno.tech>
Wed, 13 Jul 2022 08:33:00 +0000 (10:33 +0200)
committerMaxime Ripard <maxime@cerno.tech>
Wed, 13 Jul 2022 08:33:00 +0000 (10:33 +0200)
commit4de395f2c632c31c575f72d49d4f4389c99dab68
tree29abd2c05c697f2d6bde19c10064c49246253828
parentbbd60fee2d2166b2b8722cbad740996ef2e7ce40
parent0180290abb5ce5c870f84a00ffeda5802f641dce
Merge drm/drm-next into drm-misc-next

I need to have some vc4 patches merged in -rc4, but drm-misc-next is
only at -rc2 for now.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/vc4/vc4_hdmi.c
include/uapi/drm/drm_fourcc.h