leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Add bit field to record which pins have received HPD events (v3)

Browse Source 
This way it is possible to limit 're'-detect() of displays to connectors
which have received an HPD event.

v2: Reordered drm_i915_private: Move hpd_event_bits to hpd state tracking.
v3: Fixed merge conflicts with previous patches.

Signed-off-by: Egbert Eich <eich@suse.de>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Egbert Eich 2013-04-11 15:57:57 +02:00 committed by Daniel Vetter
parent 259bd5d4e9
commit 142e239849
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/i915_drv.h
View File

@ -951,6 +951,7 @@ typedef struct drm_i915_private {
HPD_MARK_DISABLED = 2 HPD_MARK_DISABLED = 2
} hpd_mark; } hpd_mark;
} hpd_stats[HPD_NUM_PINS]; } hpd_stats[HPD_NUM_PINS];
u32 hpd_event_bits;
struct timer_list hotplug_reenable_timer; struct timer_list hotplug_reenable_timer;
int num_pch_pll; int num_pch_pll;

10
drivers/gpu/drm/i915/i915_irq.c
View File

@ -557,6 +557,7 @@ static void i915_hotplug_work_func(struct work_struct *work)
struct drm_connector *connector; struct drm_connector *connector;
unsigned long irqflags; unsigned long irqflags;
bool hpd_disabled = false; bool hpd_disabled = false;
u32 hpd_event_bits;
/* HPD irq before everything is fully set up. */ /* HPD irq before everything is fully set up. */
if (!dev_priv->enable_hotplug_processing) if (!dev_priv->enable_hotplug_processing)
@ -566,6 +567,9 @@ static void i915_hotplug_work_func(struct work_struct *work)
DRM_DEBUG_KMS("running encoder hotplug functions\n"); DRM_DEBUG_KMS("running encoder hotplug functions\n");
spin_lock_irqsave(&dev_priv->irq_lock, irqflags); spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
hpd_event_bits = dev_priv->hpd_event_bits;
dev_priv->hpd_event_bits = 0;
list_for_each_entry(connector, &mode_config->connector_list, head) { list_for_each_entry(connector, &mode_config->connector_list, head) {
intel_connector = to_intel_connector(connector); intel_connector = to_intel_connector(connector);
intel_encoder = intel_connector->encoder; intel_encoder = intel_connector->encoder;
@ -580,6 +584,10 @@ 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",
drm_get_connector_name(connector), 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
@ -844,6 +852,7 @@ static inline bool hotplug_irq_storm_detect(struct drm_device *dev,
if (!(hpd[i] & hotplug_trigger) || if (!(hpd[i] & hotplug_trigger) ||
dev_priv->hpd_stats[i].hpd_mark != HPD_ENABLED) dev_priv->hpd_stats[i].hpd_mark != HPD_ENABLED)
dev_priv->hpd_event_bits |= (1 << i);
continue; continue;
if (!time_in_range(jiffies, dev_priv->hpd_stats[i].hpd_last_jiffies, if (!time_in_range(jiffies, dev_priv->hpd_stats[i].hpd_last_jiffies,
@ -853,6 +862,7 @@ static inline bool hotplug_irq_storm_detect(struct drm_device *dev,
dev_priv->hpd_stats[i].hpd_cnt = 0; dev_priv->hpd_stats[i].hpd_cnt = 0;
} else if (dev_priv->hpd_stats[i].hpd_cnt > HPD_STORM_THRESHOLD) { } else if (dev_priv->hpd_stats[i].hpd_cnt > HPD_STORM_THRESHOLD) {
dev_priv->hpd_stats[i].hpd_mark = HPD_MARK_DISABLED; dev_priv->hpd_stats[i].hpd_mark = HPD_MARK_DISABLED;
dev_priv->hpd_event_bits &= ~(1 << i);
DRM_DEBUG_KMS("HPD interrupt storm detected on PIN %d\n", i); DRM_DEBUG_KMS("HPD interrupt storm detected on PIN %d\n", i);
ret = true; ret = true;
} else { } else {