openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Rewrite bxt_hpd_handler() to look like everyone else 

bxt_hpd_handler() looks different to everyone else for no good reason.
Rewrite it to use the standard variable namees etc.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.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:
Ville Syrjälä 2015-08-27 23:56:09 +03:00 committed by Daniel Vetter
parent 08d8a232aa
commit cebd87a077
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2128,27 +2128,17 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
return ret;
}
static void bxt_hpd_handler(struct drm_device *dev, uint32_t iir_status)
static void bxt_hpd_irq_handler(struct drm_device *dev, u32 hotplug_trigger)
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 hp_control, hp_trigger;
u32 pin_mask = 0, long_mask = 0;
struct drm_i915_private *dev_priv = to_i915(dev);
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
/* Get the status */
hp_trigger = iir_status & BXT_DE_PORT_HOTPLUG_MASK;
hp_control = I915_READ(BXT_HOTPLUG_CTL);
dig_hotplug_reg = I915_READ(BXT_HOTPLUG_CTL);
I915_WRITE(BXT_HOTPLUG_CTL, dig_hotplug_reg);
/* Hotplug not enabled ? */
if (!(hp_control & BXT_HOTPLUG_CTL_MASK)) {
DRM_ERROR("Interrupt when HPD disabled\n");
return;
}
/* Clear sticky bits in hpd status */
I915_WRITE(BXT_HOTPLUG_CTL, hp_control);
intel_get_hpd_pins(&pin_mask, &long_mask, hp_trigger, hp_control,
hpd_bxt, bxt_port_hotplug_long_detect);
intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,
dig_hotplug_reg, hpd_bxt,
bxt_port_hotplug_long_detect);
intel_hpd_irq_handler(dev, pin_mask, long_mask);
}
@ -2198,7 +2188,12 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
tmp = I915_READ(GEN8_DE_PORT_IIR);
if (tmp) {
bool found = false;
u32 hotplug_trigger = tmp & GEN8_PORT_DP_A_HOTPLUG;
u32 hotplug_trigger = 0;
if (IS_BROXTON(dev_priv))
hotplug_trigger = tmp & BXT_DE_PORT_HOTPLUG_MASK;
else if (IS_BROADWELL(dev_priv))
hotplug_trigger = tmp & GEN8_PORT_DP_A_HOTPLUG;
I915_WRITE(GEN8_DE_PORT_IIR, tmp);
ret = IRQ_HANDLED;
@ -2221,8 +2216,8 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
found = true;
}
if (IS_BROXTON(dev) && tmp & BXT_DE_PORT_HOTPLUG_MASK) {
bxt_hpd_handler(dev, tmp);
if (IS_BROXTON(dev) && hotplug_trigger) {
bxt_hpd_irq_handler(dev, hotplug_trigger);
found = true;
}