aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorZhao Yakui <yakui.zhao@intel.com>2009-10-08 23:39:40 -0400
committerEric Anholt <eric@anholt.net>2009-11-05 17:47:10 -0500
commit44d98a614267c81a04ba9c7a0427c3a628985b7d (patch)
tree4a730abbdd317c106ce0f50565cb8c0eb4c836d8 /drivers/gpu/drm/i915/i915_gem.c
parent5c5a4359fe392b52b444134877fc4002be542b42 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c6
1 files changed, 3 insertions, 3 deletions
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,
1617 OUT_RING(MI_USER_INTERRUPT); 1617 OUT_RING(MI_USER_INTERRUPT);
1618 ADVANCE_LP_RING(); 1618 ADVANCE_LP_RING();
1619 1619
1620 DRM_DEBUG("%d\n", seqno); 1620 DRM_DEBUG_DRIVER("%d\n", seqno);
1621 1621
1622 request->seqno = seqno; 1622 request->seqno = seqno;
1623 request->emitted_jiffies = jiffies; 1623 request->emitted_jiffies = jiffies;
@@ -4367,7 +4367,7 @@ i915_gem_init_hws(struct drm_device *dev)
4367 memset(dev_priv->hw_status_page, 0, PAGE_SIZE); 4367 memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
4368 I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr); 4368 I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr);
4369 I915_READ(HWS_PGA); /* posting read */ 4369 I915_READ(HWS_PGA); /* posting read */
4370 DRM_DEBUG("hws offset: 0x%08x\n", dev_priv->status_gfx_addr); 4370 DRM_DEBUG_DRIVER("hws offset: 0x%08x\n", dev_priv->status_gfx_addr);
4371 4371
4372 return 0; 4372 return 0;
4373} 4373}
@@ -4801,7 +4801,7 @@ i915_gem_phys_pwrite(struct drm_device *dev, struct drm_gem_object *obj,
4801 user_data = (char __user *) (uintptr_t) args->data_ptr; 4801 user_data = (char __user *) (uintptr_t) args->data_ptr;
4802 obj_addr = obj_priv->phys_obj->handle->vaddr + args->offset; 4802 obj_addr = obj_priv->phys_obj->handle->vaddr + args->offset;
4803 4803
4804 DRM_DEBUG("obj_addr %p, %lld\n", obj_addr, args->size); 4804 DRM_DEBUG_DRIVER("obj_addr %p, %lld\n", obj_addr, args->size);
4805 ret = copy_from_user(obj_addr, user_data, args->size); 4805 ret = copy_from_user(obj_addr, user_data, args->size);
4806 if (ret) 4806 if (ret)
4807 return -EFAULT; 4807 return -EFAULT;