diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2017-01-13 16:07:42 +0100 |
|---|---|---|
| committer | Neil Armstrong <narmstrong@baylibre.com> | 2017-01-17 13:10:38 +0100 |
| commit | a7b7167057b29aa633458a98ec4ddbb37e7d90b4 (patch) | |
| tree | a90022407b98f90639ae2b4e956a1c811165e83d | |
| parent | 67ebd1fe24789dc91c2d9baf0e2a40692deeec65 (diff) | |
drm/bridge: dw-hdmi: Take input format from plat_dataamlogic/v4.10/drm-hdmi-dw-hdmi-rfc-v1
Some disply pipelines can only provide non-RBG input pixels to the HDMI TX
Controller, this patch takes the pixel format from the plat_data if provided.
| -rw-r--r-- | drivers/gpu/drm/bridge/dw-hdmi.c | 7 | ||||
| -rw-r--r-- | include/drm/bridge/dw_hdmi.h | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index 8a6a1837c0d3..fa4147c02787 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -1420,8 +1420,11 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = 0; hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0; - /* TODO: Get input format from IPU (via FB driver interface) */ - hdmi->hdmi_data.enc_in_format = RGB; + /* Get input format from plat data or fallback to RGB */ + if (hdmi->plat_data->input_fmt >= 0) + hdmi->hdmi_data.enc_in_format = hdmi->plat_data->input_fmt; + else + hdmi->hdmi_data.enc_in_format = RGB; hdmi->hdmi_data.enc_out_format = RGB; diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index d6a0ab30ddcd..4f426c3f80ce 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -21,6 +21,14 @@ enum { DW_HDMI_RES_MAX, }; +enum { + DW_HDMI_INPUT_FMT_RGB = 0, + DW_HDMI_INPUT_FMT_YCBCR444, + DW_HDMI_INPUT_FMT_YCBCR422_16BITS, + DW_HDMI_INPUT_FMT_YCBCR422_8BITS, + DW_HDMI_INPUT_FMT_XVYCC444, +}; + enum dw_hdmi_phy_type { DW_HDMI_PHY_DWC_HDMI_TX_PHY = 0x00, DW_HDMI_PHY_DWC_MHL_PHY_HEAC = 0xb2, @@ -68,6 +76,7 @@ struct dw_hdmi_plat_data { const struct dw_hdmi_plat_data *data); bool (*hdmi_read_hpd)(struct dw_hdmi *hdmi, const struct dw_hdmi_plat_data *data); + int input_fmt; }; int dw_hdmi_probe(struct platform_device *pdev, |