drm/gem: don't force writecombine mmap'ing
Subsystems (9)
PATCH v3 1/3 drm/gem: don't force writecombine mmap'ing
From: Rob Clark <[email protected]>
The driver should be in control of this.
---
It is possible that this was masking bugs (ie. not setting appropriate pgprot) in drivers. I don't have a particularly good idea for tracking those down (since I don't have the hw for most drivers). Unless someone has a better idea, maybe land this and let driver maintainers fix any potential fallout in their drivers?
This is necessary for the last patch to fix VGEM brokenness on arm.
v3: rebased on drm-tip
drivers/gpu/drm/drm_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_gem.c +1 -1
@@ -1109,7 +1109,7 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, vma->vm_flags |=VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; vma->vm_private_data = obj; - vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); + vma->vm_page_prot =vm_get_page_prot (vma->vm_flags); vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot);/* Take a ref for this mapping of the object, so that the fault
Signature · 1 line
2.21.0
PATCH v3 2/3 drm: plumb attaching dev thru to prime_pin/unpin
From: Rob Clark <[email protected]>
Needed in the following patch for cache operations.
---
v3: rebased on drm-tip
drivers/gpu/drm/drm_gem.c | 8 ++++---- drivers/gpu/drm/drm_internal.h | 4 ++-- drivers/gpu/drm/drm_prime.c | 4 ++-- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 4 ++-- drivers/gpu/drm/msm/msm_drv.h | 4 ++-- drivers/gpu/drm/msm/msm_gem_prime.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_gem.h | 4 ++-- drivers/gpu/drm/nouveau/nouveau_prime.c | 4 ++-- drivers/gpu/drm/qxl/qxl_prime.c | 4 ++-- drivers/gpu/drm/radeon/radeon_prime.c | 4 ++-- drivers/gpu/drm/vgem/vgem_drv.c | 4 ++-- include/drm/drm_drv.h | 5 ++--- 12 files changed, 26 insertions(+), 27 deletions(-)
drivers/gpu/drm/drm_gem.c +4 -4
@@ -1215,22 +1215,22 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent, obj->dev->driver->gem_print_info (p, indent, obj); } -int drm_gem_pin (struct drm_gem_object *obj) +int drm_gem_pin (struct drm_gem_object *obj,struct device *dev) {if (obj->funcs && obj->funcs->pin)return obj->funcs->pin (obj);else if (obj->dev->driver->gem_prime_pin) -return obj->dev->driver->gem_prime_pin (obj); +return obj->dev->driver->gem_prime_pin (obj, dev);else return 0 ; } -void drm_gem_unpin (struct drm_gem_object *obj) +void drm_gem_unpin (struct drm_gem_object *obj,struct device *dev) {if (obj->funcs && obj->funcs->unpin) obj->funcs->unpin (obj);else if (obj->dev->driver->gem_prime_unpin) - obj->dev->driver->gem_prime_unpin (obj); + obj->dev->driver->gem_prime_unpin (obj, dev); }void *drm_gem_vmap (struct drm_gem_object *obj)
drivers/gpu/drm/drm_internal.h +2 -2
@@ -133,8 +133,8 @@ void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);void drm_gem_print_info (struct drm_printer *p,unsigned int indent,const struct drm_gem_object *obj); -int drm_gem_pin (struct drm_gem_object *obj); -void drm_gem_unpin (struct drm_gem_object *obj); +int drm_gem_pin (struct drm_gem_object *obj,struct device *dev); +void drm_gem_unpin (struct drm_gem_object *obj,struct device *dev);void *drm_gem_vmap (struct drm_gem_object *obj);void drm_gem_vunmap (struct drm_gem_object *obj,void *vaddr);
drivers/gpu/drm/drm_prime.c +2 -2
@@ -575,7 +575,7 @@ int drm_gem_map_attach(struct dma_buf *dma_buf, {struct drm_gem_object *obj = dma_buf->priv; -return drm_gem_pin (obj); +return drm_gem_pin (obj, attach->dev); }EXPORT_SYMBOL (drm_gem_map_attach);
@@ -593,7 +593,7 @@ void drm_gem_map_detach(struct dma_buf *dma_buf, {struct drm_gem_object *obj = dma_buf->priv; -drm_gem_unpin (obj); +drm_gem_unpin (obj, attach->dev); }EXPORT_SYMBOL (drm_gem_map_detach);
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +2 -2
@@ -43,7 +43,7 @@ int etnaviv_gem_prime_mmap(struct drm_gem_object *obj,return etnaviv_obj->ops->mmap (etnaviv_obj, vma); } -int etnaviv_gem_prime_pin (struct drm_gem_object *obj) +int etnaviv_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach) {struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj);
@@ -55,7 +55,7 @@ int etnaviv_gem_prime_pin(struct drm_gem_object *obj)return 0 ; } -void etnaviv_gem_prime_unpin (struct drm_gem_object *obj) +void etnaviv_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach) {struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj);
drivers/gpu/drm/msm/msm_drv.h +2 -2
@@ -288,8 +288,8 @@ void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);struct drm_gem_object *msm_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg); -int msm_gem_prime_pin (struct drm_gem_object *obj); -void msm_gem_prime_unpin (struct drm_gem_object *obj); +int msm_gem_prime_pin (struct drm_gem_object *obj,struct device *dev); +void msm_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev);void *msm_gem_get_vaddr (struct drm_gem_object *obj);void *msm_gem_get_vaddr_active (struct drm_gem_object *obj);void msm_gem_put_vaddr (struct drm_gem_object *obj);
drivers/gpu/drm/msm/msm_gem_prime.c +2 -2
@@ -47,14 +47,14 @@ struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,return msm_gem_import (dev, attach->dmabuf, sg); } -int msm_gem_prime_pin (struct drm_gem_object *obj) +int msm_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach)msm_gem_get_pages (obj);return 0 ; } -void msm_gem_prime_unpin (struct drm_gem_object *obj) +void msm_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach)msm_gem_put_pages (obj);
drivers/gpu/drm/nouveau/nouveau_gem.h +2 -2
@@ -32,9 +32,9 @@ extern int nouveau_gem_ioctl_cpu_fini(struct drm_device *, void *,extern int nouveau_gem_ioctl_info (struct drm_device *,void *,struct drm_file *); -extern int nouveau_gem_prime_pin (struct drm_gem_object *); +extern int nouveau_gem_prime_pin (struct drm_gem_object *,struct device *);struct reservation_object *nouveau_gem_prime_res_obj (struct drm_gem_object *); -extern void nouveau_gem_prime_unpin (struct drm_gem_object *); +extern void nouveau_gem_prime_unpin (struct drm_gem_object *,struct device *);extern struct sg_table *nouveau_gem_prime_get_sg_table (struct drm_gem_object *);extern struct drm_gem_object *nouveau_gem_prime_import_sg_table (struct drm_device *,struct dma_buf_attachment *,struct sg_table *);
drivers/gpu/drm/nouveau/nouveau_prime.c +2 -2
@@ -88,7 +88,7 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,return &nvbo->gem; } -int nouveau_gem_prime_pin (struct drm_gem_object *obj) +int nouveau_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct nouveau_bo *nvbo =nouveau_gem_object (obj);int ret;
@@ -101,7 +101,7 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj)return 0 ; } -void nouveau_gem_prime_unpin (struct drm_gem_object *obj) +void nouveau_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct nouveau_bo *nvbo =nouveau_gem_object (obj);
drivers/gpu/drm/qxl/qxl_prime.c +2 -2
@@ -28,14 +28,14 @@/* Empty Implementations as there should not be any other driver for a virtual * device that might share buffers with qxl */ -int qxl_gem_prime_pin (struct drm_gem_object *obj) +int qxl_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct qxl_bo *bo =gem_to_qxl_bo (obj);return qxl_bo_pin (bo); } -void qxl_gem_prime_unpin (struct drm_gem_object *obj) +void qxl_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct qxl_bo *bo =gem_to_qxl_bo (obj);
drivers/gpu/drm/radeon/radeon_prime.c +2 -2
@@ -83,7 +83,7 @@ struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev,return &bo->gem_base; } -int radeon_gem_prime_pin (struct drm_gem_object *obj) +int radeon_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct radeon_bo *bo =gem_to_radeon_bo (obj);int ret =0 ;
@@ -101,7 +101,7 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj)return ret; } -void radeon_gem_prime_unpin (struct drm_gem_object *obj) +void radeon_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct radeon_bo *bo =gem_to_radeon_bo (obj);int ret =0 ;
drivers/gpu/drm/vgem/vgem_drv.c +2 -2
@@ -307,7 +307,7 @@ static void vgem_unpin_pages(struct drm_vgem_gem_object *bo)mutex_unlock (&bo->pages_lock); } -static int vgem_prime_pin (struct drm_gem_object *obj) +static int vgem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj);long n_pages = obj->size >>PAGE_SHIFT ;
@@ -325,7 +325,7 @@ static int vgem_prime_pin(struct drm_gem_object *obj)return 0 ; } -static void vgem_prime_unpin (struct drm_gem_object *obj) +static void vgem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj);
include/drm/drm_drv.h +2 -3
@@ -592,20 +592,19 @@ struct drm_driver {*/ struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,struct dma_buf *dma_buf); -/** * @gem_prime_pin: * * Deprecated hook in favour of &drm_gem_object_funcs.pin. */ -int (*gem_prime_pin)(struct drm_gem_object *obj); +int (*gem_prime_pin)(struct drm_gem_object *obj,struct device *dev);/** * @gem_prime_unpin: * * Deprecated hook in favour of &drm_gem_object_funcs.unpin. */ -void (*gem_prime_unpin)(struct drm_gem_object *obj); +void (*gem_prime_unpin)(struct drm_gem_object *obj,struct device *dev);/**
Signature · 6 lines
2.21.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/3 drm: plumb attaching dev thru to prime_pin/unpin
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Needed in the following patch for cache operations.
---
v3: rebased on drm-tip
drivers/gpu/drm/drm_gem.c | 8 ++++---- drivers/gpu/drm/drm_internal.h | 4 ++-- drivers/gpu/drm/drm_prime.c | 4 ++-- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 4 ++-- drivers/gpu/drm/msm/msm_drv.h | 4 ++-- drivers/gpu/drm/msm/msm_gem_prime.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_gem.h | 4 ++-- drivers/gpu/drm/nouveau/nouveau_prime.c | 4 ++-- drivers/gpu/drm/qxl/qxl_prime.c | 4 ++-- drivers/gpu/drm/radeon/radeon_prime.c | 4 ++-- drivers/gpu/drm/vgem/vgem_drv.c | 4 ++-- include/drm/drm_drv.h | 5 ++--- 12 files changed, 26 insertions(+), 27 deletions(-)
drivers/gpu/drm/drm_gem.c +4 -4
@@ -1215,22 +1215,22 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent, obj->dev->driver->gem_print_info (p, indent, obj); } -int drm_gem_pin (struct drm_gem_object *obj) +int drm_gem_pin (struct drm_gem_object *obj,struct device *dev) {if (obj->funcs && obj->funcs->pin)return obj->funcs->pin (obj);else if (obj->dev->driver->gem_prime_pin) -return obj->dev->driver->gem_prime_pin (obj); +return obj->dev->driver->gem_prime_pin (obj, dev);else return 0 ; } -void drm_gem_unpin (struct drm_gem_object *obj) +void drm_gem_unpin (struct drm_gem_object *obj,struct device *dev) {if (obj->funcs && obj->funcs->unpin) obj->funcs->unpin (obj);else if (obj->dev->driver->gem_prime_unpin) - obj->dev->driver->gem_prime_unpin (obj); + obj->dev->driver->gem_prime_unpin (obj, dev); }void *drm_gem_vmap (struct drm_gem_object *obj)
drivers/gpu/drm/drm_internal.h +2 -2
@@ -133,8 +133,8 @@ void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);void drm_gem_print_info (struct drm_printer *p,unsigned int indent,const struct drm_gem_object *obj); -int drm_gem_pin (struct drm_gem_object *obj); -void drm_gem_unpin (struct drm_gem_object *obj); +int drm_gem_pin (struct drm_gem_object *obj,struct device *dev); +void drm_gem_unpin (struct drm_gem_object *obj,struct device *dev);void *drm_gem_vmap (struct drm_gem_object *obj);void drm_gem_vunmap (struct drm_gem_object *obj,void *vaddr);
drivers/gpu/drm/drm_prime.c +2 -2
@@ -575,7 +575,7 @@ int drm_gem_map_attach(struct dma_buf *dma_buf, {struct drm_gem_object *obj = dma_buf->priv; -return drm_gem_pin (obj); +return drm_gem_pin (obj, attach->dev); }EXPORT_SYMBOL (drm_gem_map_attach);
@@ -593,7 +593,7 @@ void drm_gem_map_detach(struct dma_buf *dma_buf, {struct drm_gem_object *obj = dma_buf->priv; -drm_gem_unpin (obj); +drm_gem_unpin (obj, attach->dev); }EXPORT_SYMBOL (drm_gem_map_detach);
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +2 -2
@@ -43,7 +43,7 @@ int etnaviv_gem_prime_mmap(struct drm_gem_object *obj,return etnaviv_obj->ops->mmap (etnaviv_obj, vma); } -int etnaviv_gem_prime_pin (struct drm_gem_object *obj) +int etnaviv_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach) {struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj);
@@ -55,7 +55,7 @@ int etnaviv_gem_prime_pin(struct drm_gem_object *obj)return 0 ; } -void etnaviv_gem_prime_unpin (struct drm_gem_object *obj) +void etnaviv_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach) {struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj);
drivers/gpu/drm/msm/msm_drv.h +2 -2
@@ -288,8 +288,8 @@ void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);struct drm_gem_object *msm_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg); -int msm_gem_prime_pin (struct drm_gem_object *obj); -void msm_gem_prime_unpin (struct drm_gem_object *obj); +int msm_gem_prime_pin (struct drm_gem_object *obj,struct device *dev); +void msm_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev);void *msm_gem_get_vaddr (struct drm_gem_object *obj);void *msm_gem_get_vaddr_active (struct drm_gem_object *obj);void msm_gem_put_vaddr (struct drm_gem_object *obj);
drivers/gpu/drm/msm/msm_gem_prime.c +2 -2
@@ -47,14 +47,14 @@ struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,return msm_gem_import (dev, attach->dmabuf, sg); } -int msm_gem_prime_pin (struct drm_gem_object *obj) +int msm_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach)msm_gem_get_pages (obj);return 0 ; } -void msm_gem_prime_unpin (struct drm_gem_object *obj) +void msm_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach)msm_gem_put_pages (obj);
drivers/gpu/drm/nouveau/nouveau_gem.h +2 -2
@@ -32,9 +32,9 @@ extern int nouveau_gem_ioctl_cpu_fini(struct drm_device *, void *,extern int nouveau_gem_ioctl_info (struct drm_device *,void *,struct drm_file *); -extern int nouveau_gem_prime_pin (struct drm_gem_object *); +extern int nouveau_gem_prime_pin (struct drm_gem_object *,struct device *);struct reservation_object *nouveau_gem_prime_res_obj (struct drm_gem_object *); -extern void nouveau_gem_prime_unpin (struct drm_gem_object *); +extern void nouveau_gem_prime_unpin (struct drm_gem_object *,struct device *);extern struct sg_table *nouveau_gem_prime_get_sg_table (struct drm_gem_object *);extern struct drm_gem_object *nouveau_gem_prime_import_sg_table (struct drm_device *,struct dma_buf_attachment *,struct sg_table *);
drivers/gpu/drm/nouveau/nouveau_prime.c +2 -2
@@ -88,7 +88,7 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,return &nvbo->gem; } -int nouveau_gem_prime_pin (struct drm_gem_object *obj) +int nouveau_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct nouveau_bo *nvbo =nouveau_gem_object (obj);int ret;
@@ -101,7 +101,7 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj)return 0 ; } -void nouveau_gem_prime_unpin (struct drm_gem_object *obj) +void nouveau_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct nouveau_bo *nvbo =nouveau_gem_object (obj);
drivers/gpu/drm/qxl/qxl_prime.c +2 -2
@@ -28,14 +28,14 @@/* Empty Implementations as there should not be any other driver for a virtual * device that might share buffers with qxl */ -int qxl_gem_prime_pin (struct drm_gem_object *obj) +int qxl_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct qxl_bo *bo =gem_to_qxl_bo (obj);return qxl_bo_pin (bo); } -void qxl_gem_prime_unpin (struct drm_gem_object *obj) +void qxl_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct qxl_bo *bo =gem_to_qxl_bo (obj);
drivers/gpu/drm/radeon/radeon_prime.c +2 -2
@@ -83,7 +83,7 @@ struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev,return &bo->gem_base; } -int radeon_gem_prime_pin (struct drm_gem_object *obj) +int radeon_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct radeon_bo *bo =gem_to_radeon_bo (obj);int ret =0 ;
@@ -101,7 +101,7 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj)return ret; } -void radeon_gem_prime_unpin (struct drm_gem_object *obj) +void radeon_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct radeon_bo *bo =gem_to_radeon_bo (obj);int ret =0 ;
drivers/gpu/drm/vgem/vgem_drv.c +2 -2
@@ -307,7 +307,7 @@ static void vgem_unpin_pages(struct drm_vgem_gem_object *bo)mutex_unlock (&bo->pages_lock); } -static int vgem_prime_pin (struct drm_gem_object *obj) +static int vgem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj);long n_pages = obj->size >>PAGE_SHIFT ;
@@ -325,7 +325,7 @@ static int vgem_prime_pin(struct drm_gem_object *obj)return 0 ; } -static void vgem_prime_unpin (struct drm_gem_object *obj) +static void vgem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj);
include/drm/drm_drv.h +2 -3
@@ -592,20 +592,19 @@ struct drm_driver {*/ struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,struct dma_buf *dma_buf); -/** * @gem_prime_pin: * * Deprecated hook in favour of &drm_gem_object_funcs.pin. */ -int (*gem_prime_pin)(struct drm_gem_object *obj); +int (*gem_prime_pin)(struct drm_gem_object *obj,struct device *dev);/** * @gem_prime_unpin: * * Deprecated hook in favour of &drm_gem_object_funcs.unpin. */ -void (*gem_prime_unpin)(struct drm_gem_object *obj); +void (*gem_prime_unpin)(struct drm_gem_object *obj,struct device *dev);/**
Signature · 1 line
2.21.0
PATCH v3 3/3 drm/vgem: use normal cached mmap'ings
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Since there is no real device associated with VGEM, it is impossible to end up with appropriate dev->dma_ops, meaning that we have no way to invalidate the shmem pages allocated by VGEM. So, at least on platforms without drm_cflush_pages(), we end up with corruption when cache lines from previous usage of VGEM bo pages get evicted to memory.
The only sane option is to use cached mappings.
---
v3: rebased on drm-tip
drivers/gpu/drm/vgem/vgem_drv.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +14 -10
@@ -259,9 +259,6 @@ static int vgem_mmap(struct file *filp, struct vm_area_struct *vma)if (ret)return ret; -/* Keep the WC mmaping set by drm_gem_mmap() but our pages -* are ordinary and not special. -*/ vma->vm_flags = flags |VM_DONTEXPAND |VM_DONTDUMP ;return 0 ; }
@@ -310,17 +307,17 @@ static void vgem_unpin_pages(struct drm_vgem_gem_object *bo)static int vgem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj); -long n_pages = obj->size >>PAGE_SHIFT ; +long i, n_pages = obj->size >>PAGE_SHIFT ;struct page **pages; pages =vgem_pin_pages (bo);if (IS_ERR (pages))return PTR_ERR (pages); -/* Flush the object from the CPU cache so that importers can rely -* on coherent indirect access via the exported dma-address. -*/ -drm_clflush_pages (pages, n_pages); +for (i =0 ; i < n_pages; i++) { +dma_sync_single_for_device (dev,page_to_phys (pages[i]), +PAGE_SIZE ,DMA_BIDIRECTIONAL ); + }return 0 ; }
@@ -328,6 +325,13 @@ static int vgem_prime_pin(struct drm_gem_object *obj, struct device *dev)static void vgem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj); +long i, n_pages = obj->size >>PAGE_SHIFT ; +struct page **pages = bo->pages; + +for (i =0 ; i < n_pages; i++) { +dma_sync_single_for_cpu (dev,page_to_phys (pages[i]), +PAGE_SIZE ,DMA_BIDIRECTIONAL ); + }vgem_unpin_pages (bo); }
@@ -382,7 +386,7 @@ static void *vgem_prime_vmap(struct drm_gem_object *obj)if (IS_ERR (pages))return NULL ; -return vmap (pages, n_pages,0 ,pgprot_writecombine (PAGE_KERNEL )); +return vmap (pages, n_pages,0 ,PAGE_KERNEL ); }static void vgem_prime_vunmap (struct drm_gem_object *obj,void *vaddr)
@@ -411,7 +415,7 @@ static int vgem_prime_mmap(struct drm_gem_object *obj,fput (vma->vm_file); vma->vm_file =get_file (obj->filp); vma->vm_flags |=VM_DONTEXPAND |VM_DONTDUMP ; - vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); + vma->vm_page_prot =vm_get_page_prot (vma->vm_flags);return 0 ; }
Signature · 1 line
2.21.0
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for series starting with [v3,1/3] drm/gem: don't force writecombine mmap'ing
In reply to Rob Clark== Series Details ==
== Series Details ==
Series: series starting with [v3,1/3] drm/gem: don't force writecombine mmap'ing
URL : https://patchwork.freedesktop.org/series/63770/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip b6ec1673874e drm/gem: don't force writecombine mmap'ing 3e4afe6255ab drm: plumb attaching dev thru to prime_pin/unpin -:145: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files #145: FILE: drivers/gpu/drm/nouveau/nouveau_gem.h:35: +extern int nouveau_gem_prime_pin(struct drm_gem_object *, struct device *);
-:145: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct drm_gem_object *' should also have an identifier name #145: FILE: drivers/gpu/drm/nouveau/nouveau_gem.h:35:
+extern int nouveau_gem_prime_pin(struct drm_gem_object *, struct device *);
-:145: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct device *' should also have an identifier name #145: FILE: drivers/gpu/drm/nouveau/nouveau_gem.h:35:
+extern int nouveau_gem_prime_pin(struct drm_gem_object *, struct device *);
-:148: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files #148: FILE: drivers/gpu/drm/nouveau/nouveau_gem.h:37:
+extern void nouveau_gem_prime_unpin(struct drm_gem_object *, struct device *);
-:148: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct drm_gem_object *' should also have an identifier name #148: FILE: drivers/gpu/drm/nouveau/nouveau_gem.h:37:
+extern void nouveau_gem_prime_unpin(struct drm_gem_object *, struct device *);
-:148: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct device *' should also have an identifier name #148: FILE: drivers/gpu/drm/nouveau/nouveau_gem.h:37:
+extern void nouveau_gem_prime_unpin(struct drm_gem_object *, struct device *);
total: 0 errors, 4 warnings, 2 checks, 191 lines checked 1eacd563d4f1 drm/vgem: use normal cached mmap'ings
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [v3,1/3] drm/gem: don't force writecombine mmap'ing
In reply to Rob Clark== Series Details ==
== Series Details ==
Series: series starting with [v3,1/3] drm/gem: don't force writecombine mmap'ing
URL : https://patchwork.freedesktop.org/series/63770/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_6495 -> Patchwork_13666
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_13666 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_13666, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_13666:
### IGT changes ###
#### Possible regressions ####
* igt@prime_vgem@basic-busy-default:
- fi-bsw-n3050: [PASS][1] -> [FAIL][2] +7 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-bsw-n3050/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-bsw-n3050/igt@[email protected]
- fi-apl-guc: [PASS][3] -> [FAIL][4] +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-apl-guc/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-apl-guc/igt@[email protected]
* igt@prime_vgem@basic-fence-mmap:
- fi-ilk-650: [PASS][5] -> [INCOMPLETE][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-ilk-650/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-ilk-650/igt@[email protected]
- fi-blb-e6850: [PASS][7] -> [INCOMPLETE][8] +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-blb-e6850/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-blb-e6850/igt@[email protected]
* igt@prime_vgem@basic-fence-read:
- fi-bsw-kefka: [PASS][9] -> [INCOMPLETE][10] +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-bsw-kefka/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-bsw-kefka/igt@[email protected]
- fi-gdg-551: [PASS][11] -> [FAIL][12] +4 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-gdg-551/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-gdg-551/igt@[email protected]
- fi-bsw-n3050: [PASS][13] -> [INCOMPLETE][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-bsw-n3050/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-bsw-n3050/igt@[email protected]
* igt@prime_vgem@basic-gtt:
- fi-bwr-2160: [PASS][15] -> [FAIL][16] +4 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-bwr-2160/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-bwr-2160/igt@[email protected]
- fi-ilk-650: [PASS][17] -> [FAIL][18] +2 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-ilk-650/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-ilk-650/igt@[email protected]
* igt@prime_vgem@basic-read:
- fi-elk-e7500: [PASS][19] -> [FAIL][20] +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-elk-e7500/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-elk-e7500/igt@[email protected]
* igt@prime_vgem@basic-sync-default:
- fi-byt-n2820: [PASS][21] -> [FAIL][22] +7 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-byt-n2820/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-byt-n2820/igt@[email protected]
- fi-bxt-j4205: [PASS][23] -> [FAIL][24] +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-bxt-j4205/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-bxt-j4205/igt@[email protected]
- fi-byt-j1900: [PASS][25] -> [FAIL][26] +7 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-byt-j1900/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-byt-j1900/igt@[email protected]
- fi-bxt-dsi: [PASS][27] -> [FAIL][28] +2 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-bxt-dsi/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-bxt-dsi/igt@[email protected]
* igt@prime_vgem@basic-wait-default:
- fi-glk-dsi: [PASS][29] -> [FAIL][30] +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-glk-dsi/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-glk-dsi/igt@[email protected]
- fi-bsw-kefka: [PASS][31] -> [FAIL][32] +6 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-bsw-kefka/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-bsw-kefka/igt@[email protected]
* igt@prime_vgem@basic-write:
- fi-pnv-d510: [PASS][33] -> [FAIL][34] +3 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-pnv-d510/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-pnv-d510/igt@[email protected]
- fi-blb-e6850: [PASS][35] -> [FAIL][36] +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-blb-e6850/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-blb-e6850/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_13666 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_basic@bad-close:
- fi-icl-u3: [PASS][37] -> [DMESG-WARN][38] ([fdo#107724])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-icl-u3/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-icl-u3/igt@[email protected]
* igt@prime_vgem@basic-fence-mmap:
- fi-byt-j1900: [PASS][39] -> [INCOMPLETE][40] ([fdo#102657])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-byt-j1900/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-byt-j1900/igt@[email protected]
* igt@prime_vgem@basic-fence-read:
- fi-ilk-650: [PASS][41] -> [INCOMPLETE][42] ([fdo#105596])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-ilk-650/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-ilk-650/igt@[email protected]
- fi-elk-e7500: [PASS][43] -> [INCOMPLETE][44] ([fdo#103989]) +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-elk-e7500/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-elk-e7500/igt@[email protected]
- fi-byt-n2820: [PASS][45] -> [INCOMPLETE][46] ([fdo#102657])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-byt-n2820/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-byt-n2820/igt@[email protected]
- fi-pnv-d510: [PASS][47] -> [INCOMPLETE][48] ([fdo#110740])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-pnv-d510/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-pnv-d510/igt@[email protected]
#### Possible fixes ####
* igt@i915_module_load@reload-with-fault-injection:
- {fi-icl-u4}: [DMESG-WARN][49] ([fdo#105602] / [fdo#106107] / [fdo#106350]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-icl-u4/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-icl-u4/igt@[email protected]
* igt@i915_selftest@live_hangcheck:
- fi-icl-u2: [INCOMPLETE][51] ([fdo#107713] / [fdo#108569]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-icl-u2/igt@i915_selftest@live_hangcheck.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-icl-u2/igt@i915_selftest@live_hangcheck.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][53] -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-kbl-7500u/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-kbl-7500u/igt@[email protected]
* igt@kms_psr@sprite_plane_onoff:
- {fi-icl-u4}: [DMESG-WARN][55] ([fdo#105602]) -> [PASS][56] +36 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-icl-u4/igt@kms_psr@sprite_plane_onoff.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-icl-u4/igt@kms_psr@sprite_plane_onoff.html
* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: [DMESG-WARN][57] ([fdo#106387]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6495/fi-ilk-650/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/fi-ilk-650/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102505]: https://bugs.freedesktop.org/show_bug.cgi?id=102505
[fdo#102657]: https://bugs.freedesktop.org/show_bug.cgi?id=102657
[fdo#103989]: https://bugs.freedesktop.org/show_bug.cgi?id=103989
[fdo#105596]: https://bugs.freedesktop.org/show_bug.cgi?id=105596
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#106350]: https://bugs.freedesktop.org/show_bug.cgi?id=106350
[fdo#106387]: https://bugs.freedesktop.org/show_bug.cgi?id=106387
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#110740]: https://bugs.freedesktop.org/show_bug.cgi?id=110740
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111046 ]: https://bugs.freedesktop.org/show_bug.cgi?id=111046
[fdo#111049]: https://bugs.freedesktop.org/show_bug.cgi?id=111049
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
Participating hosts (54 -> 46)
------------------------------
Additional (1): fi-icl-dsi
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-icl-guc fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6495 -> Patchwork_13666
CI_DRM_6495: b782c53ecfa06fdbe9b310dca3f0d477fc833496 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5100: 0ea68a1efbfcc4961f2f816ab59e4ad8136c6250 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13666: 1eacd563d4f139c8d51117a752a13a1989c4bcad @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
1eacd563d4f1 drm/vgem: use normal cached mmap'ings 3e4afe6255ab drm: plumb attaching dev thru to prime_pin/unpin b6ec1673874e drm/gem: don't force writecombine mmap'ing
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13666/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Rob Clark
From: Rob Clark <[email protected]>
The driver should be in control of this.
Signed-off-by Rob Clark <[email protected]>
Quoted 8 lines
---
It is possible that this was masking bugs (ie. not setting appropriate pgprot) in drivers. I don't have a particularly good idea for tracking those down (since I don't have the hw for most drivers). Unless someone has a better idea, maybe land this and let driver maintainers fix any potential fallout in their drivers?This is necessary for the last patch to fix VGEM brokenness on arm.
This will break at least v3d and panfrost, and it looks like cirrus as well, since you're now promoting the mapping to cached by default and drm_gem_shmem_helper now produces cached mappings. That's all I could find that would break, but don't trust me on that.
Re: [PATCH v3 3/3] drm/vgem: use normal cached mmap'ings
In reply to Rob ClarkQuoted 9 lines · Rob Clark
From: Rob Clark <[email protected]>
Since there is no real device associated with VGEM, it is impossible to end up with appropriate
dev->dma_ops, meaning that we have no way to invalidate the shmem pages allocated by VGEM. So, at least on platforms withoutdrm_cflush_pages(), we end up with corruption when cache lines from previous usage of VGEM bo pages get evicted to memory.The only sane option is to use cached mappings.
This may be an improvement, but...
pin/unpin is only on attaching/closing the dma-buf, right? So, great, you flushed the cached map once after exporting the vgem dma-buf to the actual GPU device, but from then on you still have no interface for getting coherent access through VGEM's mapping again, which still exists.
I feel like this is papering over something that's really just broken, and we should stop providing VGEM just because someone wants to write dma-buf test code without driver-specific BO alloc ioctl code.
Re: [PATCH v3 3/3] drm/vgem: use normal cached mmap'ings
Quoted 13 lines · Eric Anholt
Quoted 9 lines · Rob Clark
From: Rob Clark <[email protected]>
Since there is no real device associated with VGEM, it is impossible to end up with appropriate
dev->dma_ops, meaning that we have no way to invalidate the shmem pages allocated by VGEM. So, at least on platforms withoutdrm_cflush_pages(), we end up with corruption when cache lines from previous usage of VGEM bo pages get evicted to memory.The only sane option is to use cached mappings.
Quoted 7 lines
This may be an improvement, but...
pin/unpin is only on attaching/closing the dma-buf, right? So, great, you flushed the cached map once after exporting the vgem dma-buf to the actual GPU device, but from then on you still have no interface for getting coherent access through VGEM's mapping again, which still exists.
In *theory* one would detach before doing further CPU access to buffer, and then re-attach when passing back to GPU.
Ofc that isn't how actual drivers do things. But maybe it is enough for vgem to serve it's purpose (ie. test code).
Quoted 3 lines
I feel like this is papering over something that's really just broken, and we should stop providing VGEM just because someone wants to write dma-buf test code without driver-specific BO alloc ioctl code.
yup, it is vgem that is fundamentally broken (or maybe more specifically doesn't fit in w/ dma-mappings view of how to do cache maint), and I'm just papering over it because people and CI systems want to be able to use it to do some dma-buf tests ;-)
I'm kinda wondering, at least for arm/dt based systems, if there is a way (other than in early boot) that we can inject a vgem device node into the dtb. That isn't a thing drivers should normally do, but (if possible) since vgem is really just test infrastructure, it could be a way to make dma-mapping happily think vgem is a real device.
BR,
-R
Koenig, Christian
maintainerRe: [PATCH v3 2/3] drm: plumb attaching dev thru to prime_pin/unpin
In reply to Rob ClarkAm 16.07.19 um 23:37 schrieb Rob Clark:
Quoted 3 lines
From: Rob Clark <[email protected]>
Needed in the following patch for cache operations.
Well have you seen that those callbacks are deprecated?
Quoted 4 lines
* Deprecated hook in favour of &drm_gem_object_funcs.pin.
* Deprecated hook in favour of &drm_gem_object_funcs.unpin.
I would rather say if you want to extend something it would be better to switch over to the per GEM object functions first.
Regards,
Christian.
Quoted 265 lines
Signed-off-by Rob Clark <[email protected]>---
v3: rebased on drm-tipdrivers/gpu/drm/drm_gem.c | 8 ++++---- drivers/gpu/drm/drm_internal.h | 4 ++-- drivers/gpu/drm/drm_prime.c | 4 ++-- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 4 ++-- drivers/gpu/drm/msm/msm_drv.h | 4 ++-- drivers/gpu/drm/msm/msm_gem_prime.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_gem.h | 4 ++-- drivers/gpu/drm/nouveau/nouveau_prime.c | 4 ++-- drivers/gpu/drm/qxl/qxl_prime.c | 4 ++-- drivers/gpu/drm/radeon/radeon_prime.c | 4 ++-- drivers/gpu/drm/vgem/vgem_drv.c | 4 ++-- include/drm/drm_drv.h | 5 ++--- 12 files changed, 26 insertions(+), 27 deletions(-)drivers/gpu/drm/drm_gem.c +4
-4@@ -1215,22 +1215,22 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent, obj->dev->driver->gem_print_info (p, indent, obj); } -int drm_gem_pin (struct drm_gem_object *obj) +int drm_gem_pin (struct drm_gem_object *obj,struct device *dev) {if (obj->funcs && obj->funcs->pin)return obj->funcs->pin (obj);else if (obj->dev->driver->gem_prime_pin) -return obj->dev->driver->gem_prime_pin (obj); +return obj->dev->driver->gem_prime_pin (obj, dev);else return 0 ; } -void drm_gem_unpin (struct drm_gem_object *obj) +void drm_gem_unpin (struct drm_gem_object *obj,struct device *dev) {if (obj->funcs && obj->funcs->unpin) obj->funcs->unpin (obj);else if (obj->dev->driver->gem_prime_unpin) - obj->dev->driver->gem_prime_unpin (obj); + obj->dev->driver->gem_prime_unpin (obj, dev); }void *drm_gem_vmap (struct drm_gem_object *obj)drivers/gpu/drm/drm_internal.h +2
-2@@ -133,8 +133,8 @@ void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);void drm_gem_print_info (struct drm_printer *p,unsigned int indent,const struct drm_gem_object *obj); -int drm_gem_pin (struct drm_gem_object *obj); -void drm_gem_unpin (struct drm_gem_object *obj); +int drm_gem_pin (struct drm_gem_object *obj,struct device *dev); +void drm_gem_unpin (struct drm_gem_object *obj,struct device *dev);void *drm_gem_vmap (struct drm_gem_object *obj);void drm_gem_vunmap (struct drm_gem_object *obj,void *vaddr);drivers/gpu/drm/drm_prime.c +2
-2@@ -575,7 +575,7 @@ int drm_gem_map_attach(struct dma_buf *dma_buf, {struct drm_gem_object *obj = dma_buf->priv; -return drm_gem_pin (obj); +return drm_gem_pin (obj, attach->dev); }EXPORT_SYMBOL (drm_gem_map_attach);@@ -593,7 +593,7 @@ void drm_gem_map_detach(struct dma_buf *dma_buf, {struct drm_gem_object *obj = dma_buf->priv; -drm_gem_unpin (obj); +drm_gem_unpin (obj, attach->dev); }EXPORT_SYMBOL (drm_gem_map_detach);drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +2
-2@@ -43,7 +43,7 @@ int etnaviv_gem_prime_mmap(struct drm_gem_object *obj,return etnaviv_obj->ops->mmap (etnaviv_obj, vma); } -int etnaviv_gem_prime_pin (struct drm_gem_object *obj) +int etnaviv_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach) {struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj);@@ -55,7 +55,7 @@ int etnaviv_gem_prime_pin(struct drm_gem_object *obj)return 0 ; } -void etnaviv_gem_prime_unpin (struct drm_gem_object *obj) +void etnaviv_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach) {struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj);drivers/gpu/drm/msm/msm_drv.h +2
-2@@ -288,8 +288,8 @@ void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);struct drm_gem_object *msm_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg); -int msm_gem_prime_pin (struct drm_gem_object *obj); -void msm_gem_prime_unpin (struct drm_gem_object *obj); +int msm_gem_prime_pin (struct drm_gem_object *obj,struct device *dev); +void msm_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev);void *msm_gem_get_vaddr (struct drm_gem_object *obj);void *msm_gem_get_vaddr_active (struct drm_gem_object *obj);void msm_gem_put_vaddr (struct drm_gem_object *obj);drivers/gpu/drm/msm/msm_gem_prime.c +2
-2@@ -47,14 +47,14 @@ struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,return msm_gem_import (dev, attach->dmabuf, sg); } -int msm_gem_prime_pin (struct drm_gem_object *obj) +int msm_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach)msm_gem_get_pages (obj);return 0 ; } -void msm_gem_prime_unpin (struct drm_gem_object *obj) +void msm_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach)msm_gem_put_pages (obj);drivers/gpu/drm/nouveau/nouveau_gem.h +2
-2@@ -32,9 +32,9 @@ extern int nouveau_gem_ioctl_cpu_fini(struct drm_device *, void *,extern int nouveau_gem_ioctl_info (struct drm_device *,void *,struct drm_file *); -extern int nouveau_gem_prime_pin (struct drm_gem_object *); +extern int nouveau_gem_prime_pin (struct drm_gem_object *,struct device *);struct reservation_object *nouveau_gem_prime_res_obj (struct drm_gem_object *); -extern void nouveau_gem_prime_unpin (struct drm_gem_object *); +extern void nouveau_gem_prime_unpin (struct drm_gem_object *,struct device *);extern struct sg_table *nouveau_gem_prime_get_sg_table (struct drm_gem_object *);extern struct drm_gem_object *nouveau_gem_prime_import_sg_table (struct drm_device *,struct dma_buf_attachment *,struct sg_table *);drivers/gpu/drm/nouveau/nouveau_prime.c +2
-2@@ -88,7 +88,7 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,return &nvbo->gem; } -int nouveau_gem_prime_pin (struct drm_gem_object *obj) +int nouveau_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct nouveau_bo *nvbo =nouveau_gem_object (obj);int ret;@@ -101,7 +101,7 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj)return 0 ; } -void nouveau_gem_prime_unpin (struct drm_gem_object *obj) +void nouveau_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct nouveau_bo *nvbo =nouveau_gem_object (obj);drivers/gpu/drm/qxl/qxl_prime.c +2
-2@@ -28,14 +28,14 @@/* Empty Implementations as there should not be any other driver for a virtual * device that might share buffers with qxl */ -int qxl_gem_prime_pin (struct drm_gem_object *obj) +int qxl_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct qxl_bo *bo =gem_to_qxl_bo (obj);return qxl_bo_pin (bo); } -void qxl_gem_prime_unpin (struct drm_gem_object *obj) +void qxl_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct qxl_bo *bo =gem_to_qxl_bo (obj);drivers/gpu/drm/radeon/radeon_prime.c +2
-2@@ -83,7 +83,7 @@ struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev,return &bo->gem_base; } -int radeon_gem_prime_pin (struct drm_gem_object *obj) +int radeon_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct radeon_bo *bo =gem_to_radeon_bo (obj);int ret =0 ;@@ -101,7 +101,7 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj)return ret; } -void radeon_gem_prime_unpin (struct drm_gem_object *obj) +void radeon_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct radeon_bo *bo =gem_to_radeon_bo (obj);int ret =0 ;drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -307,7 +307,7 @@ static void vgem_unpin_pages(struct drm_vgem_gem_object *bo)mutex_unlock (&bo->pages_lock); } -static int vgem_prime_pin (struct drm_gem_object *obj) +static int vgem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj);long n_pages = obj->size >>PAGE_SHIFT ;@@ -325,7 +325,7 @@ static int vgem_prime_pin(struct drm_gem_object *obj)return 0 ; } -static void vgem_prime_unpin (struct drm_gem_object *obj) +static void vgem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj);include/drm/drm_drv.h +1
-2@@ -592,20 +592,19 @@ struct drm_driver {*/ struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,struct dma_buf *dma_buf); -/** * @gem_prime_pin: * * Deprecated hook in favour of &drm_gem_object_funcs.pin. */ -int (*gem_prime_pin)(struct drm_gem_object *obj); +int (*gem_prime_pin)(struct drm_gem_object *obj,struct device *dev);
include/drm/drm_drv.h struct drm_driver { · line 610
Quoted 10 lines
include/drm/drm_drv.h +1
-1/** * @gem_prime_unpin: * * Deprecated hook in favour of &drm_gem_object_funcs.unpin. */ -void (*gem_prime_unpin)(struct drm_gem_object *obj); +void (*gem_prime_unpin)(struct drm_gem_object *obj,struct device *dev);/**
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Koenig, Christian
maintainerRe: [PATCH v3 2/3] drm: plumb attaching dev thru to prime_pin/unpin
In reply to Rob ClarkAm 16.07.19 um 23:37 schrieb Rob Clark:
Quoted 3 lines
From: Rob Clark <[email protected]>
Needed in the following patch for cache operations.
Well have you seen that those callbacks are deprecated?
Quoted 4 lines
* Deprecated hook in favour of &drm_gem_object_funcs.pin.
* Deprecated hook in favour of &drm_gem_object_funcs.unpin.
I would rather say if you want to extend something it would be better to switch over to the per GEM object functions first.
Regards,
Christian.
Quoted 275 lines
Signed-off-by Rob Clark <[email protected]>---
v3: rebased on drm-tipdrivers/gpu/drm/drm_gem.c | 8 ++++---- drivers/gpu/drm/drm_internal.h | 4 ++-- drivers/gpu/drm/drm_prime.c | 4 ++-- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 4 ++-- drivers/gpu/drm/msm/msm_drv.h | 4 ++-- drivers/gpu/drm/msm/msm_gem_prime.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_gem.h | 4 ++-- drivers/gpu/drm/nouveau/nouveau_prime.c | 4 ++-- drivers/gpu/drm/qxl/qxl_prime.c | 4 ++-- drivers/gpu/drm/radeon/radeon_prime.c | 4 ++-- drivers/gpu/drm/vgem/vgem_drv.c | 4 ++-- include/drm/drm_drv.h | 5 ++--- 12 files changed, 26 insertions(+), 27 deletions(-)drivers/gpu/drm/drm_gem.c +4
-4@@ -1215,22 +1215,22 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent, obj->dev->driver->gem_print_info (p, indent, obj); } -int drm_gem_pin (struct drm_gem_object *obj) +int drm_gem_pin (struct drm_gem_object *obj,struct device *dev) {if (obj->funcs && obj->funcs->pin)return obj->funcs->pin (obj);else if (obj->dev->driver->gem_prime_pin) -return obj->dev->driver->gem_prime_pin (obj); +return obj->dev->driver->gem_prime_pin (obj, dev);else return 0 ; } -void drm_gem_unpin (struct drm_gem_object *obj) +void drm_gem_unpin (struct drm_gem_object *obj,struct device *dev) {if (obj->funcs && obj->funcs->unpin) obj->funcs->unpin (obj);else if (obj->dev->driver->gem_prime_unpin) - obj->dev->driver->gem_prime_unpin (obj); + obj->dev->driver->gem_prime_unpin (obj, dev); }void *drm_gem_vmap (struct drm_gem_object *obj)drivers/gpu/drm/drm_internal.h +2
-2@@ -133,8 +133,8 @@ void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);void drm_gem_print_info (struct drm_printer *p,unsigned int indent,const struct drm_gem_object *obj); -int drm_gem_pin (struct drm_gem_object *obj); -void drm_gem_unpin (struct drm_gem_object *obj); +int drm_gem_pin (struct drm_gem_object *obj,struct device *dev); +void drm_gem_unpin (struct drm_gem_object *obj,struct device *dev);void *drm_gem_vmap (struct drm_gem_object *obj);void drm_gem_vunmap (struct drm_gem_object *obj,void *vaddr);drivers/gpu/drm/drm_prime.c +2
-2@@ -575,7 +575,7 @@ int drm_gem_map_attach(struct dma_buf *dma_buf, {struct drm_gem_object *obj = dma_buf->priv; -return drm_gem_pin (obj); +return drm_gem_pin (obj, attach->dev); }EXPORT_SYMBOL (drm_gem_map_attach);@@ -593,7 +593,7 @@ void drm_gem_map_detach(struct dma_buf *dma_buf, {struct drm_gem_object *obj = dma_buf->priv; -drm_gem_unpin (obj); +drm_gem_unpin (obj, attach->dev); }EXPORT_SYMBOL (drm_gem_map_detach);drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +2
-2@@ -43,7 +43,7 @@ int etnaviv_gem_prime_mmap(struct drm_gem_object *obj,return etnaviv_obj->ops->mmap (etnaviv_obj, vma); } -int etnaviv_gem_prime_pin (struct drm_gem_object *obj) +int etnaviv_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach) {struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj);@@ -55,7 +55,7 @@ int etnaviv_gem_prime_pin(struct drm_gem_object *obj)return 0 ; } -void etnaviv_gem_prime_unpin (struct drm_gem_object *obj) +void etnaviv_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach) {struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj);drivers/gpu/drm/msm/msm_drv.h +2
-2@@ -288,8 +288,8 @@ void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);struct drm_gem_object *msm_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg); -int msm_gem_prime_pin (struct drm_gem_object *obj); -void msm_gem_prime_unpin (struct drm_gem_object *obj); +int msm_gem_prime_pin (struct drm_gem_object *obj,struct device *dev); +void msm_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev);void *msm_gem_get_vaddr (struct drm_gem_object *obj);void *msm_gem_get_vaddr_active (struct drm_gem_object *obj);void msm_gem_put_vaddr (struct drm_gem_object *obj);drivers/gpu/drm/msm/msm_gem_prime.c +2
-2@@ -47,14 +47,14 @@ struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,return msm_gem_import (dev, attach->dmabuf, sg); } -int msm_gem_prime_pin (struct drm_gem_object *obj) +int msm_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach)msm_gem_get_pages (obj);return 0 ; } -void msm_gem_prime_unpin (struct drm_gem_object *obj) +void msm_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {if (!obj->import_attach)msm_gem_put_pages (obj);drivers/gpu/drm/nouveau/nouveau_gem.h +2
-2@@ -32,9 +32,9 @@ extern int nouveau_gem_ioctl_cpu_fini(struct drm_device *, void *,extern int nouveau_gem_ioctl_info (struct drm_device *,void *,struct drm_file *); -extern int nouveau_gem_prime_pin (struct drm_gem_object *); +extern int nouveau_gem_prime_pin (struct drm_gem_object *,struct device *);struct reservation_object *nouveau_gem_prime_res_obj (struct drm_gem_object *); -extern void nouveau_gem_prime_unpin (struct drm_gem_object *); +extern void nouveau_gem_prime_unpin (struct drm_gem_object *,struct device *);extern struct sg_table *nouveau_gem_prime_get_sg_table (struct drm_gem_object *);extern struct drm_gem_object *nouveau_gem_prime_import_sg_table (struct drm_device *,struct dma_buf_attachment *,struct sg_table *);drivers/gpu/drm/nouveau/nouveau_prime.c +2
-2@@ -88,7 +88,7 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev,return &nvbo->gem; } -int nouveau_gem_prime_pin (struct drm_gem_object *obj) +int nouveau_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct nouveau_bo *nvbo =nouveau_gem_object (obj);int ret;@@ -101,7 +101,7 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj)return 0 ; } -void nouveau_gem_prime_unpin (struct drm_gem_object *obj) +void nouveau_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct nouveau_bo *nvbo =nouveau_gem_object (obj);drivers/gpu/drm/qxl/qxl_prime.c +2
-2@@ -28,14 +28,14 @@/* Empty Implementations as there should not be any other driver for a virtual * device that might share buffers with qxl */ -int qxl_gem_prime_pin (struct drm_gem_object *obj) +int qxl_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct qxl_bo *bo =gem_to_qxl_bo (obj);return qxl_bo_pin (bo); } -void qxl_gem_prime_unpin (struct drm_gem_object *obj) +void qxl_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct qxl_bo *bo =gem_to_qxl_bo (obj);drivers/gpu/drm/radeon/radeon_prime.c +2
-2@@ -83,7 +83,7 @@ struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev,return &bo->gem_base; } -int radeon_gem_prime_pin (struct drm_gem_object *obj) +int radeon_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct radeon_bo *bo =gem_to_radeon_bo (obj);int ret =0 ;@@ -101,7 +101,7 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj)return ret; } -void radeon_gem_prime_unpin (struct drm_gem_object *obj) +void radeon_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct radeon_bo *bo =gem_to_radeon_bo (obj);int ret =0 ;drivers/gpu/drm/vgem/vgem_drv.c +2
-2@@ -307,7 +307,7 @@ static void vgem_unpin_pages(struct drm_vgem_gem_object *bo)mutex_unlock (&bo->pages_lock); } -static int vgem_prime_pin (struct drm_gem_object *obj) +static int vgem_prime_pin (struct drm_gem_object *obj,struct device *dev) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj);long n_pages = obj->size >>PAGE_SHIFT ;@@ -325,7 +325,7 @@ static int vgem_prime_pin(struct drm_gem_object *obj)return 0 ; } -static void vgem_prime_unpin (struct drm_gem_object *obj) +static void vgem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {struct drm_vgem_gem_object *bo =to_vgem_bo (obj);include/drm/drm_drv.h +2
-3@@ -592,20 +592,19 @@ struct drm_driver {*/ struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,struct dma_buf *dma_buf); -/** * @gem_prime_pin: * * Deprecated hook in favour of &drm_gem_object_funcs.pin. */ -int (*gem_prime_pin)(struct drm_gem_object *obj); +int (*gem_prime_pin)(struct drm_gem_object *obj,struct device *dev);/** * @gem_prime_unpin: * * Deprecated hook in favour of &drm_gem_object_funcs.unpin. */ -void (*gem_prime_unpin)(struct drm_gem_object *obj); +void (*gem_prime_unpin)(struct drm_gem_object *obj,struct device *dev);/**
Re: [PATCH v3 3/3] drm/vgem: use normal cached mmap'ings
In reply to Rob ClarkQuoted 37 lines · Rob Clark
Quoted 13 lines · Eric Anholt
Quoted 9 lines · Rob Clark
From: Rob Clark <[email protected]>
Since there is no real device associated with VGEM, it is impossible to end up with appropriate
dev->dma_ops, meaning that we have no way to invalidate the shmem pages allocated by VGEM. So, at least on platforms withoutdrm_cflush_pages(), we end up with corruption when cache lines from previous usage of VGEM bo pages get evicted to memory.The only sane option is to use cached mappings.
Quoted 7 lines
This may be an improvement, but...
pin/unpin is only on attaching/closing the dma-buf, right? So, great, you flushed the cached map once after exporting the vgem dma-buf to the actual GPU device, but from then on you still have no interface for getting coherent access through VGEM's mapping again, which still exists.
In *theory* one would detach before doing further CPU access to buffer, and then re-attach when passing back to GPU.
Ofc that isn't how actual drivers do things. But maybe it is enough for vgem to serve it's purpose (ie. test code).
Quoted 3 lines
I feel like this is papering over something that's really just broken, and we should stop providing VGEM just because someone wants to write dma-buf test code without driver-specific BO alloc ioctl code.
yup, it is vgem that is fundamentally broken (or maybe more specifically doesn't fit in w/ dma-mappings view of how to do cache maint), and I'm just papering over it because people and CI systems want to be able to use it to do some dma-buf tests ;-)
Quoted 5 lines
I'm kinda wondering, at least for arm/dt based systems, if there is a way (other than in early boot) that we can inject a vgem device node into the dtb. That isn't a thing drivers should normally do, but (if possible) since vgem is really just test infrastructure, it could be a way to make dma-mapping happily think vgem is a real device.
Or we just extend drm_cflush_pages with the cflushing we need (at least for those arms where this is possible, let's ignore the others) and accept for a few more years that dma-api doesn't fit?
Note this would need to be a full copypasta of what the arch code has (since just exporting the function was shot down before), but I really don't care about the resulting wailing if we do this. -Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch