xf86-video-intel: Branch 'drm-gem' - src/i830_memory.c

Eric Anholt anholt at kemper.freedesktop.org
Wed Jun 11 14:43:57 PDT 2008


 src/i830_memory.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 754df0aa55c4b5f0c3c415ad97d7612504410229
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jun 11 14:43:38 2008 -0700

    [gem] Chase move of create ioctl from generic to device-specific.

diff --git a/src/i830_memory.c b/src/i830_memory.c
index 3613167..d1a3e58 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -734,7 +734,7 @@ i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
     I830Ptr pI830 = I830PTR(pScrn);
     i830_memory *mem;
     int ret;
-    struct drm_gem_create create;
+    struct drm_i915_gem_create create;
 
     assert((flags & NEED_PHYSICAL_ADDR) == 0);
 
@@ -755,7 +755,7 @@ i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
     memset(&create, 0, sizeof(create));
     create.size = size;
 
-    ret = ioctl(pI830->drmSubFD, DRM_IOCTL_GEM_CREATE, &create);
+    ret = ioctl(pI830->drmSubFD, DRM_IOCTL_I915_GEM_CREATE, &create);
     if (ret) {
 	xfree(mem->name);
 	xfree(mem);


More information about the xorg-commit mailing list