diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-06 06:28:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-06 06:29:24 +1000 |
| commit | 96b2bb0b9637df1a68bb5b6853903a207fabcefd (patch) | |
| tree | 6f9d61aeb2a46c0492aa18a98b77106c84306724 /drivers/gpu/drm/omapdrm/omap_gem.h | |
| parent | f29135ee4e0d4e01911ed569f731bfdb841cea6d (diff) | |
| parent | f8466184bd5b5c21eb6196cd0e44668725a2e47a (diff) | |
Merge tag 'omapdrm-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next
omapdrm changes for 4.19
* Workaround for DRA7 errata i932
* Fix mm_list locking
* Cleanups
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/88b2e77f-9646-d15f-645b-ba45af2a1966@ti.com
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.h')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.h b/drivers/gpu/drm/omapdrm/omap_gem.h index a78bde05193a..c1c45fbde155 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.h +++ b/drivers/gpu/drm/omapdrm/omap_gem.h @@ -21,6 +21,7 @@ #define __OMAPDRM_GEM_H__ #include <linux/types.h> +#include <linux/mm_types.h> enum dma_data_direction; @@ -80,7 +81,7 @@ struct dma_buf *omap_gem_prime_export(struct drm_device *dev, struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev, struct dma_buf *buffer); -int omap_gem_fault(struct vm_fault *vmf); +vm_fault_t omap_gem_fault(struct vm_fault *vmf); int omap_gem_roll(struct drm_gem_object *obj, u32 roll); void omap_gem_cpu_sync_page(struct drm_gem_object *obj, int pgoff); void omap_gem_dma_sync_buffer(struct drm_gem_object *obj, |