Merge tag 'drm-intel-next-2019-05-24' of git://anongit.freedesktop.org/drm/drm-intel...

Features:
- Engine discovery query (Tvrtko)
- Support for DP YCbCr4:2:0 outputs (Gwan-gyeong)
- HDCP revocation support, refactoring (Ramalingam)
- Remove DRM_AUTH from IOCTLs which also have DRM_RENDER_ALLOW (Christian König)
- Asynchronous display power disabling (Imre)
- Perma-pin uC firmware and re-enable global reset (Fernando)
- GTT remapping for display, for bigger fb size and stride (Ville)
- Enable pipe HDR mode on ICL if only HDR planes are used (Ville)
- Kconfig to tweak the busyspin durations for i915_wait_request (Chris)
- Allow multiple user handles to the same VM (Chris)
- GT/GEM runtime pm improvements using wakerefs (Chris)
- Gen 4&5 render context support (Chris)
- Allow userspace to clone contexts on creation (Chris)
- SINGLE_TIMELINE flags for context creation (Chris)
- Allow specification of parallel execbuf (Chris)

Refactoring:
- Header refactoring (Jani)
- Move GraphicsTechnology files under gt/ (Chris)
- Sideband code refactoring (Chris)

Fixes:
- ICL DSI state readout and checker fixes (Vandita)
- GLK DSI picture corruption fix (Stanislav)
- HDMI deep color fixes (Clinton, Aditya)
- Fix driver unbinding from a device in use (Janusz)
- Fix clock gating with pipe scaling (Radhakrishna)
- Disable broken FBC on GLK (Daniel Drake)
- Miscellaneous GuC fixes (Michal)
- Fix MG PHY DP register programming (Imre)
- Add missing combo PHY lane power setup (Imre)
- Workarounds for early ICL VBT issues (Imre)
- Fix fastset vs. pfit on/off on HSW EDP transcoder (Ville)
- Add readout and state check for pch_pfit.force_thru (Ville)
- Miscellaneous display fixes and refactoring (Ville)
- Display workaround fixes (Ville)
- Enable audio even if ELD is bogus (Ville)
- Fix use-after-free in reporting create.size (Chris)
- Sideband fixes to avoid BYT hard lockups (Chris)
- Workaround fixes and improvements (Chris)

Maintainer shortcomings:
- Failure to adequately describe and give credit for all changes (Jani)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87sgt3n45z.fsf@intel.com

diff --cc drivers/gpu/drm/Makefile
Simple merge

diff --cc drivers/gpu/drm/drm_atomic_uapi.c
index 125605ff45afd3a02b8e043cc4a9135db9ca5c23,4131e669785aeb5190e4e90cdab401959d2f65ed..eb22e8bdd8531245b2199a9be0222bd402e1f8e4
--- 1/drivers/gpu/drm/drm_atomic_uapi.c
--- 2/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@@ -823,10 -814,7 +823,10 @@@ drm_atomic_connector_get_property(struc
                *val = state->colorspace;
        } else if (property == connector->scaling_mode_property) {
                *val = state->scaling_mode;
-       } else if (property == connector->content_protection_property) {
 +      } else if (property == config->hdr_output_metadata_property) {
 +              *val = state->hdr_output_metadata ?
 +                      state->hdr_output_metadata->base.id : 0;
+       } else if (property == config->content_protection_property) {
                *val = state->content_protection;
        } else if (property == config->writeback_fb_id_property) {
                /* Writeback framebuffer is one-shot, write and forget */

diff --cc drivers/gpu/drm/drm_connector.c
Simple merge

diff --cc drivers/gpu/drm/drm_internal.h
Simple merge

diff --cc drivers/gpu/drm/i915/Kconfig
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/mmio_context.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/scheduler.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_execbuffer.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_vma.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_runtime_pm.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_sprite.c
Simple merge

diff --cc drivers/misc/mei/hdcp/mei_hdcp.c
Simple merge

diff --cc include/drm/drm_connector.h
Simple merge

diff --cc include/drm/drm_mode_config.h
index c031b5a9d8d1f0822a165edcc27fdb01a0edec66,5764ee3c7453e4f9f23b9fb96096207211cdca06..4f88cc9724077d89aee6f087b9359de066a67dd9
--- 1/include/drm/drm_mode_config.h
--- 2/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@@ -836,13 -836,12 +836,19 @@@ struct drm_mode_config 
         */
        struct drm_property *writeback_out_fence_ptr_property;
  
 +      /**
 +       * hdr_output_metadata_property: Connector property containing hdr
 +       * metatda. This will be provided by userspace compositors based
 +       * on HDR content
 +       */
 +      struct drm_property *hdr_output_metadata_property;
 +
+       /**
+        * @content_protection_property: DRM ENUM property for content
+        * protection. See drm_connector_attach_content_protection_property().
+        */
+       struct drm_property *content_protection_property;
+ 
        /* dumb ioctl parameters */
        uint32_t preferred_depth, prefer_shadow;