Skip to contentSkip to conversation

drm/i915: Support HDMI EDID injection

PATCH Daniel Vetter 1 participant 1 message Feb 11, 2016 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 16 lines · Marius Vlad

Allow HDMI EDID injection by making a copy of edid_blob_ptr. When disconnecting the connector, or forcing a disconnect, the copy will free'd by intel_hdmi_unset_edid().

---
 drivers/gpu/drm/i915/intel_hdmi.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
index 8698a64..4725e8d1 100644
@@ -1355,6 +1355,16 @@ intel_hdmi_set_edid(struct drm_connector *connector, bool force)
 				    intel_gmbus_get_adapter(dev_priv,
 				    intel_hdmi->ddc_bus));
 

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_set_edid(struct drm_connector *connector, bool force) · line 1367

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +10 -0
+		/* for injected EDIDs */
+		if (!edid && connector->override_edid) {
+			edid = kzalloc(connector->edid_blob_ptr->length,
+					GFP_KERNEL);
+			if (edid) {
+				memcpy(edid, connector->edid_blob_ptr->data,
+						connector->edid_blob_ptr->length);
+			}
+		}
+

You're sure this does anything? When forcing the edid, ->detect isn't called. And the problem with hdmi injection isn't the edid, but that our audio detection code is wrong. See how has_audio is set in intel_hdmi_set_edid is handled. Similarly we need to fixup the eld code to correctly update drm_connector->eld.

Finally this needs a testcase which:
1. injects hdmi edid without audio, then sets mode.
2. injects hdmi edid with audio, then sets mode.
3. injects hdmi edid without audio, then sets mode.

Just to exercise the code paths. Bonus points if you check through alsa that the hdmi audio state indeed matches our expectations (compare the eld you can grab from alsa with what you injected to make sure you look at the right screen).

But given all our other oustanding troubles around CI I'd suggest we deprioritize this task for now. Please add this comment to JIRA so it wont' get lost.
-Daniel

Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
 		intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
 	}
 
Signature · 1 line
2.5.0
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx