[Intel-gfx] [PATCH 5/6] drm/i915: drm/i915: Process hpd only for hdmi inside hotplug_work_func

Daniel Vetter daniel at ffwll.ch
Fri Sep 4 07:47:02 PDT 2015


On Fri, Sep 04, 2015 at 06:56:15PM +0530, Sonika Jindal wrote:
> If the same port is enumerated as hdmi as well as DP, this will get
> called for DP connector as well which is not required because
> i915_hotplug_work_func is solely to handle hdmi HPD.
> 
> 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..8e1c43e 100644
> --- a/drivers/gpu/drm/i915/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/intel_hotplug.c
> @@ -325,7 +325,8 @@ static void i915_hotplug_work_func(struct work_struct *work)
>  
>  	list_for_each_entry(connector, &mode_config->connector_list, head) {
>  		intel_connector = to_intel_connector(connector);
> -		if (!intel_connector->encoder)
> +		if (!intel_connector->encoder
> +			&& connector->connector_type != DRM_MODE_CONNECTOR_HDMIA)
>  			continue;

Pretty sure this breaks hotplug detection for everything but HDMI (since
now nothing but hdmi gets called it's ->detect function, and only if that
signals a status change will we send out an uevent to userspace). Does
this really not break DP hotplug?

Yes we probe both hdmi and DP always, and probably we could be more
intelligent with the fallback between the too. But this here doesn't seem
to be the right solution.
-Daniel

>  		intel_encoder = intel_connector->encoder;
>  		if (hpd_event_bits & (1 << intel_encoder->hpd_pin)) {
> -- 
> 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