diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-02-18 11:59:16 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-02-22 19:33:03 -0500 |
commit | 441921d5309cfe098747d9840fd71bdc6ca2a93b (patch) | |
tree | 38abd54dd4869b9b2872c4d6993fdd8bf791ee9c /drivers/gpu/drm/radeon/radeon_object.h | |
parent | ae0cec2880a4dc6d90c7f8392bdc6705988389ca (diff) |
drm/radeon: embed struct drm_gem_object
Unconditionally initialize the drm gem object - it's not
worth the trouble not to for the few kernel objects.
This patch only changes the place of the drm gem object,
access is still done via pointers.
v2: Uncoditionally align the size in radeon_bo_create. At
least the r600/evergreen blit code didn't to this, angering
the paranoid gem code.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_object.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h index 22d4c237dea..7f8e778dba4 100644 --- a/drivers/gpu/drm/radeon/radeon_object.h +++ b/drivers/gpu/drm/radeon/radeon_object.h | |||
@@ -137,10 +137,9 @@ static inline int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, | |||
137 | } | 137 | } |
138 | 138 | ||
139 | extern int radeon_bo_create(struct radeon_device *rdev, | 139 | extern int radeon_bo_create(struct radeon_device *rdev, |
140 | struct drm_gem_object *gobj, unsigned long size, | 140 | unsigned long size, int byte_align, |
141 | int byte_align, | 141 | bool kernel, u32 domain, |
142 | bool kernel, u32 domain, | 142 | struct radeon_bo **bo_ptr); |
143 | struct radeon_bo **bo_ptr); | ||
144 | extern int radeon_bo_kmap(struct radeon_bo *bo, void **ptr); | 143 | extern int radeon_bo_kmap(struct radeon_bo *bo, void **ptr); |
145 | extern void radeon_bo_kunmap(struct radeon_bo *bo); | 144 | extern void radeon_bo_kunmap(struct radeon_bo *bo); |
146 | extern void radeon_bo_unref(struct radeon_bo **bo); | 145 | extern void radeon_bo_unref(struct radeon_bo **bo); |