|
@@ -130,7 +130,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
|
|
p->rdev->family == CHIP_RS880)) {
|
|
p->rdev->family == CHIP_RS880)) {
|
|
|
|
|
|
/* TODO: is this still needed for NI+ ? */
|
|
/* TODO: is this still needed for NI+ ? */
|
|
- p->relocs[i].prefered_domains =
|
|
|
|
|
|
+ p->relocs[i].preferred_domains =
|
|
RADEON_GEM_DOMAIN_VRAM;
|
|
RADEON_GEM_DOMAIN_VRAM;
|
|
|
|
|
|
p->relocs[i].allowed_domains =
|
|
p->relocs[i].allowed_domains =
|
|
@@ -148,14 +148,14 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
- p->relocs[i].prefered_domains = domain;
|
|
|
|
|
|
+ p->relocs[i].preferred_domains = domain;
|
|
if (domain == RADEON_GEM_DOMAIN_VRAM)
|
|
if (domain == RADEON_GEM_DOMAIN_VRAM)
|
|
domain |= RADEON_GEM_DOMAIN_GTT;
|
|
domain |= RADEON_GEM_DOMAIN_GTT;
|
|
p->relocs[i].allowed_domains = domain;
|
|
p->relocs[i].allowed_domains = domain;
|
|
}
|
|
}
|
|
|
|
|
|
if (radeon_ttm_tt_has_userptr(p->relocs[i].robj->tbo.ttm)) {
|
|
if (radeon_ttm_tt_has_userptr(p->relocs[i].robj->tbo.ttm)) {
|
|
- uint32_t domain = p->relocs[i].prefered_domains;
|
|
|
|
|
|
+ uint32_t domain = p->relocs[i].preferred_domains;
|
|
if (!(domain & RADEON_GEM_DOMAIN_GTT)) {
|
|
if (!(domain & RADEON_GEM_DOMAIN_GTT)) {
|
|
DRM_ERROR("Only RADEON_GEM_DOMAIN_GTT is "
|
|
DRM_ERROR("Only RADEON_GEM_DOMAIN_GTT is "
|
|
"allowed for userptr BOs\n");
|
|
"allowed for userptr BOs\n");
|
|
@@ -163,7 +163,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
|
|
}
|
|
}
|
|
need_mmap_lock = true;
|
|
need_mmap_lock = true;
|
|
domain = RADEON_GEM_DOMAIN_GTT;
|
|
domain = RADEON_GEM_DOMAIN_GTT;
|
|
- p->relocs[i].prefered_domains = domain;
|
|
|
|
|
|
+ p->relocs[i].preferred_domains = domain;
|
|
p->relocs[i].allowed_domains = domain;
|
|
p->relocs[i].allowed_domains = domain;
|
|
}
|
|
}
|
|
|
|
|