Merge drm/drm-next into drm-intel-next
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 17 May 2021 21:48:02 +0000 (17:48 -0400)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 17 May 2021 21:48:02 +0000 (17:48 -0400)
commitd22fe808f9a3456f16015e79f1b86a10ce13099f
tree8e8c99d742696a810297d54d650f308f6156d466
parent1a7910368cba1e76b992b116fc8ba28503e6dcc1
parent6efb943b8616ec53a5e444193dccf1af9ad627b5
Merge drm/drm-next into drm-intel-next

Time to get back in sync...

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_pm.c
include/drm/drm_dp_helper.h