Commit a0049865 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter

drm/i915/irq: move hotplug even debug print to second connector loop

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: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 27c329ed
...@@ -917,10 +917,6 @@ static void i915_hotplug_work_func(struct work_struct *work) ...@@ -917,10 +917,6 @@ static void i915_hotplug_work_func(struct work_struct *work)
| DRM_CONNECTOR_POLL_DISCONNECT; | DRM_CONNECTOR_POLL_DISCONNECT;
hpd_disabled = true; 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, /* if there were no outputs to poll, poll was disabled,
* therefore make sure it's enabled when disabling HPD on * therefore make sure it's enabled when disabling HPD on
...@@ -939,6 +935,8 @@ static void i915_hotplug_work_func(struct work_struct *work) ...@@ -939,6 +935,8 @@ static void i915_hotplug_work_func(struct work_struct *work)
continue; continue;
intel_encoder = intel_connector->encoder; intel_encoder = intel_connector->encoder;
if (hpd_event_bits & (1 << intel_encoder->hpd_pin)) { 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)
intel_encoder->hot_plug(intel_encoder); intel_encoder->hot_plug(intel_encoder);
if (intel_hpd_irq_event(dev, connector)) if (intel_hpd_irq_event(dev, connector))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment