On Tue, May 30, 2017 at 05:43:40PM +0530, Shashank Sharma wrote:

HDMI 1.4b support the CEA video modes as per range of CEA-861-D (VIC 1-64). For any other mode, the VIC filed in AVI infoframes should be 0. HDMI 2.0 sinks, support video modes range as per CEA-861-F spec, which is extended to (VIC 1-107).

This patch adds a bool input variable, which indicates if the connected sink is a HDMI 2.0 sink or not. This will make sure that we don't pass a HDMI 2.0 VIC to a HDMI 1.4 sink.

This patch touches all drm drivers, who are callers of this function drm_hdmi_avi_infoframe_from_display_mode but to make sure there is no change in current behavior, is_hdmi2 is kept as false.

In case of I915 driver, this patch checks the connector->display_info to check if the connected display is HDMI 2.0.

Cc: Ville Syrjala ville.syrjala@linux.intel.com Cc: Jose Abreu jose.abreu@synopsys.com Cc: Andrzej Hajda a.hajda@samsung.com Cc: Alex Deucher alexander.deucher@amd.com Cc: Daniel Vetter daniel.vetter@intel.com

PS: This patch touches a few lines in few files, which were already above 80 char, so checkpatch gives 80 char warning again.

• gpu/drm/omapdrm/omap_encoder.c
• gpu/drm/i915/intel_sdvo.c

V2: Rebase, Added r-b from Andrzej

Reviewed-by: Andrzej Hajda a.hajda@samsung.com Signed-off-by: Shashank Sharma shashank.sharma@intel.com

