Merge drm/drm-next into drm-intel-next-queued

This is needed to get the fourcc code merged without conflicts.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

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

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/intel_hdmi.c
index 07893ad2ad1f93c0c56e07a1bf69def94adfc349,765718b606d857a9993a91bfff92365452599f1e..26767785f14aa2d9120e53641f5f03752c90731a
--- 1/drivers/gpu/drm/i915/intel_hdmi.c
--- 2/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@@ -638,70 -469,39 +638,72 @@@ static void intel_write_infoframe(struc
        buffer[3] = 0;
        len++;
  
 -      intel_dig_port->write_infoframe(encoder,
 -                                      crtc_state,
 -                                      frame->any.type, buffer, len);
 +      intel_dig_port->write_infoframe(encoder, crtc_state, type, buffer, len);
  }
  
 -static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,
 -                                       const struct intel_crtc_state *crtc_state,
 -                                       const struct drm_connector_state *conn_state)
 +void intel_read_infoframe(struct intel_encoder *encoder,
 +                        const struct intel_crtc_state *crtc_state,
 +                        enum hdmi_infoframe_type type,
 +                        union hdmi_infoframe *frame)
  {
 +      struct intel_digital_port *intel_dig_port = enc_to_dig_port(&encoder->base);
 +      u8 buffer[VIDEO_DIP_DATA_SIZE];
 +      int ret;
 +
 +      if ((crtc_state->infoframes.enable &
 +           intel_hdmi_infoframe_enable(type)) == 0)
 +              return;
 +
 +      intel_dig_port->read_infoframe(encoder, crtc_state,
 +                                     type, buffer, sizeof(buffer));
 +
 +      /* Fill the 'hole' (see big comment above) at position 3 */
 +      memmove(&buffer[1], &buffer[0], 3);
 +
 +      /* see comment above for the reason for this offset */
 +      ret = hdmi_infoframe_unpack(frame, buffer + 1, sizeof(buffer) - 1);
 +      if (ret) {
 +              DRM_DEBUG_KMS("Failed to unpack infoframe type 0x%02x\n", type);
 +              return;
 +      }
 +
 +      if (frame->any.type != type)
 +              DRM_DEBUG_KMS("Found the wrong infoframe type 0x%x (expected 0x%02x)\n",
 +                            frame->any.type, type);
 +}
 +
 +static bool
 +intel_hdmi_compute_avi_infoframe(struct intel_encoder *encoder,
 +                               struct intel_crtc_state *crtc_state,
 +                               struct drm_connector_state *conn_state)
 +{
 +      struct hdmi_avi_infoframe *frame = &crtc_state->infoframes.avi.avi;
        const struct drm_display_mode *adjusted_mode =
                &crtc_state->base.adjusted_mode;
 -      union hdmi_infoframe frame;
 +      struct drm_connector *connector = conn_state->connector;
        int ret;
  
 -      ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
 -                                                     conn_state->connector,
 +      if (!crtc_state->has_infoframe)
 +              return true;
 +
 +      crtc_state->infoframes.enable |=
 +              intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_AVI);
 +
 +      ret = drm_hdmi_avi_infoframe_from_display_mode(frame, connector,
                                                       adjusted_mode);
 -      if (ret < 0) {
 -              DRM_ERROR("couldn't fill AVI infoframe\n");
 -              return;
 -      }
 +      if (ret)
 +              return false;
  
        if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420)
 -              frame.avi.colorspace = HDMI_COLORSPACE_YUV420;
 +              frame->colorspace = HDMI_COLORSPACE_YUV420;
        else if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444)
 -              frame.avi.colorspace = HDMI_COLORSPACE_YUV444;
 +              frame->colorspace = HDMI_COLORSPACE_YUV444;
        else
 -              frame.avi.colorspace = HDMI_COLORSPACE_RGB;
 +              frame->colorspace = HDMI_COLORSPACE_RGB;
  
 -      drm_hdmi_avi_infoframe_colorspace(&frame.avi, conn_state);
++      drm_hdmi_avi_infoframe_colorspace(frame, conn_state);
+ 
 -      drm_hdmi_avi_infoframe_quant_range(&frame.avi,
 -                                         conn_state->connector,
 +      drm_hdmi_avi_infoframe_quant_range(frame, connector,
                                           adjusted_mode,
                                           crtc_state->limited_color_range ?
                                           HDMI_QUANTIZATION_RANGE_LIMITED :

diff --cc drivers/gpu/drm/i915/intel_sprite.c
index aee4defcb88dbade75c4480cd455270c2b7d4bdf,53174d5795741947b609d9c269ba03ed29e675a0..3f2055f70d05123313e769b7e328ed4615973047
--- 1/drivers/gpu/drm/i915/intel_sprite.c
--- 2/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@@ -1837,12 -1821,12 +1837,12 @@@ static const u32 icl_plane_formats[] = 
        DRM_FORMAT_Y210,
        DRM_FORMAT_Y212,
        DRM_FORMAT_Y216,
-       DRM_FORMAT_Y410,
-       DRM_FORMAT_Y412,
-       DRM_FORMAT_Y416,
+       DRM_FORMAT_XVYU2101010,
+       DRM_FORMAT_XVYU12_16161616,
+       DRM_FORMAT_XVYU16161616,
  };
  
 -static const uint32_t icl_hdr_plane_formats[] = {
 +static const u32 icl_hdr_plane_formats[] = {
        DRM_FORMAT_C8,
        DRM_FORMAT_RGB565,
        DRM_FORMAT_XRGB8888,
@@@ -1922,12 -1906,12 +1922,12 @@@ static const u32 icl_planar_formats[] 
        DRM_FORMAT_Y210,
        DRM_FORMAT_Y212,
        DRM_FORMAT_Y216,
-       DRM_FORMAT_Y410,
-       DRM_FORMAT_Y412,
-       DRM_FORMAT_Y416,
+       DRM_FORMAT_XVYU2101010,
+       DRM_FORMAT_XVYU12_16161616,
+       DRM_FORMAT_XVYU16161616,
  };
  
 -static const uint32_t icl_hdr_planar_formats[] = {
 +static const u32 icl_hdr_planar_formats[] = {
        DRM_FORMAT_C8,
        DRM_FORMAT_RGB565,
        DRM_FORMAT_XRGB8888,

diff --cc include/sound/hdaudio.h
Simple merge