drm/i915: Replace DRM_DEBUG with DRM_DEBUG_DRIVER

Replace the DRM_DEBUG with DRM_DEBUG_DRIVER in generic i915 driver.
Then the debug info can be obtained by adding the boot option of
"drm.debug=0x02".

At the same time the debug info in increase/decrease clock is also
printed by using DRM_DEBUG_DRIVER instead of DRM_DEBUG_KMS.

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>

6 files changed, 38 insertions, 36 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 138be49259c3..6ade4a651c9e 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1073,7 +1073,7 @@ static unsigned long i915_gtt_to_phys(struct drm_device *dev,
 
         entry = *(volatile u32 *)(gtt + (gtt_addr / 1024));
 
-        DRM_DEBUG("GTT addr: 0x%08lx, PTE: 0x%08lx\n", gtt_addr, entry);
+        DRM_DEBUG_DRIVER("GTT addr: 0x%08lx, PTE: 0x%08lx\n", gtt_addr, entry);
 
         /* Mask out these reserved bits on this hardware. */
         if (!IS_I9XX(dev) || IS_I915G(dev) || IS_I915GM(dev) ||
@@ -1099,7 +1099,7 @@ static unsigned long i915_gtt_to_phys(struct drm_device *dev,
         phys =(entry & PTE_ADDRESS_MASK) |
                 ((uint64_t)(entry & PTE_ADDRESS_MASK_HIGH) << (32 - 4));
 
-        DRM_DEBUG("GTT addr: 0x%08lx, phys addr: 0x%08lx\n", gtt_addr, phys);
+        DRM_DEBUG_DRIVER("GTT addr: 0x%08lx, phys addr: 0x%08lx\n", gtt_addr, phys);
 
         return phys;
 }
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 19d25e5d8608..2065b8f7e875 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1617,7 +1617,7 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv,
         OUT_RING(MI_USER_INTERRUPT);
         ADVANCE_LP_RING();
 
-        DRM_DEBUG("%d\n", seqno);
+        DRM_DEBUG_DRIVER("%d\n", seqno);
 
         request->seqno = seqno;
         request->emitted_jiffies = jiffies;
@@ -4367,7 +4367,7 @@ i915_gem_init_hws(struct drm_device *dev)
         memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
         I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr);
         I915_READ(HWS_PGA); /* posting read */
-        DRM_DEBUG("hws offset: 0x%08x\n", dev_priv->status_gfx_addr);
+        DRM_DEBUG_DRIVER("hws offset: 0x%08x\n", dev_priv->status_gfx_addr);
 
         return 0;
 }
@@ -4801,7 +4801,7 @@ i915_gem_phys_pwrite(struct drm_device *dev, struct drm_gem_object *obj,
         user_data = (char __user *) (uintptr_t) args->data_ptr;
         obj_addr = obj_priv->phys_obj->handle->vaddr + args->offset;
 
-        DRM_DEBUG("obj_addr %p, %lld\n", obj_addr, args->size);
+        DRM_DEBUG_DRIVER("obj_addr %p, %lld\n", obj_addr, args->size);
         ret = copy_from_user(obj_addr, user_data, args->size);
         if (ret)
                 return -EFAULT;
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 200e398453ca..0c8df96a1ef8 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -121,7 +121,7 @@ intel_alloc_mchbar_resource(struct drm_device *dev)
                                      0,   pcibios_align_resource,
                                      dev_priv->bridge_dev);
         if (ret) {
-                DRM_DEBUG("failed bus alloc: %d\n", ret);
+                DRM_DEBUG_DRIVER("failed bus alloc: %d\n", ret);
                 dev_priv->mch_res.start = 0;
                 goto out;
         }
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index c3ceffa46ea0..0887581fa650 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -191,7 +191,8 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)
         low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL;
 
         if (!i915_pipe_enabled(dev, pipe)) {
-                DRM_DEBUG("trying to get vblank count for disabled pipe %d\n", pipe);
+                DRM_DEBUG_DRIVER("trying to get vblank count for disabled "
+                                "pipe %d\n", pipe);
                 return 0;
         }
 