---

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- drivers/gpu/drm/bridge/analogix-anx78xx.c | 3 ++- drivers/gpu/drm/bridge/sii902x.c | 2 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- drivers/gpu/drm/drm_edid.c | 12 +++++++++++- drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 5 ++++- drivers/gpu/drm/i915/intel_sdvo.c | 3 ++- drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- drivers/gpu/drm/omapdrm/omap_encoder.c | 3 ++- drivers/gpu/drm/radeon/radeon_audio.c | 2 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- drivers/gpu/drm/sti/sti_hdmi.c | 2 +- drivers/gpu/drm/tegra/hdmi.c | 2 +- drivers/gpu/drm/tegra/sor.c | 2 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- drivers/gpu/drm/zte/zx_hdmi.c | 2 +- include/drm/drm_edid.h | 3 ++- 21 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index 3c62c45..4923ddc 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -1864,7 +1864,7 @@ static void dce_v10_0_afmt_setmode(struct drm_encoder *encoder, dce_v10_0_audio_write_sad_regs(encoder); dce_v10_0_audio_write_latency_fields(encoder, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index c8ed0fa..4101684 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -1848,7 +1848,7 @@ static void dce_v11_0_afmt_setmode(struct drm_encoder *encoder, dce_v11_0_audio_write_sad_regs(encoder); dce_v11_0_audio_write_latency_fields(encoder, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index 3e90c19..a7f6b32 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c @@ -1747,7 +1747,7 @@ static void dce_v8_0_afmt_setmode(struct drm_encoder *encoder, dce_v8_0_audio_write_sad_regs(encoder); dce_v8_0_audio_write_latency_fields(encoder, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c index a2a8236..f9b77b8 100644 --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c @@ -1097,7 +1097,8 @@ static void anx78xx_bridge_mode_set(struct drm_bridge *bridge,

mutex_lock(&anx78xx->lock);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, adjusted_mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, adjusted_mode,

• 				       false);
  

  if (err) { DRM_ERROR("Failed to setup AVI infoframe: %d\n", err); goto unlock;

diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c index 9b87067..3dc40f6 100644 --- a/drivers/gpu/drm/bridge/sii902x.c +++ b/drivers/gpu/drm/bridge/sii902x.c @@ -269,7 +269,7 @@ static void sii902x_bridge_mode_set(struct drm_bridge *bridge, if (ret) return;

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, adj);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, adj, false); if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return;

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 8737de8..e6d3181 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1317,7 +1317,7 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) u8 val;

/* Initialise info frame from DRM mode */

• drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);

  if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) frame.colorspace = HDMI_COLORSPACE_YUV444;

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 2e55599..8b23435 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -4334,12 +4334,14 @@ EXPORT_SYMBOL(drm_set_preferred_mode);

•                                          data from a DRM display mode
  

• @frame: HDMI AVI infoframe
• @mode: DRM display mode

• • @is_hdmi2: Sink is HDMI 2.0 compliant
  • Return: 0 on success or a negative error code on failure.
  */

int drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,

• 			 const struct drm_display_mode *mode)
  

• 			 const struct drm_display_mode *mode,
  

• 			 bool is_hdmi2)
  

{ int err;

@@ -4355,6 +4357,14 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,

frame->video_code = drm_match_cea_mode(mode);

• /*

• * HDMI 1.4 VIC range: 1 <= VIC <= 64 (CEA-861-D) but
  

• * HDMI 2.0 VIC range: 1 <= VIC <= 107 (CEA-861-F). So we
  

• * have to make sure we dont break HDMI 1.4 sinks.
  

• */
  

• if (!is_hdmi2 && frame->video_code > 64)

• frame->video_code = 0;
  

Seems I've totally forgotten what we concluded about the AVI VIC vs. HDMI VIC, but I have a feeling this isn't sufficient.

• frame->picture_aspect = HDMI_PICTURE_ASPECT_NONE;

  /*

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 1ff6ab6..f2cc75d 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -784,7 +784,7 @@ static void hdmi_reg_infoframes(struct hdmi_context *hdata) }

ret = drm_hdmi_avi_infoframe_from_display_mode(&frm.avi,

• 	&hdata->current_mode);
  

• 	&hdata->current_mode, false);
  

  if (!ret) ret = hdmi_avi_infoframe_pack(&frm.avi, buf, sizeof(buf)); if (ret > 0) {

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 86f47e1..d1e7ac5 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -712,7 +712,7 @@ tda998x_write_avi(struct tda998x_priv *priv, struct drm_display_mode *mode) { union hdmi_infoframe frame;

• drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false); frame.avi.quantization_range = HDMI_QUANTIZATION_RANGE_FULL;

  tda998x_write_if(priv, DIP_IF_FLAGS_IF2, REG_IF2_HB0, &frame);

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 58d6903..702cbab 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -459,11 +459,14 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode;

• struct drm_connector *connector = &intel_hdmi->attached_connector->base;

• bool is_hdmi2 = connector->display_info.hdmi.scdc.supported; union hdmi_infoframe frame; int ret;

  ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,

• 				       adjusted_mode);
  

• 				       adjusted_mode,
  

• 				       is_hdmi2);
  

  if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return;

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 6cc1812..62d727a 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1006,7 +1006,8 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo, ssize_t len;

ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,

• 				       &pipe_config->base.adjusted_mode);
  

• 				       &pipe_config->base.adjusted_mode,
  

• 				       false);
  

  if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return false;

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index 41a1c03..a1770dc 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -975,7 +975,7 @@ static int mtk_hdmi_setup_avi_infoframe(struct mtk_hdmi *hdmi, u8 buffer[17]; ssize_t err;

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { dev_err(hdmi->dev, "Failed to get AVI infoframe from mode: %zd\n", err);

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c index 86c977b..624f5b5 100644 --- a/drivers/gpu/drm/omapdrm/omap_encoder.c +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c @@ -85,7 +85,8 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, if (hdmi_mode && dssdev->driver->set_hdmi_infoframe) { struct hdmi_avi_infoframe avi;

• r = drm_hdmi_avi_infoframe_from_display_mode(&avi, adjusted_mode);
  

• r = drm_hdmi_avi_infoframe_from_display_mode(&avi, adjusted_mode,
  

• 					     false);
  

  if (r == 0) dssdev->driver->set_hdmi_infoframe(dssdev, &avi); }

diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index aaacac1..770e31f 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -516,7 +516,7 @@ static int radeon_audio_set_avi_packet(struct drm_encoder *encoder, if (!connector) return -EINVAL;

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %d\n", err); return err;

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index 7d9b75e..7149968 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -294,7 +294,7 @@ static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi, union hdmi_infoframe frame; int rc;

• rc = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• rc = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false);

  if (hdmi->hdmi_data.enc_out_format == HDMI_COLORSPACE_YUV444) frame.avi.colorspace = HDMI_COLORSPACE_YUV444;

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index a59c95a..dbc6a19 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -434,7 +434,7 @@ static int hdmi_avi_infoframe_config(struct sti_hdmi *hdmi)

DRM_DEBUG_DRIVER("\n");

• ret = drm_hdmi_avi_infoframe_from_display_mode(&infoframe, mode);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&infoframe, mode, false); if (ret < 0) { DRM_ERROR("failed to setup AVI infoframe: %d\n", ret); return ret;

diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index cda0491..718d8db 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -734,7 +734,7 @@ static void tegra_hdmi_setup_avi_infoframe(struct tegra_hdmi *hdmi, u8 buffer[17]; ssize_t err;

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { dev_err(hdmi->dev, "failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index a8f5289..fb2709c 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -1904,7 +1904,7 @@ tegra_sor_hdmi_setup_avi_infoframe(struct tegra_sor *sor, value &= ~INFOFRAME_CTRL_ENABLE; tegra_sor_writel(sor, value, SOR_HDMI_AVI_INFOFRAME_CTRL);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { dev_err(sor->dev, "failed to setup AVI infoframe: %d\n", err); return err;

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index ed63d4e..406d6d8 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -395,7 +395,7 @@ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder) union hdmi_infoframe frame; int ret;

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false); if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return;

diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c index 0df7366..7e834e3 100644 --- a/drivers/gpu/drm/zte/zx_hdmi.c +++ b/drivers/gpu/drm/zte/zx_hdmi.c @@ -124,7 +124,7 @@ static int zx_hdmi_config_video_avi(struct zx_hdmi *hdmi, union hdmi_infoframe frame; int ret;

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false); if (ret) { DRM_DEV_ERROR(hdmi->dev, "failed to get avi infoframe: %d\n", ret);

diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 7b9f48b..c07eb81 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -343,7 +343,8 @@ drm_load_edid_firmware(struct drm_connector *connector)

int drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,

• 			 const struct drm_display_mode *mode);
  

• 			 const struct drm_display_mode *mode,
  

• 			 bool is_hdmi2);
  

int drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame, const struct drm_display_mode *mode); -- 2.7.4

On Tue, May 30, 2017 at 10:00:12PM +0530, Sharma, Shashank wrote:

Regards

Shashank

On 5/30/2017 9:43 PM, Ville Syrjälä wrote:

...

On Tue, May 30, 2017 at 05:43:40PM +0530, Shashank Sharma wrote:

...

HDMI 1.4b support the CEA video modes as per range of CEA-861-D (VIC 1-64). For any other mode, the VIC filed in AVI infoframes should be 0. HDMI 2.0 sinks, support video modes range as per CEA-861-F spec, which is extended to (VIC 1-107).

This patch adds a bool input variable, which indicates if the connected sink is a HDMI 2.0 sink or not. This will make sure that we don't pass a HDMI 2.0 VIC to a HDMI 1.4 sink.

This patch touches all drm drivers, who are callers of this function drm_hdmi_avi_infoframe_from_display_mode but to make sure there is no change in current behavior, is_hdmi2 is kept as false.

In case of I915 driver, this patch checks the connector->display_info to check if the connected display is HDMI 2.0.

Cc: Ville Syrjala ville.syrjala@linux.intel.com Cc: Jose Abreu jose.abreu@synopsys.com Cc: Andrzej Hajda a.hajda@samsung.com Cc: Alex Deucher alexander.deucher@amd.com Cc: Daniel Vetter daniel.vetter@intel.com

PS: This patch touches a few lines in few files, which were already above 80 char, so checkpatch gives 80 char warning again.

• gpu/drm/omapdrm/omap_encoder.c
• gpu/drm/i915/intel_sdvo.c

V2: Rebase, Added r-b from Andrzej

Reviewed-by: Andrzej Hajda a.hajda@samsung.com Signed-off-by: Shashank Sharma shashank.sharma@intel.com

---

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- drivers/gpu/drm/bridge/analogix-anx78xx.c | 3 ++- drivers/gpu/drm/bridge/sii902x.c | 2 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- drivers/gpu/drm/drm_edid.c | 12 +++++++++++- drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 5 ++++- drivers/gpu/drm/i915/intel_sdvo.c | 3 ++- drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- drivers/gpu/drm/omapdrm/omap_encoder.c | 3 ++- drivers/gpu/drm/radeon/radeon_audio.c | 2 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- drivers/gpu/drm/sti/sti_hdmi.c | 2 +- drivers/gpu/drm/tegra/hdmi.c | 2 +- drivers/gpu/drm/tegra/sor.c | 2 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- drivers/gpu/drm/zte/zx_hdmi.c | 2 +- include/drm/drm_edid.h | 3 ++- 21 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index 3c62c45..4923ddc 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -1864,7 +1864,7 @@ static void dce_v10_0_afmt_setmode(struct drm_encoder *encoder, dce_v10_0_audio_write_sad_regs(encoder); dce_v10_0_audio_write_latency_fields(encoder, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index c8ed0fa..4101684 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -1848,7 +1848,7 @@ static void dce_v11_0_afmt_setmode(struct drm_encoder *encoder, dce_v11_0_audio_write_sad_regs(encoder); dce_v11_0_audio_write_latency_fields(encoder, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index 3e90c19..a7f6b32 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c @@ -1747,7 +1747,7 @@ static void dce_v8_0_afmt_setmode(struct drm_encoder *encoder, dce_v8_0_audio_write_sad_regs(encoder); dce_v8_0_audio_write_latency_fields(encoder, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c index a2a8236..f9b77b8 100644 --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c @@ -1097,7 +1097,8 @@ static void anx78xx_bridge_mode_set(struct drm_bridge *bridge,

mutex_lock(&anx78xx->lock);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, adjusted_mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, adjusted_mode,

• 				       false);
  

  if (err) { DRM_ERROR("Failed to setup AVI infoframe: %d\n", err); goto unlock;

diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c index 9b87067..3dc40f6 100644 --- a/drivers/gpu/drm/bridge/sii902x.c +++ b/drivers/gpu/drm/bridge/sii902x.c @@ -269,7 +269,7 @@ static void sii902x_bridge_mode_set(struct drm_bridge *bridge, if (ret) return;

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, adj);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, adj, false); if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return;

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 8737de8..e6d3181 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1317,7 +1317,7 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) u8 val;

/* Initialise info frame from DRM mode */

• drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);

  if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) frame.colorspace = HDMI_COLORSPACE_YUV444;

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 2e55599..8b23435 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -4334,12 +4334,14 @@ EXPORT_SYMBOL(drm_set_preferred_mode);

•                                          data from a DRM display mode
  

• @frame: HDMI AVI infoframe
• @mode: DRM display mode

• • @is_hdmi2: Sink is HDMI 2.0 compliant
  • Return: 0 on success or a negative error code on failure.
  */ int drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,

• 			 const struct drm_display_mode *mode)
  

• 			 const struct drm_display_mode *mode,
  

• 			 bool is_hdmi2)
  

  { int err;

@@ -4355,6 +4357,14 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,

frame->video_code = drm_match_cea_mode(mode);

• /*

• * HDMI 1.4 VIC range: 1 <= VIC <= 64 (CEA-861-D) but
  

• * HDMI 2.0 VIC range: 1 <= VIC <= 107 (CEA-861-F). So we
  

• * have to make sure we dont break HDMI 1.4 sinks.
  

• */
  

• if (!is_hdmi2 && frame->video_code > 64)

• frame->video_code = 0;
  

Seems I've totally forgotten what we concluded about the AVI VIC vs. HDMI VIC, but I have a feeling this isn't sufficient.

As far as I remember, we decided to send VICs > 64 to HDMI 2.0 monitors only. If you can provide some more thoughts about how can we make it better ?

The question is whether we send the VIC in the AVI infoframe of the HDMI infoframe. IIRC sending both isn't legal, and I think we might have concluded that we might have to pass the AVI infoframe to the HDMI infoframe construction function or vice versa to figure out which gets sent.

• Shashank

...

...

• frame->picture_aspect = HDMI_PICTURE_ASPECT_NONE;

  /*

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 1ff6ab6..f2cc75d 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -784,7 +784,7 @@ static void hdmi_reg_infoframes(struct hdmi_context *hdata) }

ret = drm_hdmi_avi_infoframe_from_display_mode(&frm.avi,

• 	&hdata->current_mode);
  

• 	&hdata->current_mode, false);
  

  if (!ret) ret = hdmi_avi_infoframe_pack(&frm.avi, buf, sizeof(buf)); if (ret > 0) {

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 86f47e1..d1e7ac5 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -712,7 +712,7 @@ tda998x_write_avi(struct tda998x_priv *priv, struct drm_display_mode *mode) { union hdmi_infoframe frame;

• drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false); frame.avi.quantization_range = HDMI_QUANTIZATION_RANGE_FULL;

  tda998x_write_if(priv, DIP_IF_FLAGS_IF2, REG_IF2_HB0, &frame);

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 58d6903..702cbab 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -459,11 +459,14 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode;

• struct drm_connector *connector = &intel_hdmi->attached_connector->base;

• bool is_hdmi2 = connector->display_info.hdmi.scdc.supported; union hdmi_infoframe frame; int ret;

  ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,

• 				       adjusted_mode);
  

• 				       adjusted_mode,
  

• 				       is_hdmi2);
  

  if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return;

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 6cc1812..62d727a 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1006,7 +1006,8 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo, ssize_t len;

ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,

• 				       &pipe_config->base.adjusted_mode);
  

• 				       &pipe_config->base.adjusted_mode,
  

• 				       false);
  

  if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return false;

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index 41a1c03..a1770dc 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -975,7 +975,7 @@ static int mtk_hdmi_setup_avi_infoframe(struct mtk_hdmi *hdmi, u8 buffer[17]; ssize_t err;

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { dev_err(hdmi->dev, "Failed to get AVI infoframe from mode: %zd\n", err);

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c index 86c977b..624f5b5 100644 --- a/drivers/gpu/drm/omapdrm/omap_encoder.c +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c @@ -85,7 +85,8 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, if (hdmi_mode && dssdev->driver->set_hdmi_infoframe) { struct hdmi_avi_infoframe avi;

• r = drm_hdmi_avi_infoframe_from_display_mode(&avi, adjusted_mode);
  

• r = drm_hdmi_avi_infoframe_from_display_mode(&avi, adjusted_mode,
  

• 					     false);
  

  if (r == 0) dssdev->driver->set_hdmi_infoframe(dssdev, &avi); }

diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index aaacac1..770e31f 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -516,7 +516,7 @@ static int radeon_audio_set_avi_packet(struct drm_encoder *encoder, if (!connector) return -EINVAL;

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %d\n", err); return err;

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index 7d9b75e..7149968 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -294,7 +294,7 @@ static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi, union hdmi_infoframe frame; int rc;

• rc = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• rc = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false);

  if (hdmi->hdmi_data.enc_out_format == HDMI_COLORSPACE_YUV444) frame.avi.colorspace = HDMI_COLORSPACE_YUV444;

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index a59c95a..dbc6a19 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -434,7 +434,7 @@ static int hdmi_avi_infoframe_config(struct sti_hdmi *hdmi)

DRM_DEBUG_DRIVER("\n");

• ret = drm_hdmi_avi_infoframe_from_display_mode(&infoframe, mode);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&infoframe, mode, false); if (ret < 0) { DRM_ERROR("failed to setup AVI infoframe: %d\n", ret); return ret;

diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index cda0491..718d8db 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -734,7 +734,7 @@ static void tegra_hdmi_setup_avi_infoframe(struct tegra_hdmi *hdmi, u8 buffer[17]; ssize_t err;

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { dev_err(hdmi->dev, "failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index a8f5289..fb2709c 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -1904,7 +1904,7 @@ tegra_sor_hdmi_setup_avi_infoframe(struct tegra_sor *sor, value &= ~INFOFRAME_CTRL_ENABLE; tegra_sor_writel(sor, value, SOR_HDMI_AVI_INFOFRAME_CTRL);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { dev_err(sor->dev, "failed to setup AVI infoframe: %d\n", err); return err;

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index ed63d4e..406d6d8 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -395,7 +395,7 @@ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder) union hdmi_infoframe frame; int ret;

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false); if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return;

diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c index 0df7366..7e834e3 100644 --- a/drivers/gpu/drm/zte/zx_hdmi.c +++ b/drivers/gpu/drm/zte/zx_hdmi.c @@ -124,7 +124,7 @@ static int zx_hdmi_config_video_avi(struct zx_hdmi *hdmi, union hdmi_infoframe frame; int ret;

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false); if (ret) { DRM_DEV_ERROR(hdmi->dev, "failed to get avi infoframe: %d\n", ret);

diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 7b9f48b..c07eb81 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -343,7 +343,8 @@ drm_load_edid_firmware(struct drm_connector *connector)

int drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,

• 			 const struct drm_display_mode *mode);
  

• 			 const struct drm_display_mode *mode,
  

• 			 bool is_hdmi2);
  

  int drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame, const struct drm_display_mode *mode);

-- 2.7.4

On Wed, May 31, 2017 at 09:06:12PM +0530, Sharma, Shashank wrote:

Regards

Shashank

On 5/31/2017 6:11 PM, Ville Syrjälä wrote:

...

On Tue, May 30, 2017 at 10:00:12PM +0530, Sharma, Shashank wrote:

...

Regards

Shashank

On 5/30/2017 9:43 PM, Ville Syrjälä wrote:

...

On Tue, May 30, 2017 at 05:43:40PM +0530, Shashank Sharma wrote:

...

HDMI 1.4b support the CEA video modes as per range of CEA-861-D (VIC 1-64). For any other mode, the VIC filed in AVI infoframes should be 0. HDMI 2.0 sinks, support video modes range as per CEA-861-F spec, which is extended to (VIC 1-107).

This patch adds a bool input variable, which indicates if the connected sink is a HDMI 2.0 sink or not. This will make sure that we don't pass a HDMI 2.0 VIC to a HDMI 1.4 sink.

This patch touches all drm drivers, who are callers of this function drm_hdmi_avi_infoframe_from_display_mode but to make sure there is no change in current behavior, is_hdmi2 is kept as false.

In case of I915 driver, this patch checks the connector->display_info to check if the connected display is HDMI 2.0.

Cc: Ville Syrjala ville.syrjala@linux.intel.com Cc: Jose Abreu jose.abreu@synopsys.com Cc: Andrzej Hajda a.hajda@samsung.com Cc: Alex Deucher alexander.deucher@amd.com Cc: Daniel Vetter daniel.vetter@intel.com

PS: This patch touches a few lines in few files, which were already above 80 char, so checkpatch gives 80 char warning again.

• gpu/drm/omapdrm/omap_encoder.c
• gpu/drm/i915/intel_sdvo.c

V2: Rebase, Added r-b from Andrzej

Reviewed-by: Andrzej Hajda a.hajda@samsung.com Signed-off-by: Shashank Sharma shashank.sharma@intel.com

---

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- drivers/gpu/drm/bridge/analogix-anx78xx.c | 3 ++- drivers/gpu/drm/bridge/sii902x.c | 2 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- drivers/gpu/drm/drm_edid.c | 12 +++++++++++- drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 5 ++++- drivers/gpu/drm/i915/intel_sdvo.c | 3 ++- drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- drivers/gpu/drm/omapdrm/omap_encoder.c | 3 ++- drivers/gpu/drm/radeon/radeon_audio.c | 2 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- drivers/gpu/drm/sti/sti_hdmi.c | 2 +- drivers/gpu/drm/tegra/hdmi.c | 2 +- drivers/gpu/drm/tegra/sor.c | 2 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- drivers/gpu/drm/zte/zx_hdmi.c | 2 +- include/drm/drm_edid.h | 3 ++- 21 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index 3c62c45..4923ddc 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -1864,7 +1864,7 @@ static void dce_v10_0_afmt_setmode(struct drm_encoder *encoder, dce_v10_0_audio_write_sad_regs(encoder); dce_v10_0_audio_write_latency_fields(encoder, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index c8ed0fa..4101684 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -1848,7 +1848,7 @@ static void dce_v11_0_afmt_setmode(struct drm_encoder *encoder, dce_v11_0_audio_write_sad_regs(encoder); dce_v11_0_audio_write_latency_fields(encoder, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index 3e90c19..a7f6b32 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c @@ -1747,7 +1747,7 @@ static void dce_v8_0_afmt_setmode(struct drm_encoder *encoder, dce_v8_0_audio_write_sad_regs(encoder); dce_v8_0_audio_write_latency_fields(encoder, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c index a2a8236..f9b77b8 100644 --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c @@ -1097,7 +1097,8 @@ static void anx78xx_bridge_mode_set(struct drm_bridge *bridge,

mutex_lock(&anx78xx->lock);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, adjusted_mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, adjusted_mode,

• 				       false);
  

  if (err) { DRM_ERROR("Failed to setup AVI infoframe: %d\n", err); goto unlock;

diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c index 9b87067..3dc40f6 100644 --- a/drivers/gpu/drm/bridge/sii902x.c +++ b/drivers/gpu/drm/bridge/sii902x.c @@ -269,7 +269,7 @@ static void sii902x_bridge_mode_set(struct drm_bridge *bridge, if (ret) return;

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, adj);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, adj, false); if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return;

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 8737de8..e6d3181 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1317,7 +1317,7 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) u8 val;

/* Initialise info frame from DRM mode */

• drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);

  if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) frame.colorspace = HDMI_COLORSPACE_YUV444;

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 2e55599..8b23435 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -4334,12 +4334,14 @@ EXPORT_SYMBOL(drm_set_preferred_mode); * data from a DRM display mode * @frame: HDMI AVI infoframe * @mode: DRM display mode

