diff options
| author | Krzysztof Halasa <khc@pm.waw.pl> | 2009-06-19 18:31:28 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-22 23:19:19 -0400 |
| commit | cfd43c025ddef0b1c723bb9811d2bde52b285710 (patch) | |
| tree | 5f86bf0eedaa2c9471608820711119140b71db2a /drivers | |
| parent | aa0261f230105b86409e29bbe851b09830d93d50 (diff) | |
drm/i915: Fix size_t handling in off-by-default debug printfs
Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_debug.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index fd2b8bdffe3f..8660b2144b27 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -1006,7 +1006,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, | |||
| 1006 | 1006 | ||
| 1007 | mutex_lock(&dev->struct_mutex); | 1007 | mutex_lock(&dev->struct_mutex); |
| 1008 | #if WATCH_BUF | 1008 | #if WATCH_BUF |
| 1009 | DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n", | 1009 | DRM_INFO("set_domain_ioctl %p(%zd), %08x %08x\n", |
| 1010 | obj, obj->size, read_domains, write_domain); | 1010 | obj, obj->size, read_domains, write_domain); |
| 1011 | #endif | 1011 | #endif |
| 1012 | if (read_domains & I915_GEM_DOMAIN_GTT) { | 1012 | if (read_domains & I915_GEM_DOMAIN_GTT) { |
| @@ -1050,7 +1050,7 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data, | |||
| 1050 | } | 1050 | } |
| 1051 | 1051 | ||
| 1052 | #if WATCH_BUF | 1052 | #if WATCH_BUF |
| 1053 | DRM_INFO("%s: sw_finish %d (%p %d)\n", | 1053 | DRM_INFO("%s: sw_finish %d (%p %zd)\n", |
| 1054 | __func__, args->handle, obj, obj->size); | 1054 | __func__, args->handle, obj, obj->size); |
| 1055 | #endif | 1055 | #endif |
| 1056 | obj_priv = obj->driver_private; | 1056 | obj_priv = obj->driver_private; |
| @@ -2423,7 +2423,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) | |||
| 2423 | } | 2423 | } |
| 2424 | 2424 | ||
| 2425 | #if WATCH_BUF | 2425 | #if WATCH_BUF |
| 2426 | DRM_INFO("Binding object of size %d at 0x%08x\n", | 2426 | DRM_INFO("Binding object of size %zd at 0x%08x\n", |
| 2427 | obj->size, obj_priv->gtt_offset); | 2427 | obj->size, obj_priv->gtt_offset); |
| 2428 | #endif | 2428 | #endif |
| 2429 | ret = i915_gem_object_get_pages(obj); | 2429 | ret = i915_gem_object_get_pages(obj); |
diff --git a/drivers/gpu/drm/i915/i915_gem_debug.c b/drivers/gpu/drm/i915/i915_gem_debug.c index 8d0b943e2c5a..f94b5985f734 100644 --- a/drivers/gpu/drm/i915/i915_gem_debug.c +++ b/drivers/gpu/drm/i915/i915_gem_debug.c | |||
| @@ -143,7 +143,7 @@ i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle) | |||
| 143 | uint32_t *backing_map = NULL; | 143 | uint32_t *backing_map = NULL; |
| 144 | int bad_count = 0; | 144 | int bad_count = 0; |
| 145 | 145 | ||
| 146 | DRM_INFO("%s: checking coherency of object %p@0x%08x (%d, %dkb):\n", | 146 | DRM_INFO("%s: checking coherency of object %p@0x%08x (%d, %zdkb):\n", |
| 147 | __func__, obj, obj_priv->gtt_offset, handle, | 147 | __func__, obj, obj_priv->gtt_offset, handle, |
| 148 | obj->size / 1024); | 148 | obj->size / 1024); |
| 149 | 149 | ||
