[gem] Move potentially device-specific ioctls to the intel driver.

[android-x86/external-libdrm.git] / tests / gem_readwrite.c

diff --git a/tests/gem_readwrite.c b/tests/gem_readwrite.c
index a48f984..54b25ea 100644 (file)
--- a/tests/gem_readwrite.c
+++ b/tests/gem_readwrite.c
@@ -34,12 +34,13 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include "drm.h"
 #include <errno.h>
 #include <sys/stat.h>
 #include "drm.h"

+#include "i915_drm.h"

 
 #define OBJECT_SIZE 16384
 
 int do_read(int fd, int handle, void *buf, int offset, int size)
 {
 
 #define OBJECT_SIZE 16384
 
 int do_read(int fd, int handle, void *buf, int offset, int size)
 {

-       struct drm_gem_pread read;
+       struct drm_i915_gem_pread read;

 
        /* Ensure that we don't have any convenient data in buf in case
         * we fail.
 
        /* Ensure that we don't have any convenient data in buf in case
         * we fail.


@@ -52,12 +53,12 @@ int do_read(int fd, int handle, void *buf, int offset, int size)
        read.size = size;
        read.offset = offset;
 
        read.size = size;
        read.offset = offset;
 

-       return ioctl(fd, DRM_IOCTL_GEM_PREAD, &read);
+       return ioctl(fd, DRM_IOCTL_I915_GEM_PREAD, &read);

 }
 
 int do_write(int fd, int handle, void *buf, int offset, int size)
 {
 }
 
 int do_write(int fd, int handle, void *buf, int offset, int size)
 {

-       struct drm_gem_pwrite write;
+       struct drm_i915_gem_pwrite write;

 
        memset(&write, 0, sizeof(write));
        write.handle = handle;
 
        memset(&write, 0, sizeof(write));
        write.handle = handle;


@@ -65,13 +66,13 @@ int do_write(int fd, int handle, void *buf, int offset, int size)
        write.size = size;
        write.offset = offset;
 
        write.size = size;
        write.offset = offset;
 

-       return ioctl(fd, DRM_IOCTL_GEM_PWRITE, &write);
+       return ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &write);

 }
 
 int main(int argc, char **argv)
 {
        int fd;
 }
 
 int main(int argc, char **argv)
 {
        int fd;

-       struct drm_gem_create create;
+       struct drm_i915_gem_create create;

        uint8_t expected[OBJECT_SIZE];
        uint8_t buf[OBJECT_SIZE];
        int ret;
        uint8_t expected[OBJECT_SIZE];
        uint8_t buf[OBJECT_SIZE];
        int ret;


@@ -81,7 +82,7 @@ int main(int argc, char **argv)
 
        memset(&create, 0, sizeof(create));
        create.size = OBJECT_SIZE;
 
        memset(&create, 0, sizeof(create));
        create.size = OBJECT_SIZE;

-       ret = ioctl(fd, DRM_IOCTL_GEM_CREATE, &create);
+       ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);

        assert(ret == 0);
        handle = create.handle;
 
        assert(ret == 0);
        handle = create.handle;