• • @is_hdmi2: Sink is HDMI 2.0 compliant
    • Return: 0 on success or a negative error code on failure.
    */
  int drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,

• 			 const struct drm_display_mode *mode)
  

• 			 const struct drm_display_mode *mode,
  

• 			 bool is_hdmi2)
  

  { int err;

@@ -4355,6 +4357,14 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,

frame->video_code = drm_match_cea_mode(mode);

• /*

• * HDMI 1.4 VIC range: 1 <= VIC <= 64 (CEA-861-D) but
  

• * HDMI 2.0 VIC range: 1 <= VIC <= 107 (CEA-861-F). So we
  

• * have to make sure we dont break HDMI 1.4 sinks.
  

• */
  

• if (!is_hdmi2 && frame->video_code > 64)

• frame->video_code = 0;
  

Seems I've totally forgotten what we concluded about the AVI VIC vs. HDMI VIC, but I have a feeling this isn't sufficient.

As far as I remember, we decided to send VICs > 64 to HDMI 2.0 monitors only. If you can provide some more thoughts about how can we make it better ?

The question is whether we send the VIC in the AVI infoframe of the HDMI infoframe. IIRC sending both isn't legal, and I think we might have concluded that we might have to pass the AVI infoframe to the HDMI infoframe construction function or vice versa to figure out which gets sent.

Yes, you are correct, and this is what we decided. But on a recent development, I was able to test this patch series with a HDMI 2.0 analyzer, and when I tested the AVI IF (with VIC 97, 38x21@60 16:9) the analyzer was calling it legal, and was also able to detect the mode based on VIC. So looks like its (fortunately) correct interpretation of the spec. But do you still think we should change it ?

I'm pretty sure the spec said you're not supposed to send two VICs.

• Shashank

...

...

• Shashank

...

...

• frame->picture_aspect = HDMI_PICTURE_ASPECT_NONE;

  /*

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 1ff6ab6..f2cc75d 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -784,7 +784,7 @@ static void hdmi_reg_infoframes(struct hdmi_context *hdata) }

ret = drm_hdmi_avi_infoframe_from_display_mode(&frm.avi,

• 	&hdata->current_mode);
  

• 	&hdata->current_mode, false);
  

  if (!ret) ret = hdmi_avi_infoframe_pack(&frm.avi, buf, sizeof(buf)); if (ret > 0) {

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 86f47e1..d1e7ac5 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -712,7 +712,7 @@ tda998x_write_avi(struct tda998x_priv *priv, struct drm_display_mode *mode) { union hdmi_infoframe frame;

• drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false); frame.avi.quantization_range = HDMI_QUANTIZATION_RANGE_FULL;

  tda998x_write_if(priv, DIP_IF_FLAGS_IF2, REG_IF2_HB0, &frame);

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 58d6903..702cbab 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -459,11 +459,14 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode;

• struct drm_connector *connector = &intel_hdmi->attached_connector->base;

• bool is_hdmi2 = connector->display_info.hdmi.scdc.supported; union hdmi_infoframe frame; int ret;

  ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,

• 				       adjusted_mode);
  

• 				       adjusted_mode,
  

• 				       is_hdmi2);
  

  if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return;

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 6cc1812..62d727a 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1006,7 +1006,8 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo, ssize_t len;

ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,

• 				       &pipe_config->base.adjusted_mode);
  

• 				       &pipe_config->base.adjusted_mode,
  

• 				       false);
  

  if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return false;

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index 41a1c03..a1770dc 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -975,7 +975,7 @@ static int mtk_hdmi_setup_avi_infoframe(struct mtk_hdmi *hdmi, u8 buffer[17]; ssize_t err;

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { dev_err(hdmi->dev, "Failed to get AVI infoframe from mode: %zd\n", err);

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c index 86c977b..624f5b5 100644 --- a/drivers/gpu/drm/omapdrm/omap_encoder.c +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c @@ -85,7 +85,8 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder, if (hdmi_mode && dssdev->driver->set_hdmi_infoframe) { struct hdmi_avi_infoframe avi;

• r = drm_hdmi_avi_infoframe_from_display_mode(&avi, adjusted_mode);
  

• r = drm_hdmi_avi_infoframe_from_display_mode(&avi, adjusted_mode,
  

• 					     false);
  if (r == 0)
  	dssdev->driver->set_hdmi_infoframe(dssdev, &avi);
  

  }

diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index aaacac1..770e31f 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -516,7 +516,7 @@ static int radeon_audio_set_avi_packet(struct drm_encoder *encoder, if (!connector) return -EINVAL;

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { DRM_ERROR("failed to setup AVI infoframe: %d\n", err); return err;

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index 7d9b75e..7149968 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -294,7 +294,7 @@ static int inno_hdmi_config_video_avi(struct inno_hdmi *hdmi, union hdmi_infoframe frame; int rc;

• rc = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• rc = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false);

  if (hdmi->hdmi_data.enc_out_format == HDMI_COLORSPACE_YUV444) frame.avi.colorspace = HDMI_COLORSPACE_YUV444;

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index a59c95a..dbc6a19 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -434,7 +434,7 @@ static int hdmi_avi_infoframe_config(struct sti_hdmi *hdmi)

DRM_DEBUG_DRIVER("\n");

• ret = drm_hdmi_avi_infoframe_from_display_mode(&infoframe, mode);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&infoframe, mode, false); if (ret < 0) { DRM_ERROR("failed to setup AVI infoframe: %d\n", ret); return ret;

diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index cda0491..718d8db 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -734,7 +734,7 @@ static void tegra_hdmi_setup_avi_infoframe(struct tegra_hdmi *hdmi, u8 buffer[17]; ssize_t err;

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { dev_err(hdmi->dev, "failed to setup AVI infoframe: %zd\n", err); return;

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index a8f5289..fb2709c 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -1904,7 +1904,7 @@ tegra_sor_hdmi_setup_avi_infoframe(struct tegra_sor *sor, value &= ~INFOFRAME_CTRL_ENABLE; tegra_sor_writel(sor, value, SOR_HDMI_AVI_INFOFRAME_CTRL);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);

• err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false); if (err < 0) { dev_err(sor->dev, "failed to setup AVI infoframe: %d\n", err); return err;

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index ed63d4e..406d6d8 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -395,7 +395,7 @@ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder) union hdmi_infoframe frame; int ret;

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false); if (ret < 0) { DRM_ERROR("couldn't fill AVI infoframe\n"); return;

diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c index 0df7366..7e834e3 100644 --- a/drivers/gpu/drm/zte/zx_hdmi.c +++ b/drivers/gpu/drm/zte/zx_hdmi.c @@ -124,7 +124,7 @@ static int zx_hdmi_config_video_avi(struct zx_hdmi *hdmi, union hdmi_infoframe frame; int ret;

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);

• ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode, false); if (ret) { DRM_DEV_ERROR(hdmi->dev, "failed to get avi infoframe: %d\n", ret);

diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 7b9f48b..c07eb81 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -343,7 +343,8 @@ drm_load_edid_firmware(struct drm_connector *connector)

int drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,

• 			 const struct drm_display_mode *mode);
  

• 			 const struct drm_display_mode *mode,
  

• 			 bool is_hdmi2);
  

  int drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame, const struct drm_display_mode *mode);

-- 2.7.4

On Tue, May 30, 2017 at 05:43:41PM +0530, Shashank Sharma wrote:

CEA-861-F specs defines new video modes to be used with HDMI 2.0 EDIDs. The VIC range has been extended from 1-64 to 1-107.

Our existing CEA modedb contains only 64 modes (VIC=1 to VIC=64). Now to be able to parse new CEA modes using the existing methods, we have to complete the modedb (VIC=65 onwards).

This patch adds:

• Timings for existing CEA video modes (from VIC=65 till VIC=92)
• Newly added 4k modes (from VIC=93 to VIC=107).

Still missing the "native bit" handling.

The patch was originaly discussed and reviewed here: https://patchwork.freedesktop.org/patch/135810/

Cc: Ville Syrjala ville.syrjala@linux.intel.com Cc: Jose Abreu Jose.Abreu@synopsys.com Cc: Andrzej Hajda a.hajda@samsung.com Cc: Alex Deucher alexander.deucher@amd.com Cc: Harry Wentland harry.wentland@amd.com

V2: Rebase

Reviewed-by: Jose Abreu Jose.Abreu@synopsys.com Reviewed-by: Alex Deucher alexander.deucher@amd.com Acked-by: Harry Wentland harry.wentland@amd.com Signed-off-by: Shashank Sharma shashank.sharma@intel.com

---

drivers/gpu/drm/drm_edid.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 8b23435..c3fa3a1 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1006,6 +1006,221 @@ static const struct drm_display_mode edid_cea_modes[] = { 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

• /* 65 - 1280x720@24Hz */
• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 59400, 1280, 3040,

•    3080, 3300, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 66 - 1280x720@25Hz */
• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3700,

•    3740, 3960, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 67 - 1280x720@30Hz */
• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3040,

•    3080, 3300, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 68 - 1280x720@50Hz */
• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1720,

•    1760, 1980, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 69 - 1280x720@60Hz */
• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1390,

•    1430, 1650, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 70 - 1280x720@100Hz */
• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1720,

•    1760, 1980, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 71 - 1280x720@120Hz */
• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1390,

•    1430, 1650, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 72 - 1920x1080@24Hz */
• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2558,

•    2602, 2750, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 73 - 1920x1080@25Hz */
• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448,

•    2492, 2640, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 74 - 1920x1080@30Hz */
• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008,

•    2052, 2200, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 75 - 1920x1080@50Hz */
• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448,

•    2492, 2640, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 76 - 1920x1080@60Hz */
• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008,

•    2052, 2200, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 77 - 1920x1080@100Hz */
• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2448,

•    2492, 2640, 0, 1080, 1084, 1094, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 78 - 1920x1080@120Hz */
• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2008,

•    2052, 2200, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 79 - 1680x720@24Hz */
• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 59400, 1680, 3040,

• 3080, 3300, 0, 720, 725, 730, 750, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 80 - 1680x720@25Hz */
• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 59400, 1680, 2908,

• 2948, 3168, 0, 720, 725, 730, 750, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 81 - 1680x720@30Hz */
• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 59400, 1680, 2380,

• 2420, 2640, 0, 720, 725, 730, 750, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 82 - 1680x720@50Hz */
• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 82500, 1680, 1940,

• 1980, 2200, 0, 720, 725, 730, 750, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 83 - 1680x720@60Hz */
• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 99000, 1680, 1940,

• 1980, 2200, 0, 720, 725, 730, 750, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 84 - 1680x720@100Hz */
• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 165000, 1680, 1740,

• 1780, 2000, 0, 720, 725, 730, 825, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 85 - 1680x720@120Hz */
• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 198000, 1680, 1740,

• 1780, 2000, 0, 720, 725, 730, 825, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 86 - 2560x1080@24Hz */
• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 99000, 2560, 3558,

• 3602, 3750, 0, 1080, 1084, 1089, 1100, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 87 - 2560x1080@25Hz */
• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 90000, 2560, 3008,

• 3052, 3200, 0, 1080, 1084, 1089, 1125, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 88 - 2560x1080@30Hz */
• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 118800, 2560, 3328,

• 3372, 3520, 0, 1080, 1084, 1089, 1125, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 89 - 2560x1080@50Hz */
• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 185625, 2560, 3108,

• 3152, 3300, 0, 1080, 1084, 1089, 1125, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 90 - 2560x1080@60Hz */
• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 198000, 2560, 2808,

• 2852, 3000, 0, 1080, 1084, 1089, 1100, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 91 - 2560x1080@100Hz */
• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 371250, 2560, 2778,

• 2822, 2970, 0, 1080, 1084, 1089, 1250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 92 - 2560x1080@120Hz */
• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 495000, 2560, 3108,

• 3152, 3300, 0, 1080, 1084, 1089, 1250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
• /* 93 - 3840x2160p@24Hz 16:9 */
• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 5116,

• 5204, 5500, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9,},
• /* 94 - 3840x2160p@25Hz 16:9 */
• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4896,

