From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 11 Apr 2017 06:00:24 +0000 (-0700)
Subject: i965/drm: Fix types for pwrite/pread fields.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=14fc188460ae33b8cbbbffdb4f26d470eb393c81;p=mesa.git

i965/drm: Fix types for pwrite/pread fields.

The ioctl structs contain __u64 offset and size fields, so make them
uint64_t rather than unsigned long.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c
index 5243078edae..5eb9f57f7b6 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.c
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c
@@ -852,8 +852,8 @@ brw_bo_unmap(struct brw_bo *bo)
 }
 
 int
-brw_bo_subdata(struct brw_bo *bo, unsigned long offset,
-               unsigned long size, const void *data)
+brw_bo_subdata(struct brw_bo *bo, uint64_t offset,
+               uint64_t size, const void *data)
 {
    struct brw_bufmgr *bufmgr = bo->bufmgr;
    struct drm_i915_gem_pwrite pwrite;
@@ -867,17 +867,17 @@ brw_bo_subdata(struct brw_bo *bo, unsigned long offset,
    ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite);
    if (ret != 0) {
       ret = -errno;
-      DBG("%s:%d: Error writing data to buffer %d: (%d %d) %s .\n",
-          __FILE__, __LINE__, bo->gem_handle, (int) offset,
-          (int) size, strerror(errno));
+      DBG("%s:%d: Error writing data to buffer %d: "
+          "(%"PRIu64" %"PRIu64") %s .\n",
+          __FILE__, __LINE__, bo->gem_handle, offset, size, strerror(errno));
    }
 
    return ret;
 }
 
 int
-brw_bo_get_subdata(struct brw_bo *bo, unsigned long offset,
-                   unsigned long size, void *data)
+brw_bo_get_subdata(struct brw_bo *bo, uint64_t offset,
+                   uint64_t size, void *data)
 {
    struct brw_bufmgr *bufmgr = bo->bufmgr;
    struct drm_i915_gem_pread pread;
@@ -891,9 +891,9 @@ brw_bo_get_subdata(struct brw_bo *bo, unsigned long offset,
    ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_PREAD, &pread);
    if (ret != 0) {
       ret = -errno;
-      DBG("%s:%d: Error reading data from buffer %d: (%d %d) %s .\n",
-          __FILE__, __LINE__, bo->gem_handle, (int) offset,
-          (int) size, strerror(errno));
+      DBG("%s:%d: Error reading data from buffer %d: "
+          "(%"PRIu64" %"PRIu64") %s .\n",
+          __FILE__, __LINE__, bo->gem_handle, offset, size, strerror(errno));
    }
 
    return ret;
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
index aa3d40bb959..2c221850afc 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -189,11 +189,11 @@ int brw_bo_map(struct brw_context *brw, struct brw_bo *bo, int write_enable);
 int brw_bo_unmap(struct brw_bo *bo);
 
 /** Write data into an object. */
-int brw_bo_subdata(struct brw_bo *bo, unsigned long offset,
-                   unsigned long size, const void *data);
+int brw_bo_subdata(struct brw_bo *bo, uint64_t offset,
+                   uint64_t size, const void *data);
 /** Read data from an object. */
-int brw_bo_get_subdata(struct brw_bo *bo, unsigned long offset,
-                       unsigned long size, void *data);
+int brw_bo_get_subdata(struct brw_bo *bo, uint64_t offset,
+                       uint64_t size, void *data);
 /**
  * Waits for rendering to an object by the GPU to have completed.
  *