2 files changed, 30 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index fab94be89dfa..88a2c0792f26 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4151,6 +4151,8 @@
          _TRANSCODER(trans, HSW_VIDEO_DIP_CTL_A, HSW_VIDEO_DIP_CTL_B)
 #define HSW_TVIDEO_DIP_AVI_DATA(trans) \
          _TRANSCODER(trans, HSW_VIDEO_DIP_AVI_DATA_A, HSW_VIDEO_DIP_AVI_DATA_B)
+#define HSW_TVIDEO_DIP_VS_DATA(trans) \
+         _TRANSCODER(trans, HSW_VIDEO_DIP_VS_DATA_A, HSW_VIDEO_DIP_VS_DATA_B)
 #define HSW_TVIDEO_DIP_SPD_DATA(trans) \
          _TRANSCODER(trans, HSW_VIDEO_DIP_SPD_DATA_A, HSW_VIDEO_DIP_SPD_DATA_B)
 #define HSW_TVIDEO_DIP_GCP(trans) \
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index dd4fa35e0a85..f27b91eeeb64 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -74,6 +74,8 @@ static u32 g4x_infoframe_index(enum hdmi_infoframe_type type)
                 return VIDEO_DIP_SELECT_AVI;
         case HDMI_INFOFRAME_TYPE_SPD:
                 return VIDEO_DIP_SELECT_SPD;
+        case HDMI_INFOFRAME_TYPE_VENDOR:
+                return VIDEO_DIP_SELECT_VENDOR;
         default:
                 DRM_DEBUG_DRIVER("unknown info frame type %d\n", type);
                 return 0;
@@ -87,6 +89,8 @@ static u32 g4x_infoframe_enable(enum hdmi_infoframe_type type)
                 return VIDEO_DIP_ENABLE_AVI;
         case HDMI_INFOFRAME_TYPE_SPD:
                 return VIDEO_DIP_ENABLE_SPD;
+        case HDMI_INFOFRAME_TYPE_VENDOR:
+                return VIDEO_DIP_ENABLE_VENDOR;
         default:
                 DRM_DEBUG_DRIVER("unknown info frame type %d\n", type);
                 return 0;
@@ -100,6 +104,8 @@ static u32 hsw_infoframe_enable(enum hdmi_infoframe_type type)
                 return VIDEO_DIP_ENABLE_AVI_HSW;
         case HDMI_INFOFRAME_TYPE_SPD:
                 return VIDEO_DIP_ENABLE_SPD_HSW;
+        case HDMI_INFOFRAME_TYPE_VENDOR:
+                return VIDEO_DIP_ENABLE_VS_HSW;
         default:
                 DRM_DEBUG_DRIVER("unknown info frame type %d\n", type);
                 return 0;
@@ -114,6 +120,8 @@ static u32 hsw_infoframe_data_reg(enum hdmi_infoframe_type type,
                 return HSW_TVIDEO_DIP_AVI_DATA(cpu_transcoder);
         case HDMI_INFOFRAME_TYPE_SPD:
                 return HSW_TVIDEO_DIP_SPD_DATA(cpu_transcoder);
+        case HDMI_INFOFRAME_TYPE_VENDOR:
+                return HSW_TVIDEO_DIP_VS_DATA(cpu_transcoder);
         default:
                 DRM_DEBUG_DRIVER("unknown info frame type %d\n", type);
                 return 0;
@@ -392,6 +400,21 @@ static void intel_hdmi_set_spd_infoframe(struct drm_encoder *encoder)
         intel_write_infoframe(encoder, &frame);
 }
 
+static void
+intel_hdmi_set_hdmi_infoframe(struct drm_encoder *encoder,
+                              struct drm_display_mode *adjusted_mode)
+{
+        union hdmi_infoframe frame;
+        int ret;
+
+        ret = drm_hdmi_vendor_infoframe_from_display_mode(&frame.vendor.hdmi,
+                                                          adjusted_mode);
+        if (ret < 0)
+                return;
+
+        intel_write_infoframe(encoder, &frame);
+}
+
 static void g4x_set_infoframes(struct drm_encoder *encoder,
                                struct drm_display_mode *adjusted_mode)
 {
@@ -454,6 +477,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
 
         intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
         intel_hdmi_set_spd_infoframe(encoder);
+        intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode);
 }
 
 static void ibx_set_infoframes(struct drm_encoder *encoder,
@@ -515,6 +539,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
 
         intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
         intel_hdmi_set_spd_infoframe(encoder);
+        intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode);
 }
 
 static void cpt_set_infoframes(struct drm_encoder *encoder,
@@ -550,6 +575,7 @@ static void cpt_set_infoframes(struct drm_encoder *encoder,
 
         intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
         intel_hdmi_set_spd_infoframe(encoder);
+        intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode);
 }
 
 static void vlv_set_infoframes(struct drm_encoder *encoder,
@@ -584,6 +610,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,
 
         intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
         intel_hdmi_set_spd_infoframe(encoder);
+        intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode);
 }
 
 static void hsw_set_infoframes(struct drm_encoder *encoder,
@@ -611,6 +638,7 @@ static void hsw_set_infoframes(struct drm_encoder *encoder,
 
         intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
         intel_hdmi_set_spd_infoframe(encoder);
+        intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode);
 }
 
 static void intel_hdmi_mode_set(struct intel_encoder *encoder)