iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/meson: switch to drm_bridge_edid_read()

Browse Source 
Prefer using the struct drm_edid based functions.

Not ideal, should use source physical address from connector info.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/0a6556b4abaa341b5a3b9b466dbb23714369f7e1.1706038510.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2024-01-23 21:37:18 +02:00
parent d61f65159e
commit b334be86c6
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/meson/meson_encoder_hdmi.c
View File

@ -323,19 +323,31 @@ static void meson_encoder_hdmi_hpd_notify(struct drm_bridge *bridge,
enum drm_connector_status status) enum drm_connector_status status)
{ {
struct meson_encoder_hdmi *encoder_hdmi = bridge_to_meson_encoder_hdmi(bridge); struct meson_encoder_hdmi *encoder_hdmi = bridge_to_meson_encoder_hdmi(bridge);
struct edid *edid;
if (!encoder_hdmi->cec_notifier) if (!encoder_hdmi->cec_notifier)
return; return;
if (status == connector_status_connected) { if (status == connector_status_connected) {
edid = drm_bridge_get_edid(encoder_hdmi->next_bridge, encoder_hdmi->connector); const struct drm_edid *drm_edid;
if (!edid) const struct edid *edid;
drm_edid = drm_bridge_edid_read(encoder_hdmi->next_bridge,
encoder_hdmi->connector);
if (!drm_edid)
return; return;
/*
* FIXME: The CEC physical address should be set using
* cec_notifier_set_phys_addr(encoder_hdmi->cec_notifier,
* connector->display_info.source_physical_address) from a path
* that has read the EDID and called
* drm_edid_connector_update().
*/
edid = drm_edid_raw(drm_edid);
cec_notifier_set_phys_addr_from_edid(encoder_hdmi->cec_notifier, edid); cec_notifier_set_phys_addr_from_edid(encoder_hdmi->cec_notifier, edid);
kfree(edid); drm_edid_free(drm_edid);
} else } else
cec_notifier_phys_addr_invalidate(encoder_hdmi->cec_notifier); cec_notifier_phys_addr_invalidate(encoder_hdmi->cec_notifier);
} }