drm/gem: don't force writecombine mmap'ing
Subsystems (10)
PATCH v2 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.
drivers/gpu/drm/drm_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_gem.c +1 -1
@@ -1110,7 +1110,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 v2 2/3 drm: plumb attaching dev thru to prime_pin/unpin
From: Rob Clark <[email protected]>
Needed in the following patch for cache operations.
--- drivers/gpu/drm/drm_gem.c | 10 ++++++---- drivers/gpu/drm/drm_gem_vram_helper.c | 6 ++++-- 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/vboxvideo/vbox_prime.c | 4 ++-- drivers/gpu/drm/vgem/vgem_drv.c | 4 ++-- include/drm/drm_drv.h | 4 ++-- include/drm/drm_gem.h | 4 ++-- include/drm/drm_gem_vram_helper.h | 4 ++-- 15 files changed, 36 insertions(+), 32 deletions(-)
drivers/gpu/drm/drm_gem.c +6 -4
@@ -1219,18 +1219,19 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent,/** * drm_gem_pin - Pin backing buffer in memory * @obj: GEM object +* @dev: the device the buffer is being pinned for * * Make sure the backing buffer is pinned in memory. * * Returns: * 0 on success or a negative error code on failure. */ -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 ; }
@@ -1239,15 +1240,16 @@ EXPORT_SYMBOL(drm_gem_pin);/** * drm_gem_unpin - Unpin backing buffer from memory * @obj: GEM object +* @dev: the device the buffer is being pinned for * * Relax the requirement that the backing buffer is pinned in memory. */ -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); }EXPORT_SYMBOL (drm_gem_unpin);
drivers/gpu/drm/drm_gem_vram_helper.c +4 -2
@@ -548,7 +548,8 @@ EXPORT_SYMBOL(drm_gem_vram_driver_dumb_mmap_offset);* 0 on success, or * a negative errno code otherwise. */ -int drm_gem_vram_driver_gem_prime_pin (struct drm_gem_object *gem) +int drm_gem_vram_driver_gem_prime_pin (struct drm_gem_object *gem, +struct device *dev) {struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem);
@@ -569,7 +570,8 @@ EXPORT_SYMBOL(drm_gem_vram_driver_gem_prime_pin);Implements &struct drm_driver.gem_prime_unpin * @gem: The GEM object to unpin */ -void drm_gem_vram_driver_gem_prime_unpin (struct drm_gem_object *gem) +void drm_gem_vram_driver_gem_prime_unpin (struct drm_gem_object *gem, +struct device *dev) {struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem);
drivers/gpu/drm/drm_prime.c +2 -2
@@ -196,7 +196,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);
@@ -213,7 +213,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
@@ -298,8 +298,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
@@ -58,14 +58,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/vboxvideo/vbox_prime.c +2 -2
@@ -13,13 +13,13 @@* device that might share buffers with vboxvideo */ -int vbox_gem_prime_pin (struct drm_gem_object *obj) +int vbox_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {WARN_ONCE (1 ,"not implemented" );return -ENODEV ; } -void vbox_gem_prime_unpin (struct drm_gem_object *obj) +void vbox_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {WARN_ONCE (1 ,"not implemented" ); }
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 -2
@@ -584,8 +584,8 @@ struct drm_driver {*/ struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,struct dma_buf *dma_buf); -int (*gem_prime_pin)(struct drm_gem_object *obj); -void (*gem_prime_unpin)(struct drm_gem_object *obj); +int (*gem_prime_pin)(struct drm_gem_object *obj,struct device *dev); +void (*gem_prime_unpin)(struct drm_gem_object *obj,struct device *dev);struct reservation_object * (*gem_prime_res_obj)(struct drm_gem_object *obj);struct sg_table *(*gem_prime_get_sg_table)(struct drm_gem_object *obj);
include/drm/drm_gem.h +2 -2
@@ -401,8 +401,8 @@ int drm_gem_dumb_destroy(struct drm_file *file,struct drm_device *dev, uint32_t handle); -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);
include/drm/drm_gem_vram_helper.h +2 -2
@@ -133,8 +133,8 @@ int drm_gem_vram_driver_dumb_mmap_offset(struct drm_file *file,* PRIME helpers for struct drm_driver */ -int drm_gem_vram_driver_gem_prime_pin (struct drm_gem_object *obj); -void drm_gem_vram_driver_gem_prime_unpin (struct drm_gem_object *obj); +int drm_gem_vram_driver_gem_prime_pin (struct drm_gem_object *obj,struct device *dev); +void drm_gem_vram_driver_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev);void *drm_gem_vram_driver_gem_prime_vmap (struct drm_gem_object *obj);void drm_gem_vram_driver_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr);
Signature · 1 line
2.21.0
PATCH v2 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.
--- drivers/gpu/drm/drm_gem.c | 10 ++++++---- drivers/gpu/drm/drm_gem_vram_helper.c | 6 ++++-- 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/vboxvideo/vbox_prime.c | 4 ++-- drivers/gpu/drm/vgem/vgem_drv.c | 4 ++-- include/drm/drm_drv.h | 4 ++-- include/drm/drm_gem.h | 4 ++-- include/drm/drm_gem_vram_helper.h | 4 ++-- 15 files changed, 36 insertions(+), 32 deletions(-)
drivers/gpu/drm/drm_gem.c +6 -4
@@ -1219,18 +1219,19 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent,/** * drm_gem_pin - Pin backing buffer in memory * @obj: GEM object +* @dev: the device the buffer is being pinned for * * Make sure the backing buffer is pinned in memory. * * Returns: * 0 on success or a negative error code on failure. */ -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 ; }
@@ -1239,15 +1240,16 @@ EXPORT_SYMBOL(drm_gem_pin);/** * drm_gem_unpin - Unpin backing buffer from memory * @obj: GEM object +* @dev: the device the buffer is being pinned for * * Relax the requirement that the backing buffer is pinned in memory. */ -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); }EXPORT_SYMBOL (drm_gem_unpin);
drivers/gpu/drm/drm_gem_vram_helper.c +4 -2
@@ -548,7 +548,8 @@ EXPORT_SYMBOL(drm_gem_vram_driver_dumb_mmap_offset);* 0 on success, or * a negative errno code otherwise. */ -int drm_gem_vram_driver_gem_prime_pin (struct drm_gem_object *gem) +int drm_gem_vram_driver_gem_prime_pin (struct drm_gem_object *gem, +struct device *dev) {struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem);
@@ -569,7 +570,8 @@ EXPORT_SYMBOL(drm_gem_vram_driver_gem_prime_pin);Implements &struct drm_driver.gem_prime_unpin * @gem: The GEM object to unpin */ -void drm_gem_vram_driver_gem_prime_unpin (struct drm_gem_object *gem) +void drm_gem_vram_driver_gem_prime_unpin (struct drm_gem_object *gem, +struct device *dev) {struct drm_gem_vram_object *gbo =drm_gem_vram_of_gem (gem);
drivers/gpu/drm/drm_prime.c +2 -2
@@ -196,7 +196,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);
@@ -213,7 +213,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
@@ -298,8 +298,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
@@ -58,14 +58,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/vboxvideo/vbox_prime.c +2 -2
@@ -13,13 +13,13 @@* device that might share buffers with vboxvideo */ -int vbox_gem_prime_pin (struct drm_gem_object *obj) +int vbox_gem_prime_pin (struct drm_gem_object *obj,struct device *dev) {WARN_ONCE (1 ,"not implemented" );return -ENODEV ; } -void vbox_gem_prime_unpin (struct drm_gem_object *obj) +void vbox_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev) {WARN_ONCE (1 ,"not implemented" ); }
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 -2
@@ -584,8 +584,8 @@ struct drm_driver {*/ struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,struct dma_buf *dma_buf); -int (*gem_prime_pin)(struct drm_gem_object *obj); -void (*gem_prime_unpin)(struct drm_gem_object *obj); +int (*gem_prime_pin)(struct drm_gem_object *obj,struct device *dev); +void (*gem_prime_unpin)(struct drm_gem_object *obj,struct device *dev);struct reservation_object * (*gem_prime_res_obj)(struct drm_gem_object *obj);struct sg_table *(*gem_prime_get_sg_table)(struct drm_gem_object *obj);
include/drm/drm_gem.h +2 -2
@@ -401,8 +401,8 @@ int drm_gem_dumb_destroy(struct drm_file *file,struct drm_device *dev, uint32_t handle); -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);
include/drm/drm_gem_vram_helper.h +2 -2
@@ -133,8 +133,8 @@ int drm_gem_vram_driver_dumb_mmap_offset(struct drm_file *file,* PRIME helpers for struct drm_driver */ -int drm_gem_vram_driver_gem_prime_pin (struct drm_gem_object *obj); -void drm_gem_vram_driver_gem_prime_unpin (struct drm_gem_object *obj); +int drm_gem_vram_driver_gem_prime_pin (struct drm_gem_object *obj,struct device *dev); +void drm_gem_vram_driver_gem_prime_unpin (struct drm_gem_object *obj,struct device *dev);void *drm_gem_vram_driver_gem_prime_vmap (struct drm_gem_object *obj);void drm_gem_vram_driver_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr);
Signature · 1 line
2.21.0
PATCH v2 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.
--- 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 · 6 lines
2.21.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/3] drm: plumb attaching dev thru to prime_pin/unpin
In reply to Rob ClarkQuoting Rob Clark (2019-07-16 18:43:22)
Quoted 3 lines
From: Rob Clark <[email protected]>
Needed in the following patch for cache operations.
What's the base for this patch? (I'm missing the ancestor for drm_gem.c) -Chris
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [PATCH v2 2/3] drm: plumb attaching dev thru to prime_pin/unpin
In reply to Rob ClarkQuoting Rob Clark (2019-07-16 18:43:22)
Quoted 3 lines
From: Rob Clark <[email protected]>
Needed in the following patch for cache operations.
What's the base for this patch? (I'm missing the ancestor for drm_gem.c) -Chris