]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commiteb4dfd3540a54db4be2adbf739351b93278da9f8
treeb6f5e3b21f915320a86733504faf8206569b8057
parentdf54fe2e55f7ff21f684eb3ee7498746ed9e5dee
parent545e92a72955236691175d7db06725ed17ba34e4
Merge drm/drm-next into drm-intel-next-queued

Backmerge to get 03f40b8046c8 ("Backmerge i915 security patches from
commit '826035bbac8f' into drm-next") and thus 5a861c95b538 ("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