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

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
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index c2b629c922e7..8f131a08d440 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -224,7 +224,7 @@ skl_update_plane(struct drm_plane *drm_plane,
                 PLANE_CTL_PIPE_CSC_ENABLE;
 
         plane_ctl |= skl_plane_ctl_format(fb->pixel_format);
-        plane_ctl |= skl_plane_ctl_tiling(fb->modifier[0]);
+        plane_ctl |= skl_plane_ctl_tiling(fb->modifier);
 
         plane_ctl |= skl_plane_ctl_rotation(rotation);
 
@@ -406,7 +406,7 @@ vlv_update_plane(struct drm_plane *dplane,
          */
         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)
@@ -448,7 +448,7 @@ vlv_update_plane(struct drm_plane *dplane,
         I915_WRITE(SPSTRIDE(pipe, plane), fb->pitches[0]);
         I915_WRITE(SPPOS(pipe, plane), (crtc_y << 16) | crtc_x);
 
-        if (fb->modifier[0] == I915_FORMAT_MOD_X_TILED)
+        if (fb->modifier == I915_FORMAT_MOD_X_TILED)
                 I915_WRITE(SPTILEOFF(pipe, plane), (y << 16) | x);
         else
                 I915_WRITE(SPLINOFF(pipe, plane), linear_offset);
@@ -531,7 +531,7 @@ ivb_update_plane(struct drm_plane *plane,
          */
         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)
@@ -584,7 +584,7 @@ ivb_update_plane(struct drm_plane *plane,
          * register */
         if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
                 I915_WRITE(SPROFFSET(pipe), (y << 16) | x);
-        else if (fb->modifier[0] == I915_FORMAT_MOD_X_TILED)
+        else if (fb->modifier == I915_FORMAT_MOD_X_TILED)
                 I915_WRITE(SPRTILEOFF(pipe), (y << 16) | x);
         else
                 I915_WRITE(SPRLINOFF(pipe), linear_offset);
@@ -669,7 +669,7 @@ ilk_update_plane(struct drm_plane *plane,
          */
         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)
@@ -712,7 +712,7 @@ ilk_update_plane(struct drm_plane *plane,
         I915_WRITE(DVSSTRIDE(pipe), fb->pitches[0]);
         I915_WRITE(DVSPOS(pipe), (crtc_y << 16) | crtc_x);
 
-        if (fb->modifier[0] == I915_FORMAT_MOD_X_TILED)
+        if (fb->modifier == I915_FORMAT_MOD_X_TILED)
                 I915_WRITE(DVSTILEOFF(pipe), (y << 16) | x);
         else
                 I915_WRITE(DVSLINOFF(pipe), linear_offset);