ttm / vmwgfx fixes
Subsystems (4)
cover ttm / vmwgfx fixes
Patch 1 fixes a case where a sync object may already have been destroyed when the sync_obj_flush function is called.
Patch 2 and 3 deal with non-root EGL masters. On current vmwgfx, trying to run EGL as a non-root user results in a kernel oops.
PATCH 1/3 drm/ttm: Make sure a sync object doesn't disappear while we use it
The sync object may disappear as soon as we release the bo::lock, so take a reference on it while we use it.
One option would be to call sync_object_flush() before releasing the bo::lock, but that would put an atomic requirement on that function.
--- drivers/gpu/drm/ttm/ttm_bo.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +7 -4
@@ -458,7 +458,7 @@ static void ttm_bo_cleanup_refs_or_queue(struct ttm_buffer_object *bo)struct ttm_bo_device *bdev = bo->bdev;struct ttm_bo_global *glob = bo->glob;struct ttm_bo_driver *driver; -void *sync_obj; +void *sync_obj =NULL ;void *sync_obj_arg;int put_count;int ret;
@@ -493,17 +493,20 @@ static void ttm_bo_cleanup_refs_or_queue(struct ttm_buffer_object *bo)spin_lock (&glob->lru_lock); } queue: - sync_obj = bo->sync_obj; - sync_obj_arg = bo->sync_obj_arg; driver = bdev->driver; +if (bo->sync_obj) + sync_obj = driver->sync_obj_ref (bo->sync_obj); + sync_obj_arg = bo->sync_obj_arg;kref_get (&bo->list_kref);list_add_tail (&bo->ddestroy, &bdev->ddestroy);spin_unlock (&glob->lru_lock);spin_unlock (&bo->lock); -if (sync_obj) +if (sync_obj) { driver->sync_obj_flush (sync_obj, sync_obj_arg); + driver->sync_obj_unref (&sync_obj); + }schedule_delayed_work (&bdev->wq, ((HZ /100 ) <1 ) ?1 :HZ /100 ); }
Signature · 1 line
1.6.2.5
PATCH 2/3 drm/ttm: Remove the CAP_SYS_ADMIN requirement for bo pinning
This breaks vmwgfx non-root EGL clients and is a remnant from the TTM user-space interface. This test should be done in the driver. Replace the remaining placement test with a BUG_ON, since triggering it is a driver bug.
--- drivers/gpu/drm/ttm/ttm_bo.c | 30 ++---------------------------- 1 files changed, 2 insertions(+), 28 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +2 -28
@@ -1119,35 +1119,9 @@ EXPORT_SYMBOL(ttm_bo_validate);int ttm_bo_check_placement (struct ttm_buffer_object *bo,struct ttm_placement *placement) { -int i; +BUG_ON ((placement->fpfn || placement->lpfn) && + (bo->mem.num_pages > (placement->lpfn - placement->fpfn))); -if (placement->fpfn || placement->lpfn) { -if (bo->mem.num_pages > (placement->lpfn - placement->fpfn)) { - printk(KERN_ERR TTM_PFX "Page number range to small " -"Need %lu pages, range is [%u, %u]\n" , - bo->mem.num_pages, placement->fpfn, - placement->lpfn); -return -EINVAL ; - } - } -for (i =0 ; i < placement->num_placement; i++) { -if (!capable (CAP_SYS_ADMIN )) { -if (placement->placement[i] &TTM_PL_FLAG_NO_EVICT ) { - printk(KERN_ERR TTM_PFX "Need to be root to " - "modify NO_EVICT status.\n"); -return -EINVAL ; - } - } - } -for (i =0 ; i < placement->num_busy_placement; i++) { -if (!capable (CAP_SYS_ADMIN )) { -if (placement->busy_placement[i] &TTM_PL_FLAG_NO_EVICT ) { - printk(KERN_ERR TTM_PFX "Need to be root to " - "modify NO_EVICT status.\n"); -return -EINVAL ; - } - } - }return 0 ; }
Signature · 1 line
1.6.2.5
PATCH 3/3 drm/vmwgfx: Fix oops on failing bo pin
When bo pin failed during modesetting,
vmwgfx would try to unref a non-existing buffer object.
--- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +5 -0
@@ -720,6 +720,8 @@ static int vmw_surface_dmabuf_pin(struct vmw_framebuffer *vfb) &vmw_vram_ne_placement, false, &vmw_dmabuf_bo_free);vmw_overlay_resume_all (dev_priv); +if (unlikely (ret !=0 )) + vfbs->buffer =NULL ;return ret; }
@@ -730,6 +732,9 @@ static int vmw_surface_dmabuf_unpin(struct vmw_framebuffer *vfb)struct vmw_framebuffer_surface *vfbs =vmw_framebuffer_to_vfbs (&vfb->base); +if (unlikely (vfbs->buffer ==NULL )) +return 0 ; + bo = &vfbs->buffer->base;ttm_bo_unref (&bo); vfbs->buffer =NULL ;
Signature · 1 line
1.6.2.5