Merge tag 'drm-misc-next-2018-06-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for 4.19:

UAPI Changes:
- Add writeback connector (Brian Starkey/Liviu Dudau)
- Add "content type" property to HDMI connectors (Stanislav Lisovskiy)

Cross-subsystem Changes:
- some devicetree Docs update
- fix compile breakage on ION due to the dma-buf cleanups (Christian König)

Core Changes:
- Reject over-sized allocation requests early (Chris Wilson)
- gem-fb-helper: Always do implicit sync (Daniel Vetter)
- dma-buf cleanups (Christian König)

Driver Changes:
- Fixes for the otm8009a panel driver (Philippe Cornu)
- Add Innolux TV123WAM panel driver support (Sandeep Panda)
- Move GEM BO to drm_framebuffer in few drivers (Daniel Stone)
- i915 pinning improvements (Chris Wilson)
- Stop consulting plane->fb/crtc in a few drivers (Ville Syrjälä)

Signed-off-by: Dave Airlie <airlied@redhat.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20180621105428.GA20795@juma

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 ba5ea61fb7b9..0ca4cc877520 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -461,7 +461,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 =
@@ -491,6 +492,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);
 }
@@ -586,7 +590,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);
 }
@@ -727,7 +731,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);
 }
@@ -770,7 +774,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);
 }
@@ -823,7 +827,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);
 }
@@ -856,7 +860,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);
 }
@@ -2048,6 +2052,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;
 }