@@ -220,7 +221,8 @@ u32 gm45_get_vblank_counter(struct drm_device *dev, int pipe)
         int reg = pipe ? PIPEB_FRMCOUNT_GM45 : PIPEA_FRMCOUNT_GM45;
 
         if (!i915_pipe_enabled(dev, pipe)) {
-                DRM_DEBUG("trying to get vblank count for disabled pipe %d\n", pipe);
+                DRM_DEBUG_DRIVER("trying to get vblank count for disabled "
+                                        "pipe %d\n", pipe);
                 return 0;
         }
 
@@ -309,19 +311,19 @@ static void i915_error_work_func(struct work_struct *work)
         char *reset_event[] = { "RESET=1", NULL };
         char *reset_done_event[] = { "ERROR=0", NULL };
 
-        DRM_DEBUG("generating error event\n");
+        DRM_DEBUG_DRIVER("generating error event\n");
         kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, error_event);
 
         if (atomic_read(&dev_priv->mm.wedged)) {
                 if (IS_I965G(dev)) {
-                        DRM_DEBUG("resetting chip\n");
+                        DRM_DEBUG_DRIVER("resetting chip\n");
                         kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_event);
                         if (!i965_reset(dev, GDRST_RENDER)) {
                                 atomic_set(&dev_priv->mm.wedged, 0);
                                 kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_done_event);
                         }
                 } else {
-                        printk("reboot required\n");
+                        DRM_DEBUG_DRIVER("reboot required\n");
                 }
         }
 }
@@ -347,7 +349,7 @@ static void i915_capture_error_state(struct drm_device *dev)
 
         error = kmalloc(sizeof(*error), GFP_ATOMIC);
         if (!error) {
-                DRM_DEBUG("out ot memory, not capturing error state\n");
+                DRM_DEBUG_DRIVER("out ot memory, not capturing error state\n");
                 goto out;
         }
 
@@ -560,14 +562,14 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                  */
                 if (pipea_stats & 0x8000ffff) {
                         if (pipea_stats &  PIPE_FIFO_UNDERRUN_STATUS)
-                                DRM_DEBUG("pipe a underrun\n");
+                                DRM_DEBUG_DRIVER("pipe a underrun\n");
                         I915_WRITE(PIPEASTAT, pipea_stats);
                         irq_received = 1;
                 }
 
                 if (pipeb_stats & 0x8000ffff) {
                         if (pipeb_stats &  PIPE_FIFO_UNDERRUN_STATUS)
-                                DRM_DEBUG("pipe b underrun\n");
+                                DRM_DEBUG_DRIVER("pipe b underrun\n");
                         I915_WRITE(PIPEBSTAT, pipeb_stats);
                         irq_received = 1;
                 }
@@ -583,7 +585,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                     (iir & I915_DISPLAY_PORT_INTERRUPT)) {
                         u32 hotplug_status = I915_READ(PORT_HOTPLUG_STAT);
 
-                        DRM_DEBUG("hotplug event received, stat 0x%08x\n",
+                        DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x\n",
                                   hotplug_status);
                         if (hotplug_status & dev_priv->hotplug_supported_mask)
                                 queue_work(dev_priv->wq,
@@ -597,7 +599,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                                 (hotplug_status & CRT_EOS_INT_STATUS)) {
                                 u32 temp;
 
-                                DRM_DEBUG("EOS interrupt occurs\n");
+                                DRM_DEBUG_DRIVER("EOS interrupt occurs\n");
                                 /* status is already cleared */
                                 temp = I915_READ(ADPA);
                                 temp &= ~ADPA_DAC_ENABLE;
@@ -676,7 +678,7 @@ static int i915_emit_irq(struct drm_device * dev)
 
         i915_kernel_lost_context(dev);
 
-        DRM_DEBUG("\n");
+        DRM_DEBUG_DRIVER("\n");
 
         dev_priv->counter++;
         if (dev_priv->counter > 0x7FFFFFFFUL)
@@ -741,7 +743,7 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
         struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
         int ret = 0;
 
-        DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
+        DRM_DEBUG_DRIVER("irq_nr=%d breadcrumb=%d\n", irq_nr,
                   READ_BREADCRUMB(dev_priv));
 
         if (READ_BREADCRUMB(dev_priv) >= irq_nr) {
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c
index 2d5193556d3f..9032bda35e2a 100644
--- a/drivers/gpu/drm/i915/i915_opregion.c
+++ b/drivers/gpu/drm/i915/i915_opregion.c
@@ -224,7 +224,7 @@ void opregion_asle_intr(struct drm_device *dev)
         asle_req = asle->aslc & ASLE_REQ_MSK;
 
         if (!asle_req) {
-                DRM_DEBUG("non asle set request??\n");
+                DRM_DEBUG_DRIVER("non asle set request??\n");
                 return;
         }
 
@@ -361,9 +361,9 @@ int intel_opregion_init(struct drm_device *dev, int resume)
         int err = 0;
 
         pci_read_config_dword(dev->pdev, PCI_ASLS, &asls);
-        DRM_DEBUG("graphic opregion physical addr: 0x%x\n", asls);
+        DRM_DEBUG_DRIVER("graphic opregion physical addr: 0x%x\n", asls);
         if (asls == 0) {
-                DRM_DEBUG("ACPI OpRegion not supported!\n");
+                DRM_DEBUG_DRIVER("ACPI OpRegion not supported!\n");
                 return -ENOTSUPP;
         }
 
@@ -373,30 +373,30 @@ int intel_opregion_init(struct drm_device *dev, int resume)
 
         opregion->header = base;
         if (memcmp(opregion->header->signature, OPREGION_SIGNATURE, 16)) {
-                DRM_DEBUG("opregion signature mismatch\n");
+                DRM_DEBUG_DRIVER("opregion signature mismatch\n");
                 err = -EINVAL;
                 goto err_out;
         }
 
         mboxes = opregion->header->mboxes;
         if (mboxes & MBOX_ACPI) {
-                DRM_DEBUG("Public ACPI methods supported\n");
+                DRM_DEBUG_DRIVER("Public ACPI methods supported\n");
                 opregion->acpi = base + OPREGION_ACPI_OFFSET;
                 if (drm_core_check_feature(dev, DRIVER_MODESET))
                         intel_didl_outputs(dev);
         } else {
-                DRM_DEBUG("Public ACPI methods not supported\n");
+                DRM_DEBUG_DRIVER("Public ACPI methods not supported\n");
                 err = -ENOTSUPP;
                 goto err_out;
         }
         opregion->enabled = 1;
 
         if (mboxes & MBOX_SWSCI) {
-                DRM_DEBUG("SWSCI supported\n");
+                DRM_DEBUG_DRIVER("SWSCI supported\n");
                 opregion->swsci = base + OPREGION_SWSCI_OFFSET;
         }
         if (mboxes & MBOX_ASLE) {
-                DRM_DEBUG("ASLE supported\n");
+                DRM_DEBUG_DRIVER("ASLE supported\n");
                 opregion->asle = base + OPREGION_ASLE_OFFSET;
                 opregion_enable_asle(dev);
         }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 7d3309bc0fd2..062c1d7cdace 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3690,7 +3690,7 @@ static void intel_gpu_idle_timer(unsigned long arg)
         struct drm_device *dev = (struct drm_device *)arg;
         drm_i915_private_t *dev_priv = dev->dev_private;
 
-        DRM_DEBUG("idle timer fired, downclocking\n");
+        DRM_DEBUG_DRIVER("idle timer fired, downclocking\n");
 
         dev_priv->busy = false;
 
@@ -3705,7 +3705,7 @@ void intel_increase_renderclock(struct drm_device *dev, bool schedule)
                 return;
 
         if (!dev_priv->render_reclock_avail) {
-                DRM_DEBUG("not reclocking render clock\n");
+                DRM_DEBUG_DRIVER("not reclocking render clock\n");
                 return;
         }
 
@@ -3714,7 +3714,7 @@ void intel_increase_renderclock(struct drm_device *dev, bool schedule)
                 pci_write_config_word(dev->pdev, GCFGC, dev_priv->orig_clock);
         else if (IS_I85X(dev))
                 pci_write_config_word(dev->pdev, HPLLCC, dev_priv->orig_clock);
-        DRM_DEBUG("increasing render clock frequency\n");
+        DRM_DEBUG_DRIVER("increasing render clock frequency\n");
 
         /* Schedule downclock */
         if (schedule)
@@ -3730,7 +3730,7 @@ void intel_decrease_renderclock(struct drm_device *dev)
                 return;
 
         if (!dev_priv->render_reclock_avail) {
-                DRM_DEBUG("not reclocking render clock\n");
+                DRM_DEBUG_DRIVER("not reclocking render clock\n");
                 return;
         }
 
@@ -3790,7 +3790,7 @@ void intel_decrease_renderclock(struct drm_device *dev)
 
                 pci_write_config_word(dev->pdev, HPLLCC, hpllcc);
         }
-        DRM_DEBUG("decreasing render clock frequency\n");
+        DRM_DEBUG_DRIVER("decreasing render clock frequency\n");
 }
 
 /* Note that no increase function is needed for this - increase_renderclock()
@@ -3824,7 +3824,7 @@ static void intel_crtc_idle_timer(unsigned long arg)
         struct drm_crtc *crtc = &intel_crtc->base;
         drm_i915_private_t *dev_priv = crtc->dev->dev_private;
 
-        DRM_DEBUG("idle timer fired, downclocking\n");
+        DRM_DEBUG_DRIVER("idle timer fired, downclocking\n");
 
         intel_crtc->busy = false;
 
@@ -3847,7 +3847,7 @@ static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule)
                 return;
 
         if (!HAS_PIPE_CXSR(dev) && (dpll & DISPLAY_RATE_SELECT_FPA1)) {
-                DRM_DEBUG("upclocking LVDS\n");
+                DRM_DEBUG_DRIVER("upclocking LVDS\n");
 
                 /* Unlock panel regs */
                 I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | (0xabcd << 16));
@@ -3858,7 +3858,7 @@ static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule)
                 intel_wait_for_vblank(dev);
                 dpll = I915_READ(dpll_reg);
                 if (dpll & DISPLAY_RATE_SELECT_FPA1)
-                        DRM_DEBUG("failed to upclock LVDS!\n");
+                        DRM_DEBUG_DRIVER("failed to upclock LVDS!\n");
 
                 /* ...and lock them again */
                 I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) & 0x3);
@@ -3890,7 +3890,7 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
          * the manual case.
          */
         if (!HAS_PIPE_CXSR(dev) && intel_crtc->lowfreq_avail) {
-                DRM_DEBUG("downclocking LVDS\n");
+                DRM_DEBUG_DRIVER("downclocking LVDS\n");
 
                 /* Unlock panel regs */
                 I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) | (0xabcd << 16));
@@ -3901,7 +3901,7 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
                 intel_wait_for_vblank(dev);
                 dpll = I915_READ(dpll_reg);
                 if (!(dpll & DISPLAY_RATE_SELECT_FPA1))
-                        DRM_DEBUG("failed to downclock LVDS!\n");
+                        DRM_DEBUG_DRIVER("failed to downclock LVDS!\n");
 
                 /* ...and lock them again */
                 I915_WRITE(PP_CONTROL, I915_READ(PP_CONTROL) & 0x3);