Merge v5.3-rc1 into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / armada / armada_gem.c

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 874b2968a866d72966d4280a909b41f102a168d0..60c509784fa3bd3cc7b2edc9e7c64bf3e873eff1 100644 (file)
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -482,8 +482,7 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = {
 };
 
 struct dma_buf *
-armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj,
-       int flags)
+armada_gem_prime_export(struct drm_gem_object *obj, int flags)
 {
        DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
 
@@ -492,7 +491,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj,
        exp_info.flags = O_RDWR;
        exp_info.priv = obj;
 
-       return drm_gem_dmabuf_export(dev, &exp_info);
+       return drm_gem_dmabuf_export(obj->dev, &exp_info);
 }
 
 struct drm_gem_object *