p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/i915: add for_each_hpd_pin to iterate over hotplug pins 

No functional changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Jani Nikula 2015-05-28 15:43:48 +03:00 committed by Daniel Vetter
parent 623e01e539
commit c91711f93f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,6 +217,9 @@ enum hpd_pin {
HPD_NUM_PINS
};
#define for_each_hpd_pin(__pin) \
for ((__pin) = (HPD_NONE + 1); (__pin) < HPD_NUM_PINS; (__pin)++)
struct i915_hotplug {
struct work_struct hotplug_work;

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

@ -1441,7 +1441,7 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
hotplug_trigger, dig_hotplug_reg);
spin_lock(&dev_priv->irq_lock);
for (i = 1; i < HPD_NUM_PINS; i++) {
for_each_hpd_pin(i) {
bool long_hpd;
if (!(hpd[i] & hotplug_trigger))
@ -1477,7 +1477,7 @@ static void intel_hpd_irq_handler(struct drm_device *dev,
queue_dig = true;
}
for (i = 1; i < HPD_NUM_PINS; i++) {
for_each_hpd_pin(i) {
if (hpd[i] & hotplug_trigger &&
dev_priv->hotplug.stats[i].state == HPD_DISABLED) {
/*
@ -4292,7 +4292,7 @@ static void intel_hpd_irq_reenable_work(struct work_struct *work)
intel_runtime_pm_get(dev_priv);
spin_lock_irq(&dev_priv->irq_lock);
for (i = (HPD_NONE + 1); i < HPD_NUM_PINS; i++) {
for_each_hpd_pin(i) {
struct drm_connector *connector;
if (dev_priv->hotplug.stats[i].state != HPD_DISABLED)
@ -4450,7 +4450,7 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)
struct drm_connector *connector;
int i;
for (i = 1; i < HPD_NUM_PINS; i++) {
for_each_hpd_pin(i) {
dev_priv->hotplug.stats[i].count = 0;
dev_priv->hotplug.stats[i].state = HPD_ENABLED;
}