|
|
@@ -80,6 +80,12 @@ struct gntdev_dmabuf_priv {
|
|
|
struct list_head imp_list;
|
|
|
/* This is the lock which protects dma_buf_xxx lists. */
|
|
|
struct mutex lock;
|
|
|
+ /*
|
|
|
+ * We reference this file while exporting dma-bufs, so
|
|
|
+ * the grant device context is not destroyed while there are
|
|
|
+ * external users alive.
|
|
|
+ */
|
|
|
+ struct file *filp;
|
|
|
};
|
|
|
|
|
|
/* DMA buffer export support. */
|
|
|
@@ -311,6 +317,7 @@ static void dmabuf_exp_release(struct kref *kref)
|
|
|
|
|
|
dmabuf_exp_wait_obj_signal(gntdev_dmabuf->priv, gntdev_dmabuf);
|
|
|
list_del(&gntdev_dmabuf->next);
|
|
|
+ fput(gntdev_dmabuf->priv->filp);
|
|
|
kfree(gntdev_dmabuf);
|
|
|
}
|
|
|
|
|
|
@@ -423,6 +430,7 @@ static int dmabuf_exp_from_pages(struct gntdev_dmabuf_export_args *args)
|
|
|
mutex_lock(&args->dmabuf_priv->lock);
|
|
|
list_add(&gntdev_dmabuf->next, &args->dmabuf_priv->exp_list);
|
|
|
mutex_unlock(&args->dmabuf_priv->lock);
|
|
|
+ get_file(gntdev_dmabuf->priv->filp);
|
|
|
return 0;
|
|
|
|
|
|
fail:
|
|
|
@@ -834,7 +842,7 @@ long gntdev_ioctl_dmabuf_imp_release(struct gntdev_priv *priv,
|
|
|
return dmabuf_imp_release(priv->dmabuf_priv, op.fd);
|
|
|
}
|
|
|
|
|
|
-struct gntdev_dmabuf_priv *gntdev_dmabuf_init(void)
|
|
|
+struct gntdev_dmabuf_priv *gntdev_dmabuf_init(struct file *filp)
|
|
|
{
|
|
|
struct gntdev_dmabuf_priv *priv;
|
|
|
|
|
|
@@ -847,6 +855,8 @@ struct gntdev_dmabuf_priv *gntdev_dmabuf_init(void)
|
|
|
INIT_LIST_HEAD(&priv->exp_wait_list);
|
|
|
INIT_LIST_HEAD(&priv->imp_list);
|
|
|
|
|
|
+ priv->filp = filp;
|
|
|
+
|
|
|
return priv;
|
|
|
}
|
|
|
|