• 4984, 5280, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},
• /* 95 - 3840x2160p@30Hz 16:9 */
• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

• 4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},
• /* 96 - 3840x2160p@50Hz 16:9 */
• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,

• 4984, 5280, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},
• /* 97 - 3840x2160p@60Hz 16:9 */
• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,

• 4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},
• /* 98 - 4096x2160p@24Hz 256:135 */
• { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5116,

• 5204, 5500, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},
• /* 99 - 4096x2160p@25Hz 256:135 */
• { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5064,

• 5152, 5280, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},
• /* 100 - 4096x2160p@30Hz 256:135 */
• { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 4184,

• 4272, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},
• /* 101 - 4096x2160p@50Hz 256:135 */
• { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 5064,

• 5152, 5280, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},
• /* 102 - 4096x2160p@60Hz 256:135 */
• { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 4184,

• 4272, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},
• /* 103 - 3840x2160p@24Hz 64:27 */
• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 5116,

• 5204, 5500, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},
• /* 104 - 3840x2160p@25Hz 64:27 */
• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

• 4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},
• /* 105 - 3840x2160p@30Hz 64:27 */
• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

• 4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},
• /* 106 - 3840x2160p@50Hz 64:27 */
• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,

• 4984, 5280, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},
• /* 107 - 3840x2160p@60Hz 64:27 */
• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,

• 4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

};

/*

2.7.4

On Tue, May 30, 2017 at 09:56:56PM +0530, Sharma, Shashank wrote:

Regards

Shashank

On 5/30/2017 9:48 PM, Ville Syrjälä wrote:

...

On Tue, May 30, 2017 at 05:43:41PM +0530, Shashank Sharma wrote:

...

CEA-861-F specs defines new video modes to be used with HDMI 2.0 EDIDs. The VIC range has been extended from 1-64 to 1-107.

Our existing CEA modedb contains only 64 modes (VIC=1 to VIC=64). Now to be able to parse new CEA modes using the existing methods, we have to complete the modedb (VIC=65 onwards).

This patch adds:

• Timings for existing CEA video modes (from VIC=65 till VIC=92)
• Newly added 4k modes (from VIC=93 to VIC=107).

Still missing the "native bit" handling.

I tried searching the native bit handling in the code, but I could not get any thing. We are typically doing a (vic & 127) and that's all.

And that's not really correct. We shouldn't discard the msb until we've checked that we're in the correct range of VICs that have the native bit. drm_display_mode_from_vic_index() is the place where we should be checking this I think.

Can you please point out a bit here ?

• Shashank

...

...

The patch was originaly discussed and reviewed here: https://patchwork.freedesktop.org/patch/135810/

Cc: Ville Syrjala ville.syrjala@linux.intel.com Cc: Jose Abreu Jose.Abreu@synopsys.com Cc: Andrzej Hajda a.hajda@samsung.com Cc: Alex Deucher alexander.deucher@amd.com Cc: Harry Wentland harry.wentland@amd.com

V2: Rebase

Reviewed-by: Jose Abreu Jose.Abreu@synopsys.com Reviewed-by: Alex Deucher alexander.deucher@amd.com Acked-by: Harry Wentland harry.wentland@amd.com Signed-off-by: Shashank Sharma shashank.sharma@intel.com

---

drivers/gpu/drm/drm_edid.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 8b23435..c3fa3a1 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1006,6 +1006,221 @@ static const struct drm_display_mode edid_cea_modes[] = { 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

• /* 65 - 1280x720@24Hz */

• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 59400, 1280, 3040,

•    3080, 3300, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 66 - 1280x720@25Hz */

• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3700,

•    3740, 3960, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 67 - 1280x720@30Hz */

• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3040,

•    3080, 3300, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 68 - 1280x720@50Hz */

• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1720,

•    1760, 1980, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 69 - 1280x720@60Hz */

• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1390,

•    1430, 1650, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 70 - 1280x720@100Hz */

• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1720,

•    1760, 1980, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 71 - 1280x720@120Hz */

• { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1390,

•    1430, 1650, 0, 720, 725, 730, 750, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 72 - 1920x1080@24Hz */

• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2558,

•    2602, 2750, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 73 - 1920x1080@25Hz */

• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448,

•    2492, 2640, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 74 - 1920x1080@30Hz */

• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008,

•    2052, 2200, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 75 - 1920x1080@50Hz */

• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448,

•    2492, 2640, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 76 - 1920x1080@60Hz */

• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008,

•    2052, 2200, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

•  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 77 - 1920x1080@100Hz */

• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2448,

•    2492, 2640, 0, 1080, 1084, 1094, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 78 - 1920x1080@120Hz */

• { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2008,

•    2052, 2200, 0, 1080, 1084, 1089, 1125, 0,
  

•    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },
  

• /* 79 - 1680x720@24Hz */

• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 59400, 1680, 3040,

• 3080, 3300, 0, 720, 725, 730, 750, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 80 - 1680x720@25Hz */

• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 59400, 1680, 2908,

• 2948, 3168, 0, 720, 725, 730, 750, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 81 - 1680x720@30Hz */

• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 59400, 1680, 2380,

• 2420, 2640, 0, 720, 725, 730, 750, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 82 - 1680x720@50Hz */

• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 82500, 1680, 1940,

• 1980, 2200, 0, 720, 725, 730, 750, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 83 - 1680x720@60Hz */

• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 99000, 1680, 1940,

• 1980, 2200, 0, 720, 725, 730, 750, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 84 - 1680x720@100Hz */

• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 165000, 1680, 1740,

• 1780, 2000, 0, 720, 725, 730, 825, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 85 - 1680x720@120Hz */

• { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 198000, 1680, 1740,

• 1780, 2000, 0, 720, 725, 730, 825, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 86 - 2560x1080@24Hz */

• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 99000, 2560, 3558,

• 3602, 3750, 0, 1080, 1084, 1089, 1100, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 87 - 2560x1080@25Hz */

• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 90000, 2560, 3008,

• 3052, 3200, 0, 1080, 1084, 1089, 1125, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 88 - 2560x1080@30Hz */

• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 118800, 2560, 3328,

• 3372, 3520, 0, 1080, 1084, 1089, 1125, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 89 - 2560x1080@50Hz */

• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 185625, 2560, 3108,

• 3152, 3300, 0, 1080, 1084, 1089, 1125, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 90 - 2560x1080@60Hz */

• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 198000, 2560, 2808,

• 2852, 3000, 0, 1080, 1084, 1089, 1100, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 91 - 2560x1080@100Hz */

• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 371250, 2560, 2778,

• 2822, 2970, 0, 1080, 1084, 1089, 1250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 92 - 2560x1080@120Hz */

• { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 495000, 2560, 3108,

• 3152, 3300, 0, 1080, 1084, 1089, 1250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, },

• /* 93 - 3840x2160p@24Hz 16:9 */

• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 5116,

• 5204, 5500, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9,},

• /* 94 - 3840x2160p@25Hz 16:9 */

• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4896,

• 4984, 5280, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

• /* 95 - 3840x2160p@30Hz 16:9 */

• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

• 4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

• /* 96 - 3840x2160p@50Hz 16:9 */

• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,

• 4984, 5280, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

• /* 97 - 3840x2160p@60Hz 16:9 */

• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,

• 4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9},

• /* 98 - 4096x2160p@24Hz 256:135 */

• { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5116,

• 5204, 5500, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

• /* 99 - 4096x2160p@25Hz 256:135 */

• { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 5064,

• 5152, 5280, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

• /* 100 - 4096x2160p@30Hz 256:135 */

• { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000, 4096, 4184,

• 4272, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

• /* 101 - 4096x2160p@50Hz 256:135 */

• { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 5064,

• 5152, 5280, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

• /* 102 - 4096x2160p@60Hz 256:135 */

• { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 4184,

• 4272, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135},

• /* 103 - 3840x2160p@24Hz 64:27 */

• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 5116,

• 5204, 5500, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

• /* 104 - 3840x2160p@25Hz 64:27 */

• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

• 4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

• /* 105 - 3840x2160p@30Hz 64:27 */

• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000, 3840, 4016,

• 4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

• /* 106 - 3840x2160p@50Hz 64:27 */

• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4896,

• 4984, 5280, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27},

• /* 107 - 3840x2160p@60Hz 64:27 */

• { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 4016,

• 4104, 4400, 0, 2160, 2168, 2178, 2250, 0,
  

• DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
  

• .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27}, };

  /*

-- 2.7.4

Regards

Shashank

On 5/30/2017 10:06 PM, Ville Syrjälä wrote:

On Tue, May 30, 2017 at 05:43:44PM +0530, Shashank Sharma wrote:

...

HDMI displays can support various output types, based on the color space and subsampling type. The possible outputs from a HDMI 2.0 monitor could be:

• RGB
• YCBCR 444
• YCBCR 422
• YCBCR 420

This patch adds a drm property, using which, a userspace

I think we should add the 4:2:0 only mode support first since that doesn't require new uapi. The uapi stuff probably needs more careful thought as we might want to consider exposing more of the colorimetry stuff supported by the HDMI infoframes, and DP MSA MISC and VSC SDP.

I was coming from the opposite school of thought. I was thinking 420_only modes should be handled carefully, whereas 420_also doesnt need any uapi (This patch series contains 420_also and doesnt modify the UAPI) due to following reasons:

assume there is a mode 3840x2160@60 appears to be in 2 different EDIDs, in first EDID as a 420_only mode and in other as 420_also mode. - If we add a 420_also mode in the mode_list, userspace might pick it for the modeset as favorite, as most of the 420 modes are 4k modes. - Now, if userspace doesn't set the hdmi_output property to YCBCR420, and sends a modeset on this mode: - the modeset will be successful in case of a 420_also mode, as it can be supported in RGB/YUV444 also. - the modeset will fail in case of 420_only mode, as this mode cant be supported in any other hdmi output format.

In this case, addition of 420_only mode, in the connectors->modes list should be done, only when the driver is ready to handle the YCBCR420 output, or we have to inform userspace about these modes which need the hdmi_ouput property to be set with the modeset, which might in turn need an uabi.

Does it make a case ?

- Shashank

...

can specify its preference, for the HDMI output type. The output type enums are similar to the mentioned outputs above. To handle various subsampling of YCBCR output types, this property allows two special cases:

• DRM_HDMI_OUTPUT_YCBCR_HQ

This indicates preferred output should be YCBCR output, with highest subsampling rate by the source/sink, which can be typically:

• ycbcr444
• ycbcr422
• ycbcr420
• DRM_HDMI_OUTPUT_YCBCR_LQ

This indicates preferred output should be YCBCR output, with lowest subsampling rate supported by source/sink, which can be:

• ycbcr420
• ycbcr422
• ycbcr444

Default value of the property is set to 0 = RGB, so no changes if you dont set the property.

V2: Added description for the new variable to address build warning

Cc: Ville Syrjala ville.syrjala@linux.intel.com Cc: Jose Abreu joabreu@synopsys.com Cc: Daniel Vetter daniel.vetter@intel.com Signed-off-by: Shashank Sharma shashank.sharma@intel.com

---

drivers/gpu/drm/drm_atomic.c | 2 ++ drivers/gpu/drm/drm_atomic_helper.c | 4 ++++ drivers/gpu/drm/drm_connector.c | 32 ++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 18 ++++++++++++++++++ include/drm/drm_mode_config.h | 5 +++++ 5 files changed, 61 insertions(+)

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index e163701..8c4e040 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1192,6 +1192,8 @@ int drm_atomic_connector_set_property(struct drm_connector *connector, state->picture_aspect_ratio = val; } else if (property == connector->scaling_mode_property) { state->scaling_mode = val;

• } else if (property == config->hdmi_output_property) {

• state->hdmi_output = val;
  

  } else if (connector->funcs->atomic_set_property) { return connector->funcs->atomic_set_property(connector, state, property, val);

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 636e561..86b1780 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -567,6 +567,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, if (old_connector_state->link_status != new_connector_state->link_status) new_crtc_state->connectors_changed = true;

• 	if (old_connector_state->hdmi_output !=
  

• 	    new_connector_state->hdmi_output)
  

• 		new_crtc_state->connectors_changed = true;
  

  }

  if (funcs->atomic_check)

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 5cd61af..f3c5928 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -227,6 +227,11 @@ int drm_connector_init(struct drm_device *dev, config->edid_property, 0);

• if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL)

• drm_object_attach_property(&connector->base,
  

• 			   config->hdmi_output_property,
  

• 			   0);
  

• drm_object_attach_property(&connector->base, config->dpms_property, 0);

@@ -617,6 +622,26 @@ static const struct drm_prop_enum_list drm_link_status_enum_list[] = { }; DRM_ENUM_NAME_FN(drm_get_link_status_name, drm_link_status_enum_list)

+static const struct drm_prop_enum_list drm_hdmi_output_enum_list[] = {

• { DRM_HDMI_OUTPUT_DEFAULT_RGB, "output_rgb" },
• { DRM_HDMI_OUTPUT_YCBCR444, "output_ycbcr444" },
• { DRM_HDMI_OUTPUT_YCBCR422, "output_ycbcr422" },
• { DRM_HDMI_OUTPUT_YCBCR420, "output_ycbcr420" },
• { DRM_HDMI_OUTPUT_YCBCR_HQ, "output_ycbcr_high_subsampling" },
• { DRM_HDMI_OUTPUT_YCBCR_LQ, "output_ycbcr_low_subsampling" },
• { DRM_HDMI_OUTPUT_INVALID, "invalid_output" },

+};

+/**

• • drm_get_hdmi_output_name - return a string for a given hdmi output enum
• • @type: enum of output type
• */

+const char *drm_get_hdmi_output_name(enum drm_hdmi_output_type type) +{

• return drm_hdmi_output_enum_list[type].name;

+} +EXPORT_SYMBOL(drm_get_hdmi_output_name);

• /**
  • drm_display_info_set_bus_formats - set the supported bus formats
  • @info: display info to store bus formats in

@@ -789,6 +814,13 @@ int drm_connector_create_standard_properties(struct drm_device *dev) return -ENOMEM; dev->mode_config.link_status_property = prop;

• prop = drm_property_create_enum(dev, 0, "hdmi_output_format",

• 			drm_hdmi_output_enum_list,
  

• 			ARRAY_SIZE(drm_hdmi_output_enum_list));
  

• if (!prop)

• return -ENOMEM;
  

• dev->mode_config.hdmi_output_property = prop;
• return 0; }

diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 49cc38c..f77f283 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -313,6 +313,17 @@ struct drm_tv_connector_state { unsigned int hue; };

+/* HDMI output pixel format */ +enum drm_hdmi_output_type {

• DRM_HDMI_OUTPUT_DEFAULT_RGB, /* default RGB */
• DRM_HDMI_OUTPUT_YCBCR444, /* YCBCR 444 */
• DRM_HDMI_OUTPUT_YCBCR422, /* YCBCR 422 */
• DRM_HDMI_OUTPUT_YCBCR420, /* YCBCR 420 */
• DRM_HDMI_OUTPUT_YCBCR_HQ, /* Highest subsampled YUV */
• DRM_HDMI_OUTPUT_YCBCR_LQ, /* Lowest subsampled YUV */
• DRM_HDMI_OUTPUT_INVALID, /* Guess what ? */

+};

• /**
  • struct drm_connector_state - mutable connector state
  • @connector: backpointer to the connector

@@ -357,6 +368,12 @@ struct drm_connector_state { * upscaling, mostly used for built-in panels. */ unsigned int scaling_mode;

• /**

• * @hdmi_output: Connector property to control the
  

• * HDMI output mode (RGB/YCBCR444/422/420).
  

• */
  

• enum drm_hdmi_output_type hdmi_output; };

  /**

@@ -976,6 +993,7 @@ static inline void drm_connector_unreference(struct drm_connector *connector)

const char *drm_get_connector_status_name(enum drm_connector_status status); const char *drm_get_subpixel_order_name(enum subpixel_order order); +const char *drm_get_hdmi_output_name(enum drm_hdmi_output_type type); const char *drm_get_dpms_name(int val); const char *drm_get_dvi_i_subconnector_name(int val); const char *drm_get_dvi_i_select_name(int val); diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index 4298171..1887261 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -740,6 +740,11 @@ struct drm_mode_config { * the position of the output on the host's screen. */ struct drm_property *suggested_y_property;

• /**

• * @hdmi_output_property: output pixel format from HDMI display
  

• * Default is set for RGB
  

• */
  

• struct drm_property *hdmi_output_property;

  /* dumb ioctl parameters */ uint32_t preferred_depth, prefer_shadow;

-- 2.7.4

Regards

Shashank

On 5/31/2017 6:16 PM, Ville Syrjälä wrote:

On Tue, May 30, 2017 at 10:18:19PM +0530, Sharma, Shashank wrote:

...

Regards

Shashank

On 5/30/2017 10:06 PM, Ville Syrjälä wrote:

...

On Tue, May 30, 2017 at 05:43:44PM +0530, Shashank Sharma wrote:

...

HDMI displays can support various output types, based on the color space and subsampling type. The possible outputs from a HDMI 2.0 monitor could be:

• RGB
• YCBCR 444
• YCBCR 422
• YCBCR 420

This patch adds a drm property, using which, a userspace

I think we should add the 4:2:0 only mode support first since that doesn't require new uapi. The uapi stuff probably needs more careful thought as we might want to consider exposing more of the colorimetry stuff supported by the HDMI infoframes, and DP MSA MISC and VSC SDP.

I was coming from the opposite school of thought. I was thinking 420_only modes should be handled carefully, whereas 420_also doesnt need any uapi (This patch series contains 420_also and doesnt modify the UAPI) due to following reasons:

assume there is a mode 3840x2160@60 appears to be in 2 different EDIDs, in first EDID as a 420_only mode and in other as 420_also mode.

• If we add a 420_also mode in the mode_list, userspace might pick it

for the modeset as favorite, as most of the 420 modes are 4k modes.

• Now, if userspace doesn't set the hdmi_output property to YCBCR420,

and sends a modeset on this mode: - the modeset will be successful in case of a 420_also mode, as it can be supported in RGB/YUV444 also. - the modeset will fail in case of 420_only mode, as this mode cant be supported in any other hdmi output format.

In this case, addition of 420_only mode, in the connectors->modes list should be done, only when the driver is ready to handle the YCBCR420 output, or we have to inform userspace about these modes which need the hdmi_ouput property to be set with the modeset, which might in turn need an uabi.

Does it make a case ?

What I think we want is to automagically enable 4:2:0 output if userspace picks a 4:2:0 only mode, regardless of the property value. And in fact this way we don't even need the property to enable the use of 4:2:0 only modes. Which is great because it means current userspace can start to use those modes without any code changes.

I was worried about this sitution: - There is one 420_only mode (38x21@60) in EDID - We added a 420_only mode in the list, which userspace can see (but cant differentiate between non-420 or 420 mode) - Userspace triggers a modeset on this, but the driver doesn't support YCBCR420 output yet, as source doesn't support it yet.

In this case, we will cause modeset failure for each driver which doesnt support HDMI 2.0. So if we have to make a 420_only mode visible to userspace, we have to indicate somehow that its 420_only mode. Do you think so ?

- Shashank

...

• Shashank

...

...

can specify its preference, for the HDMI output type. The output type enums are similar to the mentioned outputs above. To handle various subsampling of YCBCR output types, this property allows two special cases:

• DRM_HDMI_OUTPUT_YCBCR_HQ

This indicates preferred output should be YCBCR output, with highest subsampling rate by the source/sink, which can be typically:

• ycbcr444
• ycbcr422
• ycbcr420
• DRM_HDMI_OUTPUT_YCBCR_LQ

This indicates preferred output should be YCBCR output, with lowest subsampling rate supported by source/sink, which can be:

• ycbcr420
• ycbcr422
• ycbcr444

Default value of the property is set to 0 = RGB, so no changes if you dont set the property.

V2: Added description for the new variable to address build warning

Cc: Ville Syrjala ville.syrjala@linux.intel.com Cc: Jose Abreu joabreu@synopsys.com Cc: Daniel Vetter daniel.vetter@intel.com Signed-off-by: Shashank Sharma shashank.sharma@intel.com

---

drivers/gpu/drm/drm_atomic.c | 2 ++ drivers/gpu/drm/drm_atomic_helper.c | 4 ++++ drivers/gpu/drm/drm_connector.c | 32 ++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 18 ++++++++++++++++++ include/drm/drm_mode_config.h | 5 +++++ 5 files changed, 61 insertions(+)

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index e163701..8c4e040 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1192,6 +1192,8 @@ int drm_atomic_connector_set_property(struct drm_connector *connector, state->picture_aspect_ratio = val; } else if (property == connector->scaling_mode_property) { state->scaling_mode = val;

• } else if (property == config->hdmi_output_property) {

• state->hdmi_output = val;
  

  } else if (connector->funcs->atomic_set_property) { return connector->funcs->atomic_set_property(connector, state, property, val);

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 636e561..86b1780 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -567,6 +567,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, if (old_connector_state->link_status != new_connector_state->link_status) new_crtc_state->connectors_changed = true;

• 	if (old_connector_state->hdmi_output !=
  

• 	    new_connector_state->hdmi_output)
  

• 		new_crtc_state->connectors_changed = true;
  }
  
  if (funcs->atomic_check)
  

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 5cd61af..f3c5928 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -227,6 +227,11 @@ int drm_connector_init(struct drm_device *dev, config->edid_property, 0);

• if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL)

