flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 10:26:12 +00:00
Code Issues Releases Wiki Activity

lib: Extract gem_get_tiling() from a couple of tests.

Browse Source 
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2014-06-20 00:14:52 +01:00
parent 92a2b292df
commit 7bf0f7fc58
4 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/ioctl_wrappers.c
View File

@ -108,6 +108,31 @@ gem_handle_to_libdrm_bo(drm_intel_bufmgr *bufmgr, int fd, const char *name, uint
return bo; return bo;
} }
/**
* gem_get_tiling:
* @fd: open i915 drm file descriptor
* @handle: gem buffer object handle
* @tiling: (out) tiling mode of the gem buffer
* @swizzle: (out) bit 6 swizzle mode
*
* This wraps the GET_TILING ioctl.
*/
void
gem_get_tiling(int fd, uint32_t handle, uint32_t *tiling, uint32_t *swizzle)
{
struct drm_i915_gem_get_tiling get_tiling;
int ret;
memset(&get_tiling, 0, sizeof(get_tiling));
get_tiling.handle = handle;
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_TILING, &get_tiling);
igt_assert(ret == 0);
*tiling = get_tiling.tiling_mode;
*swizzle = get_tiling.swizzle_mode;
}
int __gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride) int __gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride)
{ {
struct drm_i915_gem_set_tiling st; struct drm_i915_gem_set_tiling st;

1
lib/ioctl_wrappers.h
View File

@ -42,6 +42,7 @@ drm_intel_bo * gem_handle_to_libdrm_bo(drm_intel_bufmgr *bufmgr, int fd,
/* ioctl_wrappers.c: /* ioctl_wrappers.c:
* *
* ioctl wrappers and similar stuff for bare metal testing */ * ioctl wrappers and similar stuff for bare metal testing */
void gem_get_tiling(int fd, uint32_t handle, uint32_t *tiling, uint32_t *swizzle);
void gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride); void gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride);
int __gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride); int __gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride);

16
tests/gem_tiled_pread.c
View File

@ -60,22 +60,6 @@ static int tile_width;
static int tile_height; static int tile_height;
static int tile_size; static int tile_size;
static void
gem_get_tiling(int fd, uint32_t handle, uint32_t *tiling, uint32_t *swizzle)
{
struct drm_i915_gem_get_tiling get_tiling;
int ret;
memset(&get_tiling, 0, sizeof(get_tiling));
get_tiling.handle = handle;
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_TILING, &get_tiling);
igt_assert(ret == 0);
*tiling = get_tiling.tiling_mode;
*swizzle = get_tiling.swizzle_mode;
}
static uint32_t static uint32_t
create_bo(int fd) create_bo(int fd)
{ {

16
tests/gem_tiled_pread_pwrite.c
View File

@ -68,22 +68,6 @@ static uint32_t current_tiling_mode;
#define PAGE_SIZE 4096 #define PAGE_SIZE 4096
static void
gem_get_tiling(int fd, uint32_t handle, uint32_t *tiling, uint32_t *swizzle)
{
struct drm_i915_gem_get_tiling get_tiling;
int ret;
memset(&get_tiling, 0, sizeof(get_tiling));
get_tiling.handle = handle;
ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_TILING, &get_tiling);
igt_assert(ret == 0);
*tiling = get_tiling.tiling_mode;
*swizzle = get_tiling.swizzle_mode;
}
static uint32_t static uint32_t
create_bo_and_fill(int fd) create_bo_and_fill(int fd)
{ {