| Message ID | 20200923030454.362731-3-airlied@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ttm driver cleanups and invert move | expand |
Am 23.09.20 um 05:04 schrieb Dave Airlie: > From: Dave Airlie <airlied@redhat.com> > > This wasn't used anywheere > > Signed-off-by: Dave Airlie <airlied@redhat.com> Acked-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/qxl/qxl_object.h | 23 ----------------------- > 1 file changed, 23 deletions(-) > > diff --git a/drivers/gpu/drm/qxl/qxl_object.h b/drivers/gpu/drm/qxl/qxl_object.h > index c7d79b20622e..09a5c818324d 100644 > --- a/drivers/gpu/drm/qxl/qxl_object.h > +++ b/drivers/gpu/drm/qxl/qxl_object.h > @@ -58,29 +58,6 @@ static inline u64 qxl_bo_mmap_offset(struct qxl_bo *bo) > return drm_vma_node_offset_addr(&bo->tbo.base.vma_node); > } > > -static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type, > - bool no_wait) > -{ > - int r; > - > - r = ttm_bo_reserve(&bo->tbo, true, no_wait, NULL); > - if (unlikely(r != 0)) { > - if (r != -ERESTARTSYS) { > - struct drm_device *ddev = bo->tbo.base.dev; > - > - dev_err(ddev->dev, "%p reserve failed for wait\n", > - bo); > - } > - return r; > - } > - if (mem_type) > - *mem_type = bo->tbo.mem.mem_type; > - > - r = ttm_bo_wait(&bo->tbo, true, no_wait); > - ttm_bo_unreserve(&bo->tbo); > - return r; > -} > - > extern int qxl_bo_create(struct qxl_device *qdev, > unsigned long size, > bool kernel, bool pinned, u32 domain,
diff --git a/drivers/gpu/drm/qxl/qxl_object.h b/drivers/gpu/drm/qxl/qxl_object.h index c7d79b20622e..09a5c818324d 100644 --- a/drivers/gpu/drm/qxl/qxl_object.h +++ b/drivers/gpu/drm/qxl/qxl_object.h @@ -58,29 +58,6 @@ static inline u64 qxl_bo_mmap_offset(struct qxl_bo *bo) return drm_vma_node_offset_addr(&bo->tbo.base.vma_node); } -static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type, - bool no_wait) -{ - int r; - - r = ttm_bo_reserve(&bo->tbo, true, no_wait, NULL); - if (unlikely(r != 0)) { - if (r != -ERESTARTSYS) { - struct drm_device *ddev = bo->tbo.base.dev; - - dev_err(ddev->dev, "%p reserve failed for wait\n", - bo); - } - return r; - } - if (mem_type) - *mem_type = bo->tbo.mem.mem_type; - - r = ttm_bo_wait(&bo->tbo, true, no_wait); - ttm_bo_unreserve(&bo->tbo); - return r; -} - extern int qxl_bo_create(struct qxl_device *qdev, unsigned long size, bool kernel, bool pinned, u32 domain,