git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon.h
diff --git
a/drivers/gpu/drm/radeon/radeon.h
b/drivers/gpu/drm/radeon/radeon.h
index e25836b72c73b33e41b656ba469074d2f3570ecf..85dac33e3cce3c0eeca90ae3d57d066b4c771a24 100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon.h
+++ b/
drivers/gpu/drm/radeon/radeon.h
@@
-346,6
+346,9
@@
struct radeon_bo {
/* Constant after initialization */
struct radeon_device *rdev;
struct drm_gem_object gem_base;
+
+ struct ttm_bo_kmap_obj dma_buf_vmap;
+ int vmapping_count;
};
#define gem_to_radeon_bo(gobj) container_of((gobj), struct radeon_bo, gem_base)