diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c index 64ffa35..0e9d27d 100644 --- a/linux-core/i915_gem.c +++ b/linux-core/i915_gem.c @@ -31,6 +31,7 @@ #include "i915_drm.h" #include "i915_drv.h" #include +#include static int i915_gem_object_set_domain(struct drm_gem_object *obj, @@ -432,6 +433,8 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data, i915_gem_clflush_object(obj); drm_agp_chipset_flush(dev); } + + /* unmap here? */ drm_gem_object_unreference(obj); mutex_unlock(&dev->struct_mutex); return ret; @@ -478,6 +481,71 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, return 0; } +extern unsigned long mmap_io_region(struct file *file, unsigned long addr, + unsigned long len, unsigned long flags, + unsigned int vm_flags, unsigned long pgoff, + int accountable); + +/** + * Maps the contents of an object into the GTT range, returning the address + * it is mapped into. + * + * While the mapping holds a reference on the contents of the object, it doesn't + * imply a ref on the object itself. + */ +int +i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + struct drm_i915_gem_mmap_gtt *args = data; + struct drm_gem_object *obj; + struct drm_i915_gem_object *obj_priv; + loff_t offset; + unsigned long addr; + int ret; + + if (!(dev->driver->driver_features & DRIVER_GEM)) + return -ENODEV; + + obj = drm_gem_object_lookup(dev, file_priv, args->handle); + if (obj == NULL) + return -EBADF; + + obj_priv = obj->driver_private; + offset = args->offset; + + /* No flags yet */ + if (args->flags) + return -EINVAL; + + /* Create a new mapping to be backed by a GTT range */ + addr = get_unmapped_area(obj->filp, 0, args->size, 0, + MAP_SHARED); + DRM_ERROR("%s: found unmapped area at 0x%08lx\n", __FUNCTION__, addr); + + //vma->vm_pgoff = (dev->agp->base + obj_priv->gtt_offset) >> PAGE_SHIFT; + /* Assuming the object is pinned, map it in the GTT range w/WC */ +// ret = pci_mmap_page_range(dev->pdev, vma, pci_mmap_mem, 1); + addr = mmap_io_region(obj->filp, addr, args->size, MAP_SHARED, + PROT_READ | PROT_WRITE, + (dev->agp->base + obj_priv->gtt_offset) >> PAGE_SHIFT, + 1); + if (IS_ERR((void *)addr)) { + DRM_ERROR("mmap_io_region failed: %d\n", addr); + return addr; + } + + mutex_lock(&dev->struct_mutex); + drm_gem_object_unreference(obj); + mutex_unlock(&dev->struct_mutex); + if (IS_ERR((void *)addr)) + return addr; + + args->addr_ptr = (uint64_t) addr; + + return 0; +} + static void i915_gem_object_free_page_list(struct drm_gem_object *obj) { @@ -579,8 +647,6 @@ i915_add_request(struct drm_device *dev, uint32_t flush_domains) OUT_RING(MI_USER_INTERRUPT); ADVANCE_LP_RING(); - DRM_DEBUG("%d\n", seqno); - request->seqno = seqno; request->emitted_jiffies = jiffies; request->flush_domains = flush_domains; @@ -1755,6 +1821,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file_priv) seqno = i915_file_priv->mm.last_gem_throttle_seqno; i915_file_priv->mm.last_gem_throttle_seqno = i915_file_priv->mm.last_gem_seqno; + if (seqno) ret = i915_wait_request(dev, seqno); mutex_unlock(&dev->struct_mutex); @@ -2302,7 +2369,8 @@ i915_gem_init_hws(struct drm_device *dev) int ret; /* If we need a physical address for the status page, it's already - * initialized at driver load time. + * initialized at driver load time, unless kernel modesetting is + * active. */ if (!I915_NEED_GFX_HWS(dev)) return 0; diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 1fdc5e1..298318e 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -1064,6 +1064,7 @@ struct drm_ioctl_desc i915_ioctls[] = { DRM_IOCTL_DEF(DRM_I915_GEM_PREAD, i915_gem_pread_ioctl, 0), DRM_IOCTL_DEF(DRM_I915_GEM_PWRITE, i915_gem_pwrite_ioctl, 0), DRM_IOCTL_DEF(DRM_I915_GEM_MMAP, i915_gem_mmap_ioctl, 0), + DRM_IOCTL_DEF(DRM_I915_GEM_MMAP_GTT, i915_gem_mmap_gtt_ioctl, 0), DRM_IOCTL_DEF(DRM_I915_GEM_SET_DOMAIN, i915_gem_set_domain_ioctl, 0), DRM_IOCTL_DEF(DRM_I915_GEM_SW_FINISH, i915_gem_sw_finish_ioctl, 0), DRM_IOCTL_DEF(DRM_I915_GEM_SET_TILING, i915_gem_set_tiling, 0), diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h index 53087b5..f0397fb 100644 --- a/shared-core/i915_drm.h +++ b/shared-core/i915_drm.h @@ -192,6 +192,7 @@ typedef struct drm_i915_sarea { #define DRM_I915_GEM_SW_FINISH 0x20 #define DRM_I915_GEM_SET_TILING 0x21 #define DRM_I915_GEM_GET_TILING 0x22 +#define DRM_I915_GEM_MMAP_GTT 0x23 #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) #define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH) @@ -223,6 +224,7 @@ typedef struct drm_i915_sarea { #define DRM_IOCTL_I915_GEM_PREAD DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PREAD, struct drm_i915_gem_pread) #define DRM_IOCTL_I915_GEM_PWRITE DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite) #define DRM_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap) +#define DRM_IOCTL_I915_GEM_MMAP_GTT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_gtt) #define DRM_IOCTL_I915_GEM_SET_DOMAIN DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SET_DOMAIN, struct drm_i915_gem_set_domain) #define DRM_IOCTL_I915_GEM_SW_FINISH DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish) #define DRM_IOCTL_I915_GEM_SET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling) @@ -501,6 +503,23 @@ struct drm_i915_gem_mmap { uint64_t addr_ptr; /* void *, but pointers are not 32/64 compatible */ }; +struct drm_i915_gem_mmap_gtt { + /** Handle for the object being mapped. */ + uint32_t handle; + uint32_t pad; + /** Offset in the object to map. */ + uint64_t offset; + /** + * Length of data to map. + * + * The value will be page-aligned. + */ + uint64_t size; + /** Returned pointer the data was mapped at */ + uint64_t addr_ptr; /* void *, but pointers are not 32/64 compatible */ + uint32_t flags; +}; + struct drm_i915_gem_set_domain { /** Handle for the object */ uint32_t handle; diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 087c6d6..d299c5b 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -591,6 +591,8 @@ int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); int i915_gem_mmap_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); +int i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv); int i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,