diff options
Diffstat (limited to 'drivers/gpu/drm/armada/armada_gem.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_gem.c | 12 | 
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 874b2968a866..93cf8b8bfcff 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -2,12 +2,17 @@  /*   * Copyright (C) 2012 Russell King   */ +  #include <linux/dma-buf.h>  #include <linux/dma-mapping.h> +#include <linux/mman.h>  #include <linux/shmem_fs.h> + +#include <drm/armada_drm.h> +#include <drm/drm_prime.h> +  #include "armada_drm.h"  #include "armada_gem.h" -#include <drm/armada_drm.h>  #include "armada_ioctlP.h"  static vm_fault_t armada_gem_vm_fault(struct vm_fault *vmf) @@ -482,8 +487,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 +496,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 *  |