[Intel-gfx] [PATCH] drm/i915: Call encoder hot_plug hook only for hdmi

Daniel Vetter daniel at ffwll.ch
Mon Sep 7 09:26:24 PDT 2015


On Mon, Sep 07, 2015 at 10:34:34AM +0530, Sonika Jindal wrote:
> If the same port is enumerated as hdmi as well as DP, this will call
> hot_plug hook for DP as well which is not required here.
> This splitting of edid read and detect is done only for HDMI with this
> series.
> 
> v2: Avoid breaking DP hpd. Also corrected the commit message and
> description accordingly. (Daniel)
> 
> Signed-off-by: Sonika Jindal <sonika.jindal at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_hotplug.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c
> index 53c0173..ff4692a 100644
> --- a/drivers/gpu/drm/i915/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/intel_hotplug.c
> @@ -331,7 +331,8 @@ static void i915_hotplug_work_func(struct work_struct *work)
>  		if (hpd_event_bits & (1 << intel_encoder->hpd_pin)) {
>  			DRM_DEBUG_KMS("Connector %s (pin %i) received hotplug event.\n",
>  				      connector->name, intel_encoder->hpd_pin);
> -			if (intel_encoder->hot_plug)
> +			if (intel_encoder->hot_plug
> +				&& connector->connector_type == DRM_MODE_CONNECTOR_HDMIA)

Please use something like grep to find all the other ->hot_plug
implementations and then please tell me why you don't break them all.
-Daniel

>  				intel_encoder->hot_plug(intel_encoder);
>  			if (intel_hpd_irq_event(dev, connector))
>  				changed = true;
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the Intel-gfx mailing list