Use the drm_property_blob data for user-supplied EDID blobs.
Signed-off-by: Marius Vlad <[email protected]>
---
drivers/gpu/drm/i915/intel_hdmi.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c
b/drivers/gpu/drm/i915/intel_hdmi.c
index 8698a64..a10f3d9 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1336,7 +1336,8 @@ intel_hdmi_unset_edid(struct drm_connector *connector)
intel_hdmi->has_audio = false;
intel_hdmi->rgb_quant_range_selectable = false;
- kfree(to_intel_connector(connector)->detect_edid);
+ if (!connector->override_edid)
+ kfree(to_intel_connector(connector)->detect_edid);
to_intel_connector(connector)->detect_edid = NULL;
}
@@ -1355,6 +1356,9 @@ intel_hdmi_set_edid(struct drm_connector *connector, bool
force)
intel_gmbus_get_adapter(dev_priv,
intel_hdmi->ddc_bus));
+ if (!edid && connector->override_edid)
+ edid = (struct edid *) connector->edid_blob_ptr->data;
+
intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
}
--
2.7.0.rc3
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
