Commit 266424b5 authored by Frediano Ziglio's avatar Frediano Ziglio Committed by Dave Airlie

drm/qxl: avoid dependency lock

qxl_bo_unref calls drm_gem_object_unreference_unlocked which
locks dev->struct_mutex. However this lock could be already
locked if the call came from qxl_gem_object_free.
As we don't need to call qxl_bo_ref/qxl_bo_unref cause
qxl_release_list_add will hold a reference by itself avoid
to call them and the possible deadlock.
Signed-off-by: default avatarFrediano Ziglio <fziglio@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7eb9974f
...@@ -307,7 +307,7 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev, ...@@ -307,7 +307,7 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev,
idr_ret = qxl_release_alloc(qdev, QXL_RELEASE_SURFACE_CMD, release); idr_ret = qxl_release_alloc(qdev, QXL_RELEASE_SURFACE_CMD, release);
if (idr_ret < 0) if (idr_ret < 0)
return idr_ret; return idr_ret;
bo = qxl_bo_ref(to_qxl_bo(entry->tv.bo)); bo = to_qxl_bo(entry->tv.bo);
(*release)->release_offset = create_rel->release_offset + 64; (*release)->release_offset = create_rel->release_offset + 64;
...@@ -316,8 +316,6 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev, ...@@ -316,8 +316,6 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev,
info = qxl_release_map(qdev, *release); info = qxl_release_map(qdev, *release);
info->id = idr_ret; info->id = idr_ret;
qxl_release_unmap(qdev, *release, info); qxl_release_unmap(qdev, *release, info);
qxl_bo_unref(&bo);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment