[Intel-gfx] [PATCH 1/5] drm/i915/irq: move hotplug even debug print to second connector loop

[Chris Wilson]

Subject s/even/event/

On Thu, Jun 18, 2015 at 01:06:13PM +0300, Jani Nikula wrote:
> The hotplug work function has two loops iterating over connectors, the
> first for handling hotplug disabling due to irq storms and the second
> for actually handling the hotplug events. Move the debug printing into
> the second one, so we can abstract the storm handling better. This may
> change the output ordering slightly when there are multiple simultaneous
> hotplug events.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_irq.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 56db9e747464..d64d6895a2e5 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -917,10 +917,6 @@ static void i915_hotplug_work_func(struct work_struct *work)
>  				| DRM_CONNECTOR_POLL_DISCONNECT;
>  			hpd_disabled = true;
>  		}
> -		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 there were no outputs to poll, poll was disabled,
>  	  * therefore make sure it's enabled when disabling HPD on
> @@ -939,6 +935,8 @@ static void i915_hotplug_work_func(struct work_struct *work)
>  			continue;
>  		intel_encoder = intel_connector->encoder;
>  		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);

In light of other conversations, is reporting an irq (even a hotplug
one) directly related to KMS? I think DRIVER is more specific in this
case.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre