projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pfdo/drm-rcar-for-v3.12' into drm-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
qxl
/
qxl_object.h
diff --git
a/drivers/gpu/drm/qxl/qxl_object.h
b/drivers/gpu/drm/qxl/qxl_object.h
index 8cb6167038e544625ec666a6fef7b4308d8e832d..d458a140c02407c01858f2d7b8a212e80417db3a 100644
(file)
--- a/
drivers/gpu/drm/qxl/qxl_object.h
+++ b/
drivers/gpu/drm/qxl/qxl_object.h
@@
-59,7
+59,7
@@
static inline unsigned long qxl_bo_size(struct qxl_bo *bo)
static inline u64 qxl_bo_mmap_offset(struct qxl_bo *bo)
{
static inline u64 qxl_bo_mmap_offset(struct qxl_bo *bo)
{
- return
bo->tbo.addr_space_offset
;
+ return
drm_vma_node_offset_addr(&bo->tbo.vma_node)
;
}
static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type,
}
static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type,