public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Krzysztof Halasa <khc@pm.waw.pl>
To: Dave Airlie <airlied@linux.ie>, Keith Packard <keithp@keithp.com>
Cc: <linux-kernel@vger.kernel.org>, dri-devel@lists.sourceforge.net
Subject: Trivial fixes for drivers/gpu/drm/i915/
Date: Fri, 19 Jun 2009 22:31:17 +0200	[thread overview]
Message-ID: <m34ouc55ka.fsf@intrepid.localdomain> (raw)

size_t is (some sort of) int on x86-32 and long on x86-64, eliminate
compiler warnings by casting to long.

Signed-off-by:  Krzysztof Halasa <khc@pm.waw.pl>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 39f5c65..d5044db 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1007,8 +1007,8 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
 
 	mutex_lock(&dev->struct_mutex);
 #if WATCH_BUF
-	DRM_INFO("set_domain_ioctl %p(%d), %08x %08x\n",
-		 obj, obj->size, read_domains, write_domain);
+	DRM_INFO("set_domain_ioctl %p(%ld), %08x %08x\n",
+		 obj, (long)obj->size, read_domains, write_domain);
 #endif
 	if (read_domains & I915_GEM_DOMAIN_GTT) {
 		ret = i915_gem_object_set_to_gtt_domain(obj, write_domain != 0);
@@ -1051,8 +1051,8 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
 	}
 
 #if WATCH_BUF
-	DRM_INFO("%s: sw_finish %d (%p %d)\n",
-		 __func__, args->handle, obj, obj->size);
+	DRM_INFO("%s: sw_finish %d (%p %ld)\n",
+		 __func__, args->handle, obj, (long)obj->size);
 #endif
 	obj_priv = obj->driver_private;
 
@@ -2377,8 +2377,8 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
 	}
 
 #if WATCH_BUF
-	DRM_INFO("Binding object of size %d at 0x%08x\n",
-		 obj->size, obj_priv->gtt_offset);
+	DRM_INFO("Binding object of size %ld at 0x%08x\n",
+		 (long)obj->size, obj_priv->gtt_offset);
 #endif
 	ret = i915_gem_object_get_pages(obj);
 	if (ret) {
diff --git a/drivers/gpu/drm/i915/i915_gem_debug.c b/drivers/gpu/drm/i915/i915_gem_debug.c
index 8d0b943..88e9c3f 100644
--- a/drivers/gpu/drm/i915/i915_gem_debug.c
+++ b/drivers/gpu/drm/i915/i915_gem_debug.c
@@ -143,9 +143,9 @@ i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle)
 	uint32_t *backing_map = NULL;
 	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, %ldkb):\n",
 		 __func__, obj, obj_priv->gtt_offset, handle,
-		 obj->size / 1024);
+		 (long)(obj->size / 1024));
 
 	gtt_mapping = ioremap(dev->agp->base + obj_priv->gtt_offset,
 			      obj->size);

-- 
Krzysztof Halasa

             reply	other threads:[~2009-06-19 20:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-19 20:31 Krzysztof Halasa [this message]
2009-06-19 20:35 ` Trivial fixes for drivers/gpu/drm/i915/ Marcel Holtmann
2009-06-19 21:19   ` Randy Dunlap
2009-06-19 22:22     ` Krzysztof Halasa
2009-06-19 22:31 ` Trivial fixes for drivers/gpu/drm/i915/ (#1 V2) Krzysztof Halasa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m34ouc55ka.fsf@intrepid.localdomain \
    --to=khc@pm.waw.pl \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.sourceforge.net \
    --cc=keithp@keithp.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox