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)
commit2863b00941bc3062ea3299ed4057acfd9e52c335
treebf378837a55e57e4189e9877170fd2b0d288f587
parentfc3fed5d297b51f9e2c7d4f969c95c0d6e50ca57
parent36c9c3c91128e2b892c9be0dd9ee9bd82cbe82ad
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