diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-02-08 16:21:38 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-02-08 16:21:38 +0100 |
| commit | e4b2da440699f581a8779ea8cb9e99e4c903e6a7 (patch) | |
| tree | 63058ea9439e2f880628a3fd44e5f586eda86ed6 /linux-core/drm_bo.c | |
| parent | 1257907fa9a24de7aa95485e1b3ab509fdc4d4e6 (diff) | |
A minor function interface change and some memcpy bugfixing.
Hooray!! it sort of works with a fixed AGP area as faked VRAM.
Diffstat (limited to 'linux-core/drm_bo.c')
| -rw-r--r-- | linux-core/drm_bo.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c index 845db3fe..728afb41 100644 --- a/linux-core/drm_bo.c +++ b/linux-core/drm_bo.c @@ -124,7 +124,6 @@ static int drm_bo_add_ttm(drm_buffer_object_t * bo) { drm_device_t *dev = bo->dev; int ret = 0; - bo->ttm = NULL; switch (bo->type) { @@ -174,14 +173,11 @@ static int drm_bo_handle_move_mem(drm_buffer_object_t *bo, if (!(old_man->flags & _DRM_FLAG_MEMTYPE_FIXED) && !(new_man->flags & _DRM_FLAG_MEMTYPE_FIXED)) { - ret = drm_bo_move_ttm(dev, bo->ttm, evict, no_wait, - &bo->mem, mem); + ret = drm_bo_move_ttm(bo, evict, no_wait, mem); } else if (dev->driver->bo_driver->move) { - ret = dev->driver->bo_driver->move(dev, bo->ttm, evict, - no_wait, &bo->mem, mem); + ret = dev->driver->bo_driver->move(bo, evict, no_wait, mem); } else { - ret = drm_bo_move_memcpy(dev, bo->ttm, evict, no_wait, - &bo->mem, mem); + ret = drm_bo_move_memcpy(bo, evict, no_wait, mem); } if (old_is_pci || new_is_pci) |