|
@@ -164,7 +164,7 @@ EXPORT_SYMBOL(drm_gem_object_alloc);
|
|
|
* Removes the mapping from handle to filp for this object.
|
|
|
*/
|
|
|
static int
|
|
|
-drm_gem_handle_delete(struct drm_file *filp, int handle)
|
|
|
+drm_gem_handle_delete(struct drm_file *filp, u32 handle)
|
|
|
{
|
|
|
struct drm_device *dev;
|
|
|
struct drm_gem_object *obj;
|
|
@@ -207,7 +207,7 @@ drm_gem_handle_delete(struct drm_file *filp, int handle)
|
|
|
int
|
|
|
drm_gem_handle_create(struct drm_file *file_priv,
|
|
|
struct drm_gem_object *obj,
|
|
|
- int *handlep)
|
|
|
+ u32 *handlep)
|
|
|
{
|
|
|
int ret;
|
|
|
|
|
@@ -221,7 +221,7 @@ again:
|
|
|
|
|
|
/* do the allocation under our spinlock */
|
|
|
spin_lock(&file_priv->table_lock);
|
|
|
- ret = idr_get_new_above(&file_priv->object_idr, obj, 1, handlep);
|
|
|
+ ret = idr_get_new_above(&file_priv->object_idr, obj, 1, (int *)handlep);
|
|
|
spin_unlock(&file_priv->table_lock);
|
|
|
if (ret == -EAGAIN)
|
|
|
goto again;
|
|
@@ -237,7 +237,7 @@ EXPORT_SYMBOL(drm_gem_handle_create);
|
|
|
/** Returns a reference to the object named by the handle. */
|
|
|
struct drm_gem_object *
|
|
|
drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp,
|
|
|
- int handle)
|
|
|
+ u32 handle)
|
|
|
{
|
|
|
struct drm_gem_object *obj;
|
|
|
|
|
@@ -344,7 +344,7 @@ drm_gem_open_ioctl(struct drm_device *dev, void *data,
|
|
|
struct drm_gem_open *args = data;
|
|
|
struct drm_gem_object *obj;
|
|
|
int ret;
|
|
|
- int handle;
|
|
|
+ u32 handle;
|
|
|
|
|
|
if (!(dev->driver->driver_features & DRIVER_GEM))
|
|
|
return -ENODEV;
|
|
@@ -539,7 +539,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
|
|
|
vma->vm_flags |= VM_RESERVED | VM_IO | VM_PFNMAP | VM_DONTEXPAND;
|
|
|
vma->vm_ops = obj->dev->driver->gem_vm_ops;
|
|
|
vma->vm_private_data = map->handle;
|
|
|
- /* FIXME: use pgprot_writecombine when available */
|
|
|
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
|
|
|
|
|
|
/* Take a ref for this mapping of the object, so that the fault
|