diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-02-23 12:07:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-23 12:07:27 +1000 |
| commit | 63871f89d158e3f3e469dde00dd15763d474cb3c (patch) | |
| tree | 0872202dbe52d6a8160215487ae0386c8e475a44 /drivers/gpu/drm/radeon/radeon_ttm.c | |
| parent | de1e7cd63a8ec26a3bd3740708cfd72dd76509e2 (diff) | |
| parent | 4546b2c1d6e256c716e5240f5d6198a078fd7a22 (diff) | |
Merge branch 'drm-mm-cleanup' into drm-next
* drm-mm-cleanup:
radeon: move blit functions to radeon_asic.h
radeon: kill decls for inline functions
radeon: consolidate asic-specific function decls for r600 & later
drm/radeon: kill radeon_bo->gobj pointer
drm/radeon: introduce gem_to_radeon_bo helper
drm/radeon: embed struct drm_gem_object
drm: mm: add helper to unwind scan state
drm: mm: add api for embedding struct drm_mm_node
drm: mm: extract node insert helper functions
drm: mm: track free areas implicitly
drm/nouveau: don't munge in drm_mm internals
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index c345e899e881..177adc884b74 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -530,7 +530,7 @@ int radeon_ttm_init(struct radeon_device *rdev) DRM_ERROR("Failed initializing VRAM heap.\n"); return r; } - r = radeon_bo_create(rdev, NULL, 256 * 1024, PAGE_SIZE, true, + r = radeon_bo_create(rdev, 256 * 1024, PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM, &rdev->stollen_vga_memory); if (r) { |