modetest: Create buffers using libkms

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

diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c
index 2cdc934..2239789 100644 (file)
--- a/tests/gem_mmap.c
+++ b/tests/gem_mmap.c
@@ -34,12 +34,13 @@
 #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)
 {
-       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.
@@ -48,63 +49,69 @@ int do_read(int fd, int handle, void *buf, int offset, int size)
 
        memset(&read, 0, sizeof(read));
        read.handle = handle;
-       read.data = buf;
+       read.data_ptr = (uintptr_t)buf;
        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)
 {
-       struct drm_gem_pwrite write;
+       struct drm_i915_gem_pwrite write;
 
        memset(&write, 0, sizeof(write));
        write.handle = handle;
-       write.data = buf;
+       write.data_ptr = (uintptr_t)buf;
        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;
-       struct drm_gem_alloc alloc;
-       struct drm_gem_mmap mmap;
-       struct drm_gem_unreference unref;
+       struct drm_i915_gem_create create;
+       struct drm_i915_gem_mmap mmap;
+       struct drm_gem_close unref;
        uint8_t expected[OBJECT_SIZE];
        uint8_t buf[OBJECT_SIZE];
+       uint8_t *addr;
        int ret;
        int handle;
 
-       fd = drm_open_any();
+       fd = drm_open_matching("8086:*", 0);
+       if (fd < 0) {
+               fprintf(stderr, "failed to open intel drm device, skipping\n");
+               return 0;
+       }
 
        memset(&mmap, 0, sizeof(mmap));
        mmap.handle = 0x10101010;
        mmap.offset = 0;
        mmap.size = 4096;
        printf("Testing mmaping of bad object.\n");
-       ret = ioctl(fd, DRM_IOCTL_GEM_MMAP, &mmap);
-       assert(ret == -1 && errno == EINVAL);
+       ret = ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &mmap);
+       assert(ret == -1 && errno == ENOENT);
 
-       memset(&alloc, 0, sizeof(alloc));
-       alloc.size = OBJECT_SIZE;
-       ret = ioctl(fd, DRM_IOCTL_GEM_ALLOC, &alloc);
+       memset(&create, 0, sizeof(create));
+       create.size = OBJECT_SIZE;
+       ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
        assert(ret == 0);
-       handle = alloc.handle;
+       handle = create.handle;
 
-       printf("Testing mmaping of newly allocated object.\n");
+       printf("Testing mmaping of newly created object.\n");
        mmap.handle = handle;
        mmap.offset = 0;
        mmap.size = OBJECT_SIZE;
-       ret = ioctl(fd, DRM_IOCTL_GEM_MMAP, &mmap);
+       ret = ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &mmap);
        assert(ret == 0);
+       addr = (uint8_t *)(uintptr_t)mmap.addr_ptr;
 
-       printf("Testing contents of newly allocated object.\n");
+       printf("Testing contents of newly created object.\n");
        memset(expected, 0, sizeof(expected));
-       assert(memcmp(mmap.addr, expected, sizeof(expected)) == 0);
+       assert(memcmp(addr, expected, sizeof(expected)) == 0);
 
        printf("Testing coherency of writes and mmap reads.\n");
        memset(buf, 0, sizeof(buf));
@@ -112,16 +119,16 @@ int main(int argc, char **argv)
        memset(expected + 1024, 0x01, 1024);
        ret = do_write(fd, handle, buf, 0, OBJECT_SIZE);
        assert(ret == 0);
-       assert(memcmp(buf, mmap.addr, sizeof(buf)) == 0);
+       assert(memcmp(buf, addr, sizeof(buf)) == 0);
 
-       printf("Testing that mapping stays after unreference\n");
+       printf("Testing that mapping stays after close\n");
        unref.handle = handle;
-       ret = ioctl(fd, DRM_IOCTL_GEM_UNREFERENCE, &unref);
+       ret = ioctl(fd, DRM_IOCTL_GEM_CLOSE, &unref);
        assert(ret == 0);
-       assert(memcmp(buf, mmap.addr, sizeof(buf)) == 0);
+       assert(memcmp(buf, addr, sizeof(buf)) == 0);
 
        printf("Testing unmapping\n");
-       munmap(mmap.addr, OBJECT_SIZE);
+       munmap(addr, OBJECT_SIZE);
 
        close(fd);