Merge drm/drm-next into drm-intel-next-queued
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 10 Jul 2019 13:51:35 +0000 (06:51 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 10 Jul 2019 13:51:35 +0000 (06:51 -0700)
commit88c90e800675b98008d5ebe5e81245910417a22d
treeeb06c935cc3363a284382fce1f6721f3a862654e
parentcaceff96d5b7b487da19c0916e0048ff8f1709a9
parent4cf643a39221af24a151ad2cff4e3f95f12f368e
Merge drm/drm-next into drm-intel-next-queued

Catch-up with 5.2. Specially to remove a drm-tip merge
fixup around intel_workarounds.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/display/intel_sdvo.c
drivers/gpu/drm/i915/gt/intel_workarounds.c
drivers/gpu/drm/i915/i915_reg.h