Merge drm/drm-next into drm-intel-next-queued
authorJani Nikula <jani.nikula@intel.com>
Wed, 26 Sep 2018 08:24:04 +0000 (11:24 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 26 Sep 2018 08:24:04 +0000 (11:24 +0300)
commitaea408caf8cdaa1160e6cecde30be9395473fde4
treebf378837a55e57e4189e9877170fd2b0d288f587
parent099ac5c8840df1a5e00b73468fbe29f6fe98a65f
parent190b174f218b928ca3c2500eebe0cf547e7a7075
Merge drm/drm-next into drm-intel-next-queued

Catch up in general, and get DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT
specifically.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gpu_error.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h