Hi Jonas,

On 07/10/2019 21:21, Jonas Karlman wrote:

This patch enables Dynamic Range and Mastering InfoFrame on GXL, GXM and G12A.

Cc: Neil Armstrong narmstrong@baylibre.com Signed-off-by: Jonas Karlman jonas@kwiboo.se Reviewed-by: Neil Armstrong narmstrong@baylibre.com

---

drivers/gpu/drm/meson/meson_dw_hdmi.c | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c index 022286dc6ab2..3bb7ffe5fc39 100644 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c @@ -977,6 +977,11 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, dw_plat_data->input_bus_format = MEDIA_BUS_FMT_YUV8_1X24; dw_plat_data->input_bus_encoding = V4L2_YCBCR_ENC_709;

• if (dw_hdmi_is_compatible(meson_dw_hdmi, "amlogic,meson-gxl-dw-hdmi") ||

•    dw_hdmi_is_compatible(meson_dw_hdmi, "amlogic,meson-gxm-dw-hdmi") ||
  

•    dw_hdmi_is_compatible(meson_dw_hdmi, "amlogic,meson-g12a-dw-hdmi"))
  

The API of dw_hdmi_is_compatible() has changed for v5.4, but I'll fix it while applying.

Neil

• dw_plat_data->use_drm_infoframe = true;
  

• platform_set_drvdata(pdev, meson_dw_hdmi);

  meson_dw_hdmi->hdmi = dw_hdmi_bind(pdev, encoder,