mirror of https://gitee.com/openkylin/linux.git
drm/qxl: remove unused object_pin/unpin() helpers
These two helpers are unused. Remove them. They rely on gem_obj->driver_private, which is set to NULL during setup. As this field isn't used by the driver, anymore, we can remove this assignment as well. Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
23a9a2e075
commit
f547b22aaf
|
@ -405,9 +405,6 @@ int qxl_gem_object_create(struct qxl_device *qdev, int size,
|
|||
bool discardable, bool kernel,
|
||||
struct qxl_surface *surf,
|
||||
struct drm_gem_object **obj);
|
||||
int qxl_gem_object_pin(struct drm_gem_object *obj, uint32_t pin_domain,
|
||||
uint64_t *gpu_addr);
|
||||
void qxl_gem_object_unpin(struct drm_gem_object *obj);
|
||||
int qxl_gem_object_create_with_handle(struct qxl_device *qdev,
|
||||
struct drm_file *file_priv,
|
||||
u32 domain,
|
||||
|
|
|
@ -101,32 +101,6 @@ int qxl_gem_object_create_with_handle(struct qxl_device *qdev,
|
|||
return 0;
|
||||
}
|
||||
|
||||
int qxl_gem_object_pin(struct drm_gem_object *obj, uint32_t pin_domain,
|
||||
uint64_t *gpu_addr)
|
||||
{
|
||||
struct qxl_bo *qobj = obj->driver_private;
|
||||
int r;
|
||||
|
||||
r = qxl_bo_reserve(qobj, false);
|
||||
if (unlikely(r != 0))
|
||||
return r;
|
||||
r = qxl_bo_pin(qobj, pin_domain, gpu_addr);
|
||||
qxl_bo_unreserve(qobj);
|
||||
return r;
|
||||
}
|
||||
|
||||
void qxl_gem_object_unpin(struct drm_gem_object *obj)
|
||||
{
|
||||
struct qxl_bo *qobj = obj->driver_private;
|
||||
int r;
|
||||
|
||||
r = qxl_bo_reserve(qobj, false);
|
||||
if (likely(r == 0)) {
|
||||
qxl_bo_unpin(qobj);
|
||||
qxl_bo_unreserve(qobj);
|
||||
}
|
||||
}
|
||||
|
||||
int qxl_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv)
|
||||
{
|
||||
return 0;
|
||||
|
|
|
@ -98,7 +98,6 @@ int qxl_bo_create(struct qxl_device *qdev,
|
|||
kfree(bo);
|
||||
return r;
|
||||
}
|
||||
bo->gem_base.driver_private = NULL;
|
||||
bo->type = domain;
|
||||
bo->pin_count = pinned ? 1 : 0;
|
||||
bo->surface_id = 0;
|
||||
|
|
Loading…
Reference in New Issue