Merge drm/drm-next into drm-intel-next-queued
authorJani Nikula <jani.nikula@intel.com>
Fri, 15 Nov 2019 11:17:39 +0000 (13:17 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 15 Nov 2019 11:17:39 +0000 (13:17 +0200)
commite205ceeb253723f4e4bdce619844ed678ae48276
treeb6f5e3b21f915320a86733504faf8206569b8057
parent1cdc2330e8d396c9cbebfc75fba4c94d34f80782
parent17cc51390c141662748dbbc2fe98f3ed10f2e13e
Merge drm/drm-next into drm-intel-next-queued

Backmerge to get dfce90259d74 ("Backmerge i915 security patches from
commit 'ea0b163b13ff' into drm-next") and thus 100d46bd72ec ("Merge
Intel Gen8/Gen9 graphics fixes from Jon Bloomfield.").

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
12 files changed:
drivers/gpu/drm/Kconfig
drivers/gpu/drm/i915/Kconfig.debug
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/i915/display/intel_dp_mst.c
drivers/gpu/drm/i915/gem/i915_gem_context.c
drivers/gpu/drm/i915/gem/i915_gem_context_types.h
drivers/gpu/drm/i915/gt/intel_rc6.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_pm.c