On Tue, Feb 02, 2016 at 01:05:07PM +0200, Marius Vlad wrote: > Use the drm_property_blob data for EDID when an blob EDID > has been supplied over the debugfs interface. > > Signed-off-by: Marius Vlad <marius.c.v...@intel.com>
v2 of patches must have an in-patch changelog of what (and why) stuff changed. -Daniel > --- > drivers/gpu/drm/i915/intel_hdmi.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c > b/drivers/gpu/drm/i915/intel_hdmi.c > index 8698a64..241305b 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -1336,7 +1336,9 @@ 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); > + /* only free if we haven't injected EDID */ > + if (!connector->override_edid) > + kfree(to_intel_connector(connector)->detect_edid); > to_intel_connector(connector)->detect_edid = NULL; > } > > @@ -1355,6 +1357,10 @@ intel_hdmi_set_edid(struct drm_connector *connector, > bool force) > intel_gmbus_get_adapter(dev_priv, > intel_hdmi->ddc_bus)); > > + /* for injected EDID */ > + if (!edid && connector->override_edid) > + edid = (struct edid *) connector->edid_blob_ptr->data; > + > intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS); > } > > -- > 2.5.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
