diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-02-12 00:18:00 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-02-15 02:19:14 +0100 |
| commit | e22238ea37a870f70e34668a4992bde0c92bba8d (patch) | |
| tree | 71036caef29c04901df02f79a8c241503f3a9920 /drivers/gpu | |
| parent | drm: Fix a bug in the range manager. (diff) | |
| download | linux-e22238ea37a870f70e34668a4992bde0c92bba8d.tar.xz linux-e22238ea37a870f70e34668a4992bde0c92bba8d.zip | |
drm/ttm: Fix a bug occuring when validating a buffer object in a range.
If the buffer object was already in the requested memory type, but
outside of the requested range it was never moved into the requested range.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 1a3e909b7bba..c7320ce4567d 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1020,6 +1020,12 @@ static int ttm_bo_mem_compat(struct ttm_placement *placement, struct ttm_mem_reg *mem) { int i; + struct drm_mm_node *node = mem->mm_node; + + if (node && placement->lpfn != 0 && + (node->start < placement->fpfn || + node->start + node->size > placement->lpfn)) + return -1; for (i = 0; i < placement->num_placement; i++) { if ((placement->placement[i] & mem->placement & |