diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-07-08 13:40:34 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-07-08 13:40:34 +1000 |
| commit | 06d5a24f08831e167fae42a64ef2083a89f8e617 (patch) | |
| tree | 509ef5096fcf1b32029b912afba9a2c1ce9067d9 /drivers/gpu/drm/qxl/qxl_object.h | |
| parent | d2989b534ef6834ebf2425aecc040b894b567c91 (diff) | |
| parent | 7c6ca3040e9ac174e6d2189811da603e9c19a150 (diff) | |
| download | talos-op-linux-06d5a24f08831e167fae42a64ef2083a89f8e617.tar.gz talos-op-linux-06d5a24f08831e167fae42a64ef2083a89f8e617.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-nouveau-next
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_object.h')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_object.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_object.h b/drivers/gpu/drm/qxl/qxl_object.h index b4fd89fbd8b7..ee7ad79ce781 100644 --- a/drivers/gpu/drm/qxl/qxl_object.h +++ b/drivers/gpu/drm/qxl/qxl_object.h @@ -57,11 +57,6 @@ static inline unsigned long qxl_bo_size(struct qxl_bo *bo) return bo->tbo.num_pages << PAGE_SHIFT; } -static inline bool qxl_bo_is_reserved(struct qxl_bo *bo) -{ - return !!atomic_read(&bo->tbo.reserved); -} - static inline u64 qxl_bo_mmap_offset(struct qxl_bo *bo) { return bo->tbo.addr_space_offset; |
