Merge drm/drm-next into drm-intel-next-queued
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 22 Jan 2019 22:51:36 +0000 (14:51 -0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 22 Jan 2019 22:51:36 +0000 (14:51 -0800)
commitf42fb2317ffcbd005eeb22b1e49020821a11e23a
treed89ccd0c9086c492a32da7ce4c2486c99ed3e805
parent25f9cebd7a52ddf15405d74fb5fd4c374f301983
parentf164a94c2c87752caeb1a3cbe068c440e7f7921f
Merge drm/drm-next into drm-intel-next-queued

We need avi infoframe stuff who got merged via drm-misc

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
14 files changed:
drivers/gpu/drm/drm_dp_helper.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_gem_context.c
drivers/gpu/drm/i915/i915_request.c
drivers/gpu/drm/i915/intel_connector.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp_mst.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_engine_cs.c
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/i915/intel_lrc.c
drivers/gpu/drm/i915/intel_lspcon.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/i915/selftests/intel_hangcheck.c