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

We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

1 files changed, 11 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 98ad4313d9f2..8363fbd18ee8 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -467,7 +467,8 @@ static void intel_write_infoframe(struct drm_encoder *encoder,
 }
 
 static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
-                                         const struct intel_crtc_state *crtc_state)
+                                         const struct intel_crtc_state *crtc_state,
+                                         const struct drm_connector_state *conn_state)
 {
         struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
         const struct drm_display_mode *adjusted_mode =
@@ -497,6 +498,9 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
                                            intel_hdmi->rgb_quant_range_selectable,
                                            is_hdmi2_sink);
 
+        drm_hdmi_avi_infoframe_content_type(&frame.avi,
+                                            conn_state);
+
         /* TODO: handle pixel repetition for YCBCR420 outputs */
         intel_write_infoframe(encoder, crtc_state, &frame);
 }
@@ -592,7 +596,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
         I915_WRITE(reg, val);
         POSTING_READ(reg);
 
-        intel_hdmi_set_avi_infoframe(encoder, crtc_state);
+        intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
         intel_hdmi_set_spd_infoframe(encoder, crtc_state);
         intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
 }
@@ -733,7 +737,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
         I915_WRITE(reg, val);
         POSTING_READ(reg);
 
-        intel_hdmi_set_avi_infoframe(encoder, crtc_state);
+        intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
         intel_hdmi_set_spd_infoframe(encoder, crtc_state);
         intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
 }
@@ -776,7 +780,7 @@ static void cpt_set_infoframes(struct drm_encoder *encoder,
         I915_WRITE(reg, val);
         POSTING_READ(reg);
 
-        intel_hdmi_set_avi_infoframe(encoder, crtc_state);
+        intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
         intel_hdmi_set_spd_infoframe(encoder, crtc_state);
         intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
 }
@@ -829,7 +833,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,
         I915_WRITE(reg, val);
         POSTING_READ(reg);
 
-        intel_hdmi_set_avi_infoframe(encoder, crtc_state);
+        intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
         intel_hdmi_set_spd_infoframe(encoder, crtc_state);
         intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
 }
@@ -862,7 +866,7 @@ static void hsw_set_infoframes(struct drm_encoder *encoder,
         I915_WRITE(reg, val);
         POSTING_READ(reg);
 
-        intel_hdmi_set_avi_infoframe(encoder, crtc_state);
+        intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
         intel_hdmi_set_spd_infoframe(encoder, crtc_state);
         intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
 }
@@ -2092,6 +2096,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
         intel_attach_force_audio_property(connector);
         intel_attach_broadcast_rgb_property(connector);
         intel_attach_aspect_ratio_property(connector);
+        drm_connector_attach_content_type_property(connector);
         connector->state->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
 }