]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
Catch up in general, and get DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT
specifically.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge