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

- first slice of the gvt device model (Zhenyu et al)
- compression support for gpu error states (Chris)
- sunset clause on gpu errors resulting in dmesg noise telling users
  how to report them
- .rodata diet from Tvrtko
- switch over lots of macros to only take dev_priv (Tvrtko)
- underrun suppression for dp link training (Ville)
- lspcon (hmdi 2.0 on skl/bxt) support from Shashank Sharma, polish
  from Jani
- gen9 wm fixes from Paulo&Lyude
- updated ddi programming for kbl (Rodrigo)
- respect alternate aux/ddc pins (from vbt) for all ddi ports (Ville)

* tag 'drm-intel-next-2016-10-24' of git://anongit.freedesktop.org/drm-intel: (227 commits)
  drm/i915: Update DRIVER_DATE to 20161024
  drm/i915: Stop setting SNB min-freq-table 0 on powersave setup
  drm/i915/dp: add lane_count check in intel_dp_check_link_status
  drm/i915: Fix whitespace issues
  drm/i915: Clean up DDI DDC/AUX CH sanitation
  drm/i915: Respect alternate_ddc_pin for all DDI ports
  drm/i915: Respect alternate_aux_channel for all DDI ports
  drm/i915/gen9: Remove WaEnableYV12BugFixInHalfSliceChicken7
  drm/i915: KBL - Recommended buffer translation programming for DisplayPort
  drm/i915: Move down skl/kbl ddi iboost and n_edp_entires fixup
  drm/i915: Add a sunset clause to GPU hang logging
  drm/i915: Stop reporting error details in dmesg as well as the error-state
  drm/i915/gvt: do not ignore return value of create_scratch_page
  drm/i915/gvt: fix spare warnings on odd constant _Bool cast
  drm/i915/gvt: mark symbols static where possible
  drm/i915/gvt: fix sparse warnings on different address spaces
  drm/i915/gvt: properly access enabled intel_engine_cs
  drm/i915/gvt: Remove defunct vmap_batch()
  drm/i915/gvt: Use common mapping routines for shadow_bb object
  drm/i915/gvt: Use common mapping routines for indirect_ctx object
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/i915/i915_debugfs.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/intel_display.c
index 4c21d2ec2c51b86206963fd56e63935d6bf70f22,6ccedf2af98e901553c5728ece7a80163b72acf3..6f8f6ec5b27a34a7c28d1b9f46719cd79c9c0706
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -14979,21 -15068,8 +15074,21 @@@ static struct drm_plane *intel_primary_
        if (ret)
                goto fail;
  
-       if (INTEL_GEN(dev) >= 9) {
 -      if (INTEL_INFO(dev)->gen >= 4)
 -              intel_create_rotation_property(dev, primary);
++      if (INTEL_GEN(dev_priv) >= 9) {
 +              supported_rotations =
 +                      DRM_ROTATE_0 | DRM_ROTATE_90 |
 +                      DRM_ROTATE_180 | DRM_ROTATE_270;
-       } else if (INTEL_GEN(dev) >= 4) {
++      } else if (INTEL_GEN(dev_priv) >= 4) {
 +              supported_rotations =
 +                      DRM_ROTATE_0 | DRM_ROTATE_180;
 +      } else {
 +              supported_rotations = DRM_ROTATE_0;
 +      }
 +
-       if (INTEL_GEN(dev) >= 4)
++      if (INTEL_GEN(dev_priv) >= 4)
 +              drm_plane_create_rotation_property(&primary->base,
 +                                                 DRM_ROTATE_0,
 +                                                 supported_rotations);
  
        drm_plane_helper_add(&primary->base, &intel_plane_helper_funcs);
  
@@@ -15101,6 -15196,6 +15197,7 @@@ intel_update_cursor_plane(struct drm_pl
  static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
                                                   int pipe)
  {
++      struct drm_i915_private *dev_priv = to_i915(dev);
        struct intel_plane *cursor = NULL;
        struct intel_plane_state *state = NULL;
        int ret;
@@@ -15132,11 -15227,17 +15229,11 @@@
        if (ret)
                goto fail;
  
-       if (INTEL_GEN(dev) >= 4)
 -      if (INTEL_INFO(dev)->gen >= 4) {
 -              if (!dev->mode_config.rotation_property)
 -                      dev->mode_config.rotation_property =
 -                              drm_mode_create_rotation_property(dev,
 -                                                      DRM_ROTATE_0 |
 -                                                      DRM_ROTATE_180);
 -              if (dev->mode_config.rotation_property)
 -                      drm_object_attach_property(&cursor->base.base,
 -                              dev->mode_config.rotation_property,
 -                              state->base.rotation);
 -      }
++      if (INTEL_GEN(dev_priv) >= 4)
 +              drm_plane_create_rotation_property(&cursor->base,
 +                                                 DRM_ROTATE_0,
 +                                                 DRM_ROTATE_0 |
 +                                                 DRM_ROTATE_180);
  
        if (INTEL_INFO(dev)->gen >=9)
                state->scaler_id = -1;

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

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

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

diff --cc drivers/gpu/drm/i915/intel_sprite.c
index 3ea6419e18b9878acc657ef5a3245332f70f80a3,e7d2cff8569d4c82d48bbb2052d6de0ab699aad8..43d0350856e7d933760e0e19541ae771d1d3a15f
--- 1/drivers/gpu/drm/i915/intel_sprite.c
--- 2/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@@ -1120,15 -1127,6 +1126,15 @@@ intel_plane_init(struct drm_device *dev
                goto fail;
        }
  
-       if (INTEL_GEN(dev) >= 9) {
++      if (INTEL_GEN(dev_priv) >= 9) {
 +              supported_rotations =
 +                      DRM_ROTATE_0 | DRM_ROTATE_90 |
 +                      DRM_ROTATE_180 | DRM_ROTATE_270;
 +      } else {
 +              supported_rotations =
 +                      DRM_ROTATE_0 | DRM_ROTATE_180;
 +      }
 +
        intel_plane->pipe = pipe;
        intel_plane->plane = plane;
        intel_plane->frontbuffer_bit = INTEL_FRONTBUFFER_SPRITE(pipe, plane);

diff --cc sound/soc/codecs/hdac_hdmi.c
Simple merge