leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/qxl: Move main reference counter to GEM object instead of TTM ones

Browse Source 
qxl_bo structure has two reference counters, one in the GEM object and
another in the TTM object. The GEM object keep a counter to the TTM object
so when GEM counter reached zero the TTM counter (using qxl_bo_unref) was
decremented. The qxl object is fully freed (both GEM and TTM part are cleaned)
when the TTM counter reach zero.
One issue was that surface idr structure has no owning on qxl_bo objects however
it contains a pointer to qxl_bo object. This caused some nasty race condition
for instance qxl_bo object was reaped even after counter was already zero.
This patch fix these races moving main counter (the one used by qxl_bo_(un)ref)
to GEM object which cleanup routine (qxl_gem_object_free) remove the idr pointer
(using qxl_surface_evict) when the counters are still valid.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Frediano Ziglio 2015-06-03 12:09:17 +01:00 committed by Dave Airlie
parent 72ec5650a8
commit e07154e28c
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/qxl/qxl_gem.c
View File

@ -31,9 +31,15 @@
void qxl_gem_object_free(struct drm_gem_object *gobj) void qxl_gem_object_free(struct drm_gem_object *gobj)
{ {
struct qxl_bo *qobj = gem_to_qxl_bo(gobj); struct qxl_bo *qobj = gem_to_qxl_bo(gobj);
struct qxl_device *qdev;
struct ttm_buffer_object *tbo;
if (qobj) qdev = (struct qxl_device *)gobj->dev->dev_private;
qxl_bo_unref(&qobj);
qxl_surface_evict(qdev, qobj, false);
tbo = &qobj->tbo;
ttm_bo_unref(&tbo);
} }
int qxl_gem_object_create(struct qxl_device *qdev, int size, int qxl_gem_object_create(struct qxl_device *qdev, int size,

9
drivers/gpu/drm/qxl/qxl_object.c
View File

@ -208,19 +208,16 @@ void qxl_bo_kunmap_atomic_page(struct qxl_device *qdev,
void qxl_bo_unref(struct qxl_bo **bo) void qxl_bo_unref(struct qxl_bo **bo)
{ {
struct ttm_buffer_object *tbo;
if ((*bo) == NULL) if ((*bo) == NULL)
return; return;
tbo = &((*bo)->tbo);
ttm_bo_unref(&tbo); drm_gem_object_unreference_unlocked(&(*bo)->gem_base);
if (tbo == NULL)
*bo = NULL; *bo = NULL;
} }
struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo) struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo)
{ {
ttm_bo_reference(&bo->tbo); drm_gem_object_reference(&bo->gem_base);
return bo; return bo;
} }