Merge tag 'drm-misc-next-2016-11-29' of git://anongit.freedesktop.org/git/drm-misc...

Big thing is that drm-misc is now officially a group maintainer/committer
model thing, with MAINTAINERS suitably updated. Otherwise just the usual
pile of misc things all over, nothing that stands out this time around.

* tag 'drm-misc-next-2016-11-29' of git://anongit.freedesktop.org/git/drm-misc: (33 commits)
  drm: Introduce drm_framebuffer_assign()
  drm/bridge: adv7511: Enable the audio data and clock pads on adv7533
  drm/bridge: adv7511: Add Audio support
  drm/edid: Consider alternate cea timings to be the same VIC
  drm/atomic: Constify drm_atomic_crtc_needs_modeset()
  drm: bridge: dw-hdmi: add ASoC dependency
  drm: Fix shift operations for drm_fb_helper::drm_target_preferred()
  drm: Avoid NULL dereference for DRM_LEGACY debug message
  drm: Use u64_to_user_ptr() helper for blob ioctls
  drm: Fix conflicting macro parameter in drm_mm_for_each_node_in_range()
  drm: Fixup kernel doc for driver->gem_create_object
  drm/hisilicon/hibmc: mark PM functions __maybe_unused
  drm/hisilicon/hibmc: Checking for NULL instead of IS_ERR()
  drm: bridge: add DesignWare HDMI I2S audio support
  drm: Check against color expansion in drm_mm_reserve_node()
  drm: Define drm_mm_for_each_node_in_range()
  drm/doc: Fix links in drm_property.c
  MAINTAINERS: Add link to drm-misc documentation
  vgaarb: use valid dev pointer in vgaarb_info()
  drm/atomic: Unconfuse the old_state mess in commmit_tail
  ...

diff --cc MAINTAINERS
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/i915/intel_display.c
index 8d270f7650de98223eb10aa4009010f68c99369c,c63ba7f435bb933a15298afea867648689cb43e1..b7a7ed82c325ea30f20e7479f9306b70c29904ad
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -3059,15 -3067,9 +3059,15 @@@ static void i9xx_update_primary_plane(s
        }
  
        if (INTEL_GEN(dev_priv) >= 4 &&
-           fb->modifier[0] == I915_FORMAT_MOD_X_TILED)
+           fb->modifier == I915_FORMAT_MOD_X_TILED)
                dspcntr |= DISPPLANE_TILED;
  
 +      if (rotation & DRM_ROTATE_180)
 +              dspcntr |= DISPPLANE_ROTATE_180;
 +
 +      if (rotation & DRM_REFLECT_X)
 +              dspcntr |= DISPPLANE_MIRROR;
 +
        if (IS_G4X(dev_priv))
                dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
  
@@@ -3170,12 -3169,9 +3170,12 @@@ static void ironlake_update_primary_pla
                BUG();
        }
  
-       if (fb->modifier[0] == I915_FORMAT_MOD_X_TILED)
+       if (fb->modifier == I915_FORMAT_MOD_X_TILED)
                dspcntr |= DISPPLANE_TILED;
  
 +      if (rotation & DRM_ROTATE_180)
 +              dspcntr |= DISPPLANE_ROTATE_180;
 +
        if (!IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv))
                dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
  
@@@ -8704,10 -8727,10 +8704,10 @@@ i9xx_get_initial_plane_config(struct in
  
        fb = &intel_fb->base;
  
 -      if (INTEL_INFO(dev)->gen >= 4) {
 +      if (INTEL_GEN(dev_priv) >= 4) {
                if (val & DISPPLANE_TILED) {
                        plane_config->tiling = I915_TILING_X;
-                       fb->modifier[0] = I915_FORMAT_MOD_X_TILED;
+                       fb->modifier = I915_FORMAT_MOD_X_TILED;
                }
        }
  
@@@ -9846,10 -9871,10 +9846,10 @@@ ironlake_get_initial_plane_config(struc
  
        fb = &intel_fb->base;
  
 -      if (INTEL_INFO(dev)->gen >= 4) {
 +      if (INTEL_GEN(dev_priv) >= 4) {
                if (val & DISPPLANE_TILED) {
                        plane_config->tiling = I915_TILING_X;
-                       fb->modifier[0] = I915_FORMAT_MOD_X_TILED;
+                       fb->modifier = I915_FORMAT_MOD_X_TILED;
                }
        }
  

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

diff --cc drivers/gpu/drm/i915/intel_pm.c
index e207dc69e8b39ff27c5ed4d5384ec648c8be3b55,6f516491a1720c2822e28e08e2099885d8ec3bba..bbb1eaf1e6db0fc5b02afc75aa31377d5cf037bb
--- 1/drivers/gpu/drm/i915/intel_pm.c
--- 2/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -3632,12 -3624,9 +3632,12 @@@ static int skl_compute_plane_wm(const s
                y_min_scanlines = 4;
        }
  
 +      if (apply_memory_bw_wa)
 +              y_min_scanlines *= 2;
 +
        plane_bytes_per_line = width * cpp;
-       if (fb->modifier[0] == I915_FORMAT_MOD_Y_TILED ||
-           fb->modifier[0] == I915_FORMAT_MOD_Yf_TILED) {
+       if (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
+           fb->modifier == I915_FORMAT_MOD_Yf_TILED) {
                plane_blocks_per_line =
                      DIV_ROUND_UP(plane_bytes_per_line * y_min_scanlines, 512);
                plane_blocks_per_line /= y_min_scanlines;
@@@ -3655,9 -3644,11 +3655,9 @@@
                                 plane_blocks_per_line);
  
        y_tile_minimum = plane_blocks_per_line * y_min_scanlines;
 -      if (apply_memory_bw_wa)
 -              y_tile_minimum *= 2;
  
-       if (fb->modifier[0] == I915_FORMAT_MOD_Y_TILED ||
-           fb->modifier[0] == I915_FORMAT_MOD_Yf_TILED) {
+       if (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
+           fb->modifier == I915_FORMAT_MOD_Yf_TILED) {
                selected_result = max(method2, y_tile_minimum);
        } else {
                if ((cpp * cstate->base.adjusted_mode.crtc_htotal / 512 < 1) &&

diff --cc drivers/gpu/drm/i915/intel_sprite.c
index c2b629c922e7fb8e516eaa78d6e433b4d2ee586d,ca02855435d92fe9ad8e867941d58c851a51feb2..8f131a08d440cf02cbcd9ffe255b94e3f4eb6077
--- 1/drivers/gpu/drm/i915/intel_sprite.c
--- 2/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@@ -406,15 -424,9 +406,15 @@@ vlv_update_plane(struct drm_plane *dpla
         */
        sprctl |= SP_GAMMA_ENABLE;
  
-       if (fb->modifier[0] == I915_FORMAT_MOD_X_TILED)
+       if (fb->modifier == I915_FORMAT_MOD_X_TILED)
                sprctl |= SP_TILED;
  
 +      if (rotation & DRM_ROTATE_180)
 +              sprctl |= SP_ROTATE_180;
 +
 +      if (rotation & DRM_REFLECT_X)
 +              sprctl |= SP_MIRROR;
 +
        /* Sizes are 0 based */
        src_w--;
        src_h--;
@@@ -531,12 -543,9 +531,12 @@@ ivb_update_plane(struct drm_plane *plan
         */
        sprctl |= SPRITE_GAMMA_ENABLE;
  
-       if (fb->modifier[0] == I915_FORMAT_MOD_X_TILED)
+       if (fb->modifier == I915_FORMAT_MOD_X_TILED)
                sprctl |= SPRITE_TILED;
  
 +      if (rotation & DRM_ROTATE_180)
 +              sprctl |= SPRITE_ROTATE_180;
 +
        if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
                sprctl &= ~SPRITE_TRICKLE_FEED_DISABLE;
        else
@@@ -669,12 -681,9 +669,12 @@@ ilk_update_plane(struct drm_plane *plan
         */
        dvscntr |= DVS_GAMMA_ENABLE;
  
-       if (fb->modifier[0] == I915_FORMAT_MOD_X_TILED)
+       if (fb->modifier == I915_FORMAT_MOD_X_TILED)
                dvscntr |= DVS_TILED;
  
 +      if (rotation & DRM_ROTATE_180)
 +              dvscntr |= DVS_ROTATE_180;
 +
        if (IS_GEN6(dev_priv))
                dvscntr |= DVS_TRICKLE_FEED_DISABLE; /* must disable */
  

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