drm/qxl: a collection of small tweaks.
Subsystems (4)
Gerd Hoffmann
maintainercover drm/qxl: a collection of small tweaks.
Switch qxl driver to the new mmap workflow,
some cleanups, reduce memory fragmentation.
Series needs latest drm-misc-next to build.
Gerd Hoffmann (5):
drm/qxl: drop qxl_ttm_fault
drm/qxl: switch qxl to &drm_gem_object_funcs.mmap drm/qxl: drop verify_access
drm/qxl: use DEFINE_DRM_GEM_FOPS() drm/qxl: allocate small objects top-down
drivers/gpu/drm/qxl/qxl_drv.h | 1 - drivers/gpu/drm/qxl/qxl_drv.c | 10 +------ drivers/gpu/drm/qxl/qxl_object.c | 8 ++++- drivers/gpu/drm/qxl/qxl_ttm.c | 50 -------------------------------- 4 files changed, 8 insertions(+), 61 deletions(-)
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 1/5 drm/qxl: drop qxl_ttm_fault
Not sure what this hook is supposed to do. vmf->vma->vm_private_data should never be NULL, so the extra check in qxl_ttm_fault should have no effect.
Drop it.
--- drivers/gpu/drm/qxl/qxl_ttm.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-)
drivers/gpu/drm/qxl/qxl_ttm.c +1 -26
@@ -48,24 +48,8 @@ static struct qxl_device *qxl_get_qdev(struct ttm_bo_device *bdev)return qdev; } -static struct vm_operations_struct qxl_ttm_vm_ops; -static const struct vm_operations_struct *ttm_vm_ops; - -static vm_fault_t qxl_ttm_fault (struct vm_fault *vmf) -{ -struct ttm_buffer_object *bo; -vm_fault_t ret; - - bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data; -if (bo ==NULL ) -return VM_FAULT_NOPAGE ; - ret = ttm_vm_ops->fault (vmf); -return ret; -} -int qxl_mmap (struct file *filp,struct vm_area_struct *vma) { -int r;struct drm_file *file_priv = filp->private_data;struct qxl_device *qdev = file_priv->minor->dev->dev_private;
@@ -77,16 +61,7 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)DRM_DEBUG_DRIVER ("filp->private_data = 0x%p, vma->vm_pgoff = %lx\n" , filp->private_data, vma->vm_pgoff); - r =ttm_bo_mmap (filp, vma, &qdev->mman.bdev); -if (unlikely (r !=0 )) -return r; -if (unlikely (ttm_vm_ops ==NULL )) { - ttm_vm_ops = vma->vm_ops; - qxl_ttm_vm_ops = *ttm_vm_ops; - qxl_ttm_vm_ops.fault = &qxl_ttm_fault; - } - vma->vm_ops = &qxl_ttm_vm_ops; -return 0 ; +return ttm_bo_mmap (filp, vma, &qdev->mman.bdev); }static int qxl_invalidate_caches (struct ttm_bo_device *bdev,uint32_t flags)
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 1/5 drm/qxl: drop qxl_ttm_fault
In reply to Gerd HoffmannNot sure what this hook is supposed to do. vmf->vma->vm_private_data should never be NULL, so the extra check in qxl_ttm_fault should have no effect.
Drop it.
--- drivers/gpu/drm/qxl/qxl_ttm.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-)
drivers/gpu/drm/qxl/qxl_ttm.c +1 -26
@@ -48,24 +48,8 @@ static struct qxl_device *qxl_get_qdev(struct ttm_bo_device *bdev)return qdev; } -static struct vm_operations_struct qxl_ttm_vm_ops; -static const struct vm_operations_struct *ttm_vm_ops; - -static vm_fault_t qxl_ttm_fault (struct vm_fault *vmf) -{ -struct ttm_buffer_object *bo; -vm_fault_t ret; - - bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data; -if (bo ==NULL ) -return VM_FAULT_NOPAGE ; - ret = ttm_vm_ops->fault (vmf); -return ret; -} -int qxl_mmap (struct file *filp,struct vm_area_struct *vma) { -int r;struct drm_file *file_priv = filp->private_data;struct qxl_device *qdev = file_priv->minor->dev->dev_private;
@@ -77,16 +61,7 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)DRM_DEBUG_DRIVER ("filp->private_data = 0x%p, vma->vm_pgoff = %lx\n" , filp->private_data, vma->vm_pgoff); - r =ttm_bo_mmap (filp, vma, &qdev->mman.bdev); -if (unlikely (r !=0 )) -return r; -if (unlikely (ttm_vm_ops ==NULL )) { - ttm_vm_ops = vma->vm_ops; - qxl_ttm_vm_ops = *ttm_vm_ops; - qxl_ttm_vm_ops.fault = &qxl_ttm_fault; - } - vma->vm_ops = &qxl_ttm_vm_ops; -return 0 ; +return ttm_bo_mmap (filp, vma, &qdev->mman.bdev); }static int qxl_invalidate_caches (struct ttm_bo_device *bdev,uint32_t flags)
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 2/5 drm/qxl: switch qxl to &drm_gem_object_funcs.mmap
In reply to Gerd HoffmannWire up the new drm_gem_ttm_mmap() helper function. Use generic drm_gem_mmap() and remove qxl_mmap().
--- drivers/gpu/drm/qxl/qxl_drv.h | 1 - drivers/gpu/drm/qxl/qxl_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_object.c | 1 + drivers/gpu/drm/qxl/qxl_ttm.c | 16 ---------------- 4 files changed, 2 insertions(+), 18 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.h +0 -1
@@ -355,7 +355,6 @@ int qxl_mode_dumb_mmap(struct drm_file *filp,/* qxl ttm */ int qxl_ttm_init (struct qxl_device *qdev);void qxl_ttm_fini (struct qxl_device *qdev); -int qxl_mmap (struct file *filp,struct vm_area_struct *vma);/* qxl image */
drivers/gpu/drm/qxl/qxl_drv.c +1 -1
@@ -157,7 +157,7 @@ static const struct file_operations qxl_fops = { .unlocked_ioctl = drm_ioctl, .poll = drm_poll, .read = drm_read, - .mmap = qxl_mmap, + .mmap = drm_gem_mmap, };static int qxl_drm_freeze (struct drm_device *dev)
drivers/gpu/drm/qxl/qxl_object.c +1 -0
@@ -86,6 +86,7 @@ static const struct drm_gem_object_funcs qxl_object_funcs = { .get_sg_table = qxl_gem_prime_get_sg_table, .vmap = qxl_gem_prime_vmap, .vunmap = qxl_gem_prime_vunmap, + .mmap = drm_gem_ttm_mmap, .print_info = drm_gem_ttm_print_info, };
drivers/gpu/drm/qxl/qxl_ttm.c +0 -16
@@ -48,22 +48,6 @@ static struct qxl_device *qxl_get_qdev(struct ttm_bo_device *bdev)return qdev; } -int qxl_mmap (struct file *filp,struct vm_area_struct *vma) -{ -struct drm_file *file_priv = filp->private_data; -struct qxl_device *qdev = file_priv->minor->dev->dev_private; - -if (qdev ==NULL ) { -DRM_ERROR ( -"filp->private_data->minor->dev->dev_private == NULL\n" ); -return -EINVAL ; - } -DRM_DEBUG_DRIVER ("filp->private_data = 0x%p, vma->vm_pgoff = %lx\n" , - filp->private_data, vma->vm_pgoff); - -return ttm_bo_mmap (filp, vma, &qdev->mman.bdev); -} -static int qxl_invalidate_caches (struct ttm_bo_device *bdev,uint32_t flags) {return 0 ;
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 2/5 drm/qxl: switch qxl to &drm_gem_object_funcs.mmap
In reply to Gerd HoffmannWire up the new drm_gem_ttm_mmap() helper function. Use generic drm_gem_mmap() and remove qxl_mmap().
--- drivers/gpu/drm/qxl/qxl_drv.h | 1 - drivers/gpu/drm/qxl/qxl_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_object.c | 1 + drivers/gpu/drm/qxl/qxl_ttm.c | 16 ---------------- 4 files changed, 2 insertions(+), 18 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.h +0 -1
@@ -355,7 +355,6 @@ int qxl_mode_dumb_mmap(struct drm_file *filp,/* qxl ttm */ int qxl_ttm_init (struct qxl_device *qdev);void qxl_ttm_fini (struct qxl_device *qdev); -int qxl_mmap (struct file *filp,struct vm_area_struct *vma);/* qxl image */
drivers/gpu/drm/qxl/qxl_drv.c +1 -1
@@ -157,7 +157,7 @@ static const struct file_operations qxl_fops = { .unlocked_ioctl = drm_ioctl, .poll = drm_poll, .read = drm_read, - .mmap = qxl_mmap, + .mmap = drm_gem_mmap, };static int qxl_drm_freeze (struct drm_device *dev)
drivers/gpu/drm/qxl/qxl_object.c +1 -0
@@ -86,6 +86,7 @@ static const struct drm_gem_object_funcs qxl_object_funcs = { .get_sg_table = qxl_gem_prime_get_sg_table, .vmap = qxl_gem_prime_vmap, .vunmap = qxl_gem_prime_vunmap, + .mmap = drm_gem_ttm_mmap, .print_info = drm_gem_ttm_print_info, };
drivers/gpu/drm/qxl/qxl_ttm.c +0 -16
@@ -48,22 +48,6 @@ static struct qxl_device *qxl_get_qdev(struct ttm_bo_device *bdev)return qdev; } -int qxl_mmap (struct file *filp,struct vm_area_struct *vma) -{ -struct drm_file *file_priv = filp->private_data; -struct qxl_device *qdev = file_priv->minor->dev->dev_private; - -if (qdev ==NULL ) { -DRM_ERROR ( -"filp->private_data->minor->dev->dev_private == NULL\n" ); -return -EINVAL ; - } -DRM_DEBUG_DRIVER ("filp->private_data = 0x%p, vma->vm_pgoff = %lx\n" , - filp->private_data, vma->vm_pgoff); - -return ttm_bo_mmap (filp, vma, &qdev->mman.bdev); -} -static int qxl_invalidate_caches (struct ttm_bo_device *bdev,uint32_t flags) {return 0 ;
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 3/5 drm/qxl: drop verify_access
In reply to Gerd HoffmannNot needed any more.
--- drivers/gpu/drm/qxl/qxl_ttm.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/gpu/drm/qxl/qxl_ttm.c +0 -9
@@ -110,14 +110,6 @@ static void qxl_evict_flags(struct ttm_buffer_object *bo, *placement = qbo->placement; } -static int qxl_verify_access (struct ttm_buffer_object *bo,struct file *filp) -{ -struct qxl_bo *qbo =to_qxl_bo (bo); - -return drm_vma_node_verify_access (&qbo->tbo.base.vma_node, - filp->private_data); -} -static int qxl_ttm_io_mem_reserve (struct ttm_bo_device *bdev,struct ttm_mem_reg *mem) {
@@ -269,7 +261,6 @@ static struct ttm_bo_driver qxl_bo_driver = { .eviction_valuable = ttm_bo_eviction_valuable, .evict_flags = &qxl_evict_flags, .move = &qxl_bo_move, - .verify_access = &qxl_verify_access, .io_mem_reserve = &qxl_ttm_io_mem_reserve, .io_mem_free = &qxl_ttm_io_mem_free, .move_notify = &qxl_bo_move_notify,
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 4/5 drm/qxl: use DEFINE_DRM_GEM_FOPS()
In reply to Gerd HoffmannWe have no qxl-specific fops any more.
--- drivers/gpu/drm/qxl/qxl_drv.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.c +1 -9
@@ -150,15 +150,7 @@ qxl_pci_remove(struct pci_dev *pdev)drm_dev_put (dev); } -static const struct file_operations qxl_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .poll = drm_poll, - .read = drm_read, - .mmap = drm_gem_mmap, -}; +DEFINE_DRM_GEM_FOPS (qxl_fops);static int qxl_drm_freeze (struct drm_device *dev) {
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 4/5 drm/qxl: use DEFINE_DRM_GEM_FOPS()
In reply to Gerd HoffmannWe have no qxl-specific fops any more.
--- drivers/gpu/drm/qxl/qxl_drv.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.c +1 -9
@@ -150,15 +150,7 @@ qxl_pci_remove(struct pci_dev *pdev)drm_dev_put (dev); } -static const struct file_operations qxl_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, - .poll = drm_poll, - .read = drm_read, - .mmap = drm_gem_mmap, -}; +DEFINE_DRM_GEM_FOPS (qxl_fops);static int qxl_drm_freeze (struct drm_device *dev) {
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 5/5 drm/qxl: allocate small objects top-down
In reply to Gerd Hoffmannqxl uses small buffer objects for qxl commands.
Allocate them top-down to reduce fragmentation.
--- drivers/gpu/drm/qxl/qxl_object.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/qxl/qxl_object.c +6 -1
@@ -54,9 +54,14 @@ bool qxl_ttm_bo_is_qxl_bo(struct ttm_buffer_object *bo)void qxl_ttm_placement_from_domain (struct qxl_bo *qbo,u32 domain,bool pinned) {u32 c =0 ; -u32 pflag = pinned ?TTM_PL_FLAG_NO_EVICT :0 ; +u32 pflag =0 ;unsigned int i; +if (pinned) + pflag |=TTM_PL_FLAG_NO_EVICT ; +if (qbo->tbo.base.size <=PAGE_SIZE ) + pflag |=TTM_PL_FLAG_TOPDOWN ; + qbo->placement.placement = qbo->placements; qbo->placement.busy_placement = qbo->placements;if (domain ==QXL_GEM_DOMAIN_VRAM )
Signature · 6 lines
2.18.1 _______________________________________________ Spice-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/spice-devel
Gerd Hoffmann
maintainerPATCH 5/5 drm/qxl: allocate small objects top-down
In reply to Gerd Hoffmannqxl uses small buffer objects for qxl commands.
Allocate them top-down to reduce fragmentation.
--- drivers/gpu/drm/qxl/qxl_object.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/qxl/qxl_object.c +6 -1
@@ -54,9 +54,14 @@ bool qxl_ttm_bo_is_qxl_bo(struct ttm_buffer_object *bo)void qxl_ttm_placement_from_domain (struct qxl_bo *qbo,u32 domain,bool pinned) {u32 c =0 ; -u32 pflag = pinned ?TTM_PL_FLAG_NO_EVICT :0 ; +u32 pflag =0 ;unsigned int i; +if (pinned) + pflag |=TTM_PL_FLAG_NO_EVICT ; +if (qbo->tbo.base.size <=PAGE_SIZE ) + pflag |=TTM_PL_FLAG_TOPDOWN ; + qbo->placement.placement = qbo->placements; qbo->placement.busy_placement = qbo->placements;if (domain ==QXL_GEM_DOMAIN_VRAM )
Signature · 1 line
2.18.1
Quoted 4 lines · Gerd Hoffmann
Switch qxl driver to the new mmap workflow,
some cleanups, reduce memory fragmentation.Series needs latest drm-misc-next to build.
Nice stuff. On the series:
Quoted 21 lines
Gerd Hoffmann (5):
drm/qxl: dropqxl_ttm_fault
drm/qxl: switch qxl to &drm_gem_object_funcs.mmap drm/qxl: dropverify_access
drm/qxl: useDEFINE_DRM_GEM_FOPS()drm/qxl: allocate small objects top-downdrivers/gpu/drm/qxl/qxl_drv.h | 1 - drivers/gpu/drm/qxl/qxl_drv.c | 10 +------ drivers/gpu/drm/qxl/qxl_object.c | 8 ++++- drivers/gpu/drm/qxl/qxl_ttm.c | 50 -------------------------------- 4 files changed, 8 insertions(+), 61 deletions(-)Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel