|
@@ -502,9 +502,6 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
|
|
struct drm_gem_object *obj;
|
|
struct drm_gem_object *obj;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
- if (!dev->driver->gem_prime_import_sg_table)
|
|
|
|
- return ERR_PTR(-EINVAL);
|
|
|
|
-
|
|
|
|
if (dma_buf->ops == &drm_gem_prime_dmabuf_ops) {
|
|
if (dma_buf->ops == &drm_gem_prime_dmabuf_ops) {
|
|
obj = dma_buf->priv;
|
|
obj = dma_buf->priv;
|
|
if (obj->dev == dev) {
|
|
if (obj->dev == dev) {
|
|
@@ -517,6 +514,9 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (!dev->driver->gem_prime_import_sg_table)
|
|
|
|
+ return ERR_PTR(-EINVAL);
|
|
|
|
+
|
|
attach = dma_buf_attach(dma_buf, dev->dev);
|
|
attach = dma_buf_attach(dma_buf, dev->dev);
|
|
if (IS_ERR(attach))
|
|
if (IS_ERR(attach))
|
|
return ERR_CAST(attach);
|
|
return ERR_CAST(attach);
|