Merge drm/drm-next into drm-intel-next-queued
authorJani Nikula <jani.nikula@intel.com>
Thu, 9 Jan 2020 15:19:12 +0000 (17:19 +0200)
committerJani Nikula <jani.nikula@intel.com>
Thu, 9 Jan 2020 15:19:12 +0000 (17:19 +0200)
commitec027b33c8bb164430224ce1f5cb733036b20d3f
tree1f12e08a45ebed8c6fc34948b54f53da621c8976
parent6251215fe56c39e07de8bcb3a5ecb19a80ef423e
parenta566696cf9f27f701cd4a6426d46f112c180059c
Merge drm/drm-next into drm-intel-next-queued

Sync with drm-next to get the new logging macros, among other things.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c