• drm_object_attach_property(&connector->base,
  

• 			   config->hdmi_output_property,
  

• 			   0);
  

• drm_object_attach_property(&connector->base, config->dpms_property, 0);

@@ -617,6 +622,26 @@ static const struct drm_prop_enum_list drm_link_status_enum_list[] = { }; DRM_ENUM_NAME_FN(drm_get_link_status_name, drm_link_status_enum_list)

+static const struct drm_prop_enum_list drm_hdmi_output_enum_list[] = {

• { DRM_HDMI_OUTPUT_DEFAULT_RGB, "output_rgb" },
• { DRM_HDMI_OUTPUT_YCBCR444, "output_ycbcr444" },
• { DRM_HDMI_OUTPUT_YCBCR422, "output_ycbcr422" },
• { DRM_HDMI_OUTPUT_YCBCR420, "output_ycbcr420" },
• { DRM_HDMI_OUTPUT_YCBCR_HQ, "output_ycbcr_high_subsampling" },
• { DRM_HDMI_OUTPUT_YCBCR_LQ, "output_ycbcr_low_subsampling" },
• { DRM_HDMI_OUTPUT_INVALID, "invalid_output" },

+};

+/**

• • drm_get_hdmi_output_name - return a string for a given hdmi output enum
• • @type: enum of output type
• */

+const char *drm_get_hdmi_output_name(enum drm_hdmi_output_type type) +{

• return drm_hdmi_output_enum_list[type].name;

+} +EXPORT_SYMBOL(drm_get_hdmi_output_name);

• /**
  • drm_display_info_set_bus_formats - set the supported bus formats
  • @info: display info to store bus formats in

@@ -789,6 +814,13 @@ int drm_connector_create_standard_properties(struct drm_device *dev) return -ENOMEM; dev->mode_config.link_status_property = prop;

• prop = drm_property_create_enum(dev, 0, "hdmi_output_format",

• 			drm_hdmi_output_enum_list,
  

• 			ARRAY_SIZE(drm_hdmi_output_enum_list));
  

• if (!prop)

• return -ENOMEM;
  

• dev->mode_config.hdmi_output_property = prop;
• return 0; }

diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 49cc38c..f77f283 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -313,6 +313,17 @@ struct drm_tv_connector_state { unsigned int hue; };

+/* HDMI output pixel format */ +enum drm_hdmi_output_type {

• DRM_HDMI_OUTPUT_DEFAULT_RGB, /* default RGB */
• DRM_HDMI_OUTPUT_YCBCR444, /* YCBCR 444 */
• DRM_HDMI_OUTPUT_YCBCR422, /* YCBCR 422 */
• DRM_HDMI_OUTPUT_YCBCR420, /* YCBCR 420 */
• DRM_HDMI_OUTPUT_YCBCR_HQ, /* Highest subsampled YUV */
• DRM_HDMI_OUTPUT_YCBCR_LQ, /* Lowest subsampled YUV */
• DRM_HDMI_OUTPUT_INVALID, /* Guess what ? */

+};

• /**
  • struct drm_connector_state - mutable connector state
  • @connector: backpointer to the connector

@@ -357,6 +368,12 @@ struct drm_connector_state { * upscaling, mostly used for built-in panels. */ unsigned int scaling_mode;

• /**

• * @hdmi_output: Connector property to control the
  

• * HDMI output mode (RGB/YCBCR444/422/420).
  

• */
  

• enum drm_hdmi_output_type hdmi_output; };

  /**

@@ -976,6 +993,7 @@ static inline void drm_connector_unreference(struct drm_connector *connector)

const char *drm_get_connector_status_name(enum drm_connector_status status); const char *drm_get_subpixel_order_name(enum subpixel_order order); +const char *drm_get_hdmi_output_name(enum drm_hdmi_output_type type); const char *drm_get_dpms_name(int val); const char *drm_get_dvi_i_subconnector_name(int val); const char *drm_get_dvi_i_select_name(int val); diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index 4298171..1887261 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -740,6 +740,11 @@ struct drm_mode_config { * the position of the output on the host's screen. */ struct drm_property *suggested_y_property;

• /**

• * @hdmi_output_property: output pixel format from HDMI display
  

• * Default is set for RGB
  

• */
  

• struct drm_property *hdmi_output_property;

  /* dumb ioctl parameters */ uint32_t preferred_depth, prefer_shadow;

-- 2.7.4