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

drm/qxl: switch driver from bo->resv to bo->base.resv

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Christian König <christian.koenig@amd.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190805140119.7337-16-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-08-05 16:01:17 +02:00
parent 27c44acebd
commit 5c69f132a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/qxl/qxl_debugfs.c
View File

@ -61,7 +61,7 @@ qxl_debugfs_buffers_info(struct seq_file *m, void *data)
int rel; int rel;
rcu_read_lock(); rcu_read_lock();
fobj = rcu_dereference(bo->tbo.resv->fence); fobj = rcu_dereference(bo->tbo.base.resv->fence);
rel = fobj ? fobj->shared_count : 0; rel = fobj ? fobj->shared_count : 0;
rcu_read_unlock(); rcu_read_unlock();

6
drivers/gpu/drm/qxl/qxl_release.c
View File

@ -238,7 +238,7 @@ static int qxl_release_validate_bo(struct qxl_bo *bo)
return ret; return ret;
} }
ret = reservation_object_reserve_shared(bo->tbo.resv, 1); ret = reservation_object_reserve_shared(bo->tbo.base.resv, 1);
if (ret) if (ret)
return ret; return ret;
@ -458,9 +458,9 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release)
list_for_each_entry(entry, &release->bos, head) { list_for_each_entry(entry, &release->bos, head) {
bo = entry->bo; bo = entry->bo;
reservation_object_add_shared_fence(bo->resv, &release->base); reservation_object_add_shared_fence(bo->base.resv, &release->base);
ttm_bo_add_to_lru(bo); ttm_bo_add_to_lru(bo);
reservation_object_unlock(bo->resv); reservation_object_unlock(bo->base.resv);
} }
spin_unlock(&glob->lru_lock); spin_unlock(&glob->lru_lock);
ww_acquire_fini(&release->ticket); ww_acquire_fini(&release->ticket);