lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/i915: Fix size_t handling in off-by-default debug printfs

Browse Source 
Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Krzysztof Halasa
2009-06-20 00:31:28 +02:00
committed by Eric Anholt
parent aa0261f230
commit cfd43c025d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/i915_gem.c
View File

@@ -1006,7 +1006,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
#if WATCH_BUF #if WATCH_BUF
DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n", DRM_INFO("set_domain_ioctl %p(%zd), %08x %08x\n",
obj, obj->size, read_domains, write_domain); obj, obj->size, read_domains, write_domain);
#endif #endif
if (read_domains & I915_GEM_DOMAIN_GTT) { if (read_domains & I915_GEM_DOMAIN_GTT) {
@@ -1050,7 +1050,7 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
} }
#if WATCH_BUF #if WATCH_BUF
DRM_INFO("%s: sw_finish %d (%p %d)\n", DRM_INFO("%s: sw_finish %d (%p %zd)\n",
__func__, args->handle, obj, obj->size); __func__, args->handle, obj, obj->size);
#endif #endif
obj_priv = obj->driver_private; obj_priv = obj->driver_private;
@@ -2423,7 +2423,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
} }
#if WATCH_BUF #if WATCH_BUF
DRM_INFO("Binding object of size %d at 0x%08x\n", DRM_INFO("Binding object of size %zd at 0x%08x\n",
obj->size, obj_priv->gtt_offset); obj->size, obj_priv->gtt_offset);
#endif #endif
ret = i915_gem_object_get_pages(obj); ret = i915_gem_object_get_pages(obj);

2
drivers/gpu/drm/i915/i915_gem_debug.c
View File

@@ -143,7 +143,7 @@ i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle)
uint32_t *backing_map = NULL; uint32_t *backing_map = NULL;
int bad_count = 0; int bad_count = 0;
DRM_INFO("%s: checking coherency of object %p@0x%08x (%d, %dkb):\n", DRM_INFO("%s: checking coherency of object %p@0x%08x (%d, %zdkb):\n",
__func__, obj, obj_priv->gtt_offset, handle, __func__, obj, obj_priv->gtt_offset, handle,
obj->size / 1024); obj->size / 1024);