diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-09-28 22:47:11 +0200 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-10-12 04:10:04 +0200 |
| commit | 1b9187c43a0c17600611edb9e299141748e87974 (patch) | |
| tree | a58dc9fb7c988e8451f639ae07c3dbeb8e9dbcf6 /nouveau/nouveau_bo.c | |
| parent | 96214860bb0a5e11e7d346351a1be248e3716144 (diff) | |
nouveau: Define buffer object usage flags.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Acked-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nouveau/nouveau_bo.c')
| -rw-r--r-- | nouveau/nouveau_bo.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nouveau/nouveau_bo.c b/nouveau/nouveau_bo.c index 32b23b65..c1432b0b 100644 --- a/nouveau/nouveau_bo.c +++ b/nouveau/nouveau_bo.c @@ -52,7 +52,8 @@ nouveau_bo_info(struct nouveau_bo_priv *nvbo, struct drm_nouveau_gem_info *arg) nvbo->offset = arg->offset; nvbo->map_handle = arg->map_handle; nvbo->base.tile_mode = arg->tile_mode; - nvbo->base.tile_flags = arg->tile_flags; + /* XXX - flag inverted for backwards compatibility */ + nvbo->base.tile_flags = arg->tile_flags ^ NOUVEAU_GEM_TILE_NONCONTIG; return 0; } @@ -140,6 +141,10 @@ nouveau_bo_kalloc(struct nouveau_bo_priv *nvbo, struct nouveau_channel *chan) info->tile_mode = nvbo->base.tile_mode; info->tile_flags = nvbo->base.tile_flags; + /* XXX - flag inverted for backwards compatibility */ + info->tile_flags ^= NOUVEAU_GEM_TILE_NONCONTIG; + if (!nvdev->has_bo_usage) + info->tile_flags &= NOUVEAU_GEM_TILE_LAYOUT_MASK; ret = drmCommandWriteRead(nvdev->fd, DRM_NOUVEAU_GEM_NEW, &req, sizeof(req)); |