KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kenneth Graunke 2017-04-10 23:00:24 -07:00
parent 193601311c
commit 14fc188460
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesa/drivers/dri/i965/brw_bufmgr.c
View File

@ -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;

8
src/mesa/drivers/dri/i965/brw_bufmgr.h
View File

@ -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.
*