From: Hermes Wu <[email protected]> Add DRM_BRIDGE_OP_HDMI to bridge.ops and implement necessary callback functions.
The native AVI and AUDIO infoframe configuration API are removed. In .atomic_enable use drm_atomic_helper_connector_hdmi_update_infoframes(). for infoframe updates. Signed-off-by: Hermes Wu <[email protected]> --- drivers/gpu/drm/bridge/ite-it6505.c | 185 ++++++++++++++++++++++-------------- 1 file changed, 115 insertions(+), 70 deletions(-) diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c index 88ef76a37fe6accacdd343839ff2569b31b18ceb..4c766854de14093b80949bdb410488f504b24db8 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -25,6 +25,8 @@ #include <drm/display/drm_dp_helper.h> #include <drm/display/drm_hdcp_helper.h> +#include <drm/display/drm_hdmi_helper.h> +#include <drm/display/drm_hdmi_state_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc.h> @@ -1414,37 +1416,6 @@ static void it6505_variable_config(struct it6505 *it6505) memset(it6505->bksvs, 0, sizeof(it6505->bksvs)); } -static int it6505_send_video_infoframe(struct it6505 *it6505, - struct hdmi_avi_infoframe *frame) -{ - u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AVI_INFOFRAME_SIZE]; - int err; - struct device *dev = it6505->dev; - - err = hdmi_avi_infoframe_pack(frame, buffer, sizeof(buffer)); - if (err < 0) { - dev_err(dev, "Failed to pack AVI infoframe: %d", err); - return err; - } - - err = it6505_set_bits(it6505, REG_INFOFRAME_CTRL, EN_AVI_PKT, 0x00); - if (err) - return err; - - err = regmap_bulk_write(it6505->regmap, REG_AVI_INFO_DB1, - buffer + HDMI_INFOFRAME_HEADER_SIZE, - frame->length); - if (err) - return err; - - err = it6505_set_bits(it6505, REG_INFOFRAME_CTRL, EN_AVI_PKT, - EN_AVI_PKT); - if (err) - return err; - - return 0; -} - static void it6505_get_extcon_property(struct it6505 *it6505) { int err; @@ -1604,27 +1575,6 @@ static void it6505_enable_audio_source(struct it6505 *it6505) it6505_write(it6505, REG_AUDIO_SRC_CTRL, audio_source_count); } -static void it6505_enable_audio_infoframe(struct it6505 *it6505) -{ - struct device *dev = it6505->dev; - u8 audio_info_ca[] = { 0x00, 0x00, 0x01, 0x03, 0x07, 0x0B, 0x0F, 0x1F }; - - DRM_DEV_DEBUG_DRIVER(dev, "infoframe channel_allocation:0x%02x", - audio_info_ca[it6505->audio.channel_count - 1]); - - it6505_write(it6505, REG_AUD_INFOFRAM_DB1, it6505->audio.channel_count - - 1); - it6505_write(it6505, REG_AUD_INFOFRAM_DB2, 0x00); - it6505_write(it6505, REG_AUD_INFOFRAM_DB3, - audio_info_ca[it6505->audio.channel_count - 1]); - it6505_write(it6505, REG_AUD_INFOFRAM_DB4, 0x00); - it6505_write(it6505, REG_AUD_INFOFRAM_SUM, 0x00); - - /* Enable Audio InfoFrame */ - it6505_set_bits(it6505, REG_INFOFRAME_CTRL, EN_AUD_CTRL_PKT, - EN_AUD_CTRL_PKT); -} - static void it6505_disable_audio(struct it6505 *it6505) { it6505_set_bits(it6505, REG_DATA_MUTE_CTRL, EN_AUD_MUTE, EN_AUD_MUTE); @@ -1644,7 +1594,6 @@ static void it6505_enable_audio(struct it6505 *it6505) it6505_setup_audio_channel_status(it6505); it6505_setup_audio_format(it6505); it6505_enable_audio_source(it6505); - it6505_enable_audio_infoframe(it6505); it6505_write(it6505, REG_AUDIO_N_0_7, 0x00); it6505_write(it6505, REG_AUDIO_N_8_15, 0x80); @@ -3168,17 +3117,13 @@ it6505_bridge_mode_valid(struct drm_bridge *bridge, const struct drm_display_info *info, const struct drm_display_mode *mode) { - struct it6505 *it6505 = bridge_to_it6505(bridge); - - if (mode->flags & DRM_MODE_FLAG_INTERLACE) - return MODE_NO_INTERLACE; - - if (mode->clock > it6505->max_dpi_pixel_clock) - return MODE_CLOCK_HIGH; + unsigned long long rate; - it6505->video_info.clock = mode->clock; + rate = drm_hdmi_compute_mode_clock(mode, 8, HDMI_COLORSPACE_RGB); + if (rate == 0) + return MODE_NOCLOCK; - return MODE_OK; + return bridge->funcs->hdmi_tmds_char_rate_valid(bridge, mode, rate); } static void it6505_bridge_atomic_enable(struct drm_bridge *bridge, @@ -3217,6 +3162,8 @@ static void it6505_bridge_atomic_enable(struct drm_bridge *bridge, if (WARN_ON(!mode)) return; + drm_atomic_helper_connector_hdmi_update_infoframes(connector, state); + ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode); @@ -3224,15 +3171,8 @@ static void it6505_bridge_atomic_enable(struct drm_bridge *bridge, dev_err(dev, "Failed to setup AVI infoframe: %d", ret); it6505_update_video_parameter(it6505, mode); - - ret = it6505_send_video_infoframe(it6505, &frame); - - if (ret) - dev_err(dev, "Failed to send AVI infoframe: %d", ret); - it6505_int_mask_enable(it6505); it6505_video_reset(it6505); - it6505_drm_dp_link_set_power(&it6505->aux, &it6505->link, DP_SET_POWER_D0); } @@ -3302,6 +3242,106 @@ static const struct drm_edid *it6505_bridge_edid_read(struct drm_bridge *bridge, return drm_edid_dup(it6505->cached_edid); } +static void it6505_write_audio_infoframe(struct it6505 *it6505, + const u8 *buffer, size_t len) +{ + it6505_set_bits(it6505, REG_INFOFRAME_CTRL, EN_AUD_PKT, 0); + regmap_bulk_write(it6505->regmap, REG_AUD_INFOFRAM_DB1, + buffer + HDMI_INFOFRAME_HEADER_SIZE, + 4); + it6505_write(it6505, REG_AUD_INFOFRAM_SUM, buffer[3]); + it6505_set_bits(it6505, REG_INFOFRAME_CTRL, EN_AUD_PKT, + EN_AUD_PKT); +} + +static int it6505_write_avi_infoframe(struct it6505 *it6505, + const u8 *buffer, size_t len) +{ + struct device *dev = it6505->dev; + + if (len - HDMI_INFOFRAME_HEADER_SIZE > 13) { + DRM_DEV_DEBUG_DRIVER(dev, "AVI size fail %d", len); + return -EINVAL; + } + + it6505_set_bits(it6505, REG_INFOFRAME_CTRL, EN_AVI_PKT, 0); + regmap_bulk_write(it6505->regmap, REG_AVI_INFO_DB1, + buffer + HDMI_INFOFRAME_HEADER_SIZE, + len - HDMI_INFOFRAME_HEADER_SIZE); + + it6505_write(it6505, REG_AVI_INFO_SUM, buffer[3]); + it6505_set_bits(it6505, REG_INFOFRAME_CTRL, EN_AVI_PKT, + EN_AVI_PKT); + + return 0; +} + +static int it6505_bridge_hdmi_write_infoframe(struct drm_bridge *bridge, + enum hdmi_infoframe_type type, + const u8 *buffer, size_t len) +{ + struct it6505 *it6505 = bridge_to_it6505(bridge); + struct device *dev = it6505->dev; + + /*HW supports AVI and AUDIO infoframe only*/ + switch (type) { + case HDMI_INFOFRAME_TYPE_AUDIO: + it6505_write_audio_infoframe(it6505, buffer, len); + break; + + case HDMI_INFOFRAME_TYPE_AVI: + it6505_write_avi_infoframe(it6505, buffer, len); + break; + default: + dev_dbg(dev, "unsupported HDMI infoframe 0x%x\n", type); + break; + } + + return 0; +} + +static int it6505_bridge_hdmi_clear_infoframe(struct drm_bridge *bridge, + enum hdmi_infoframe_type type) +{ + struct it6505 *it6505 = bridge_to_it6505(bridge); + struct device *dev = it6505->dev; + + /*HW supports AVI and AUDIO infoframe only*/ + switch (type) { + case HDMI_INFOFRAME_TYPE_AUDIO: + it6505_set_bits(it6505, REG_INFOFRAME_CTRL, EN_AUD_PKT, 0); + break; + + case HDMI_INFOFRAME_TYPE_AVI: + it6505_set_bits(it6505, REG_INFOFRAME_CTRL, EN_AVI_PKT, 0); + break; + default: + dev_dbg(dev, "unsupported HDMI infoframe 0x%x\n", type); + break; + } + + return 0; +} + +static enum drm_mode_status +it6505_bridge_hdmi_tmds_char_rate_valid(const struct drm_bridge *bridge, + const struct drm_display_mode *mode, + unsigned long long tmds_rate) +{ + const struct it6505 *it6505 = container_of(bridge, + const struct it6505, + bridge); + + if (mode->flags & DRM_MODE_FLAG_INTERLACE) + return MODE_NO_INTERLACE; + + if (mode->clock > it6505->max_dpi_pixel_clock || + tmds_rate > 148500000) + return MODE_CLOCK_HIGH; + + return MODE_OK; +} + static const struct drm_bridge_funcs it6505_bridge_funcs = { .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, @@ -3315,6 +3355,9 @@ static const struct drm_bridge_funcs it6505_bridge_funcs = { .atomic_post_disable = it6505_bridge_atomic_post_disable, .detect = it6505_bridge_detect, .edid_read = it6505_bridge_edid_read, + .hdmi_clear_infoframe = it6505_bridge_hdmi_clear_infoframe, + .hdmi_write_infoframe = it6505_bridge_hdmi_write_infoframe, + .hdmi_tmds_char_rate_valid = it6505_bridge_hdmi_tmds_char_rate_valid, }; static __maybe_unused int it6505_bridge_resume(struct device *dev) @@ -3700,7 +3743,9 @@ static int it6505_i2c_probe(struct i2c_client *client) it6505->bridge.funcs = &it6505_bridge_funcs; it6505->bridge.type = DRM_MODE_CONNECTOR_DisplayPort; it6505->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID | - DRM_BRIDGE_OP_HPD; + DRM_BRIDGE_OP_HPD | DRM_BRIDGE_OP_HDMI; + it6505->bridge.vendor = "iTE"; + it6505->bridge.product = "IT6505"; drm_bridge_add(&it6505->bridge); return 0; -- 2.34.1
