Merge drm/drm-next into drm-intel-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_irq.c

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index c4e46da6502c47b0597e420e5302fbf5cc038bf8..54ea28cf8a1a5965224deded22556fa75052ea5c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1085,8 +1085,9 @@ static void ivb_parity_work(struct work_struct *work)
                kobject_uevent_env(&dev_priv->drm.primary->kdev->kobj,
                                   KOBJ_CHANGE, parity_event);
 
-               DRM_DEBUG("Parity error: Slice = %d, Row = %d, Bank = %d, Sub bank = %d.\n",
-                         slice, row, bank, subbank);
+               drm_dbg(&dev_priv->drm,
+                       "Parity error: Slice = %d, Row = %d, Bank = %d, Sub bank = %d.\n",
+                       slice, row, bank, subbank);
 
                kfree(parity_event[4]);
                kfree(parity_event[3]);
@@ -2776,7 +2777,8 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg)
                master_ctl = raw_reg_read(regs, GEN11_GFX_MSTR_IRQ);
                raw_reg_write(regs, GEN11_GFX_MSTR_IRQ, master_ctl);
        } else {
-               DRM_ERROR("Tile not supported: 0x%08x\n", master_tile_ctl);
+               drm_err(&i915->drm, "Tile not supported: 0x%08x\n",
+                       master_tile_ctl);
                dg1_master_intr_enable(regs);
                return IRQ_NONE;
        }
@@ -3942,7 +3944,7 @@ static void i8xx_error_irq_ack(struct drm_i915_private *i915,
 static void i8xx_error_irq_handler(struct drm_i915_private *dev_priv,
                                   u16 eir, u16 eir_stuck)
 {
-       DRM_DEBUG("Master Error: EIR 0x%04x\n", eir);
+       drm_dbg(&dev_priv->drm, "Master Error: EIR 0x%04x\n", eir);
 
        if (eir_stuck)
                drm_dbg(&dev_priv->drm, "EIR stuck: 0x%04x, masked\n",
@@ -3977,7 +3979,7 @@ static void i9xx_error_irq_ack(struct drm_i915_private *dev_priv,
 static void i9xx_error_irq_handler(struct drm_i915_private *dev_priv,
                                   u32 eir, u32 eir_stuck)
 {
-       DRM_DEBUG("Master Error, EIR 0x%08x\n", eir);
+       drm_dbg(&dev_priv->drm, "Master Error, EIR 0x%08x\n", eir);
 
        if (eir_stuck)
                drm_dbg(&dev_priv->drm, "EIR stuck: 0x%08x, masked\n",