[Intel-gfx] [PATCH v2] drm/i915: Support HDMI EDID injection

Marius Vlad marius.c.vlad at intel.com
Wed Feb 3 16:49:09 UTC 2016


Make a copy of drm_property_blob data for user-supplied EDID blobs.

v2: Allocate and memcopy drm_property_blob->data instead of pointing
to it.

Signed-off-by: Marius Vlad <marius.c.vlad at intel.com>
---
 drivers/gpu/drm/i915/intel_hdmi.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 8698a64..4c9bb5f 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1355,6 +1355,16 @@ intel_hdmi_set_edid(struct drm_connector *connector, bool force)
 				    intel_gmbus_get_adapter(dev_priv,
 				    intel_hdmi->ddc_bus));
 
+		/*
+		 * Use the user-supplied EDID blob in case we don't have an
+		 * EDID from the display.
+		 */
+		if (!edid && connector->override_edid) {
+			edid = kmemdup(connector->edid_blob_ptr->data,
+				       connector->edid_blob_ptr->length,
+				       GFP_KERNEL);
+		}
+
 		intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
 	}
 
-- 
2.7.0



More information about the Intel-gfx mailing list