Skip to content

Commit

Permalink
drm/i915: clean up HPD IRQ debug printing
Browse files Browse the repository at this point in the history
Atm, we don't print these events for all platforms and for VLV/G4X we
also print them for DP AUX completion events which is unnecessary spam.
Fix both issues.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Imre Deak authored and Daniel Vetter committed Jan 24, 2014
1 parent 4167e32 commit cc9bd49
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions drivers/gpu/drm/i915/i915_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,9 @@ static inline void intel_hpd_irq_handler(struct drm_device *dev,
if (!hotplug_trigger)
return;

DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x\n",
hotplug_trigger);

spin_lock(&dev_priv->irq_lock);
for (i = 1; i < HPD_NUM_PINS; i++) {

Expand Down Expand Up @@ -1475,9 +1478,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
u32 hotplug_status = I915_READ(PORT_HOTPLUG_STAT);
u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;

DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x\n",
hotplug_status);

intel_hpd_irq_handler(dev, hotplug_trigger, hpd_status_i915);

if (hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)
Expand Down Expand Up @@ -3414,9 +3414,6 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
u32 hotplug_status = I915_READ(PORT_HOTPLUG_STAT);
u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;

DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x\n",
hotplug_status);

intel_hpd_irq_handler(dev, hotplug_trigger, hpd_status_i915);

I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
Expand Down Expand Up @@ -3664,9 +3661,6 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
HOTPLUG_INT_STATUS_G4X :
HOTPLUG_INT_STATUS_I915);

DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x\n",
hotplug_status);

intel_hpd_irq_handler(dev, hotplug_trigger,
IS_G4X(dev) ? hpd_status_g4x : hpd_status_i915);

Expand Down

0 comments on commit cc9bd49

Please sign in to comment.