lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/radeon/kms: check if vm is supported in VA ioctl

Browse Source 
Add a VM manager enabled field and use it to check if
vm is enabled.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: jglisse@redhat.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Alex Deucher
2012-01-06 09:38:15 -05:00
committed by Dave Airlie
parent cc1f719429
commit 67e915e49a
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/radeon/radeon.h
View File

@@ -668,6 +668,8 @@ struct radeon_vm_manager {
unsigned nvm; unsigned nvm;
/* vram base address for page table entry */ /* vram base address for page table entry */
u64 vram_base_offset; u64 vram_base_offset;
/* is vm enabled? */
bool enabled;
}; };
/* /*

4
drivers/gpu/drm/radeon/radeon_cs.c
View File

@@ -234,8 +234,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)
} }
if ((p->cs_flags & RADEON_CS_USE_VM) && if ((p->cs_flags & RADEON_CS_USE_VM) &&
(p->rdev->family < CHIP_CAYMAN)) { !p->rdev->vm_manager.enabled) {
DRM_ERROR("VM not supported on asic!\n"); DRM_ERROR("VM not active on asic!\n");
if (p->chunk_relocs_idx != -1) if (p->chunk_relocs_idx != -1)
kfree(p->chunks[p->chunk_relocs_idx].kdata); kfree(p->chunks[p->chunk_relocs_idx].kdata);
if (p->chunk_flags_idx != -1) if (p->chunk_flags_idx != -1)

10
drivers/gpu/drm/radeon/radeon_gart.c
View File

@@ -286,6 +286,8 @@ int radeon_vm_manager_init(struct radeon_device *rdev)
{ {
int r; int r;
rdev->vm_manager.enabled = false;
/* mark first vm as always in use, it's the system one */ /* mark first vm as always in use, it's the system one */
r = radeon_sa_bo_manager_init(rdev, &rdev->vm_manager.sa_manager, r = radeon_sa_bo_manager_init(rdev, &rdev->vm_manager.sa_manager,
rdev->vm_manager.max_pfn * 8, rdev->vm_manager.max_pfn * 8,
@@ -295,7 +297,12 @@ int radeon_vm_manager_init(struct radeon_device *rdev)
(rdev->vm_manager.max_pfn * 8) >> 10); (rdev->vm_manager.max_pfn * 8) >> 10);
return r; return r;
} }
return rdev->vm_manager.funcs->init(rdev);
r = rdev->vm_manager.funcs->init(rdev);
if (r == 0)
rdev->vm_manager.enabled = true;
return r;
} }
/* cs mutex must be lock */ /* cs mutex must be lock */
@@ -334,6 +341,7 @@ void radeon_vm_manager_fini(struct radeon_device *rdev)
radeon_vm_manager_suspend(rdev); radeon_vm_manager_suspend(rdev);
rdev->vm_manager.funcs->fini(rdev); rdev->vm_manager.funcs->fini(rdev);
radeon_sa_bo_manager_fini(rdev, &rdev->vm_manager.sa_manager); radeon_sa_bo_manager_fini(rdev, &rdev->vm_manager.sa_manager);
rdev->vm_manager.enabled = false;
} }
int radeon_vm_manager_start(struct radeon_device *rdev) int radeon_vm_manager_start(struct radeon_device *rdev)

5
drivers/gpu/drm/radeon/radeon_gem.c
View File

@@ -404,6 +404,11 @@ int radeon_gem_va_ioctl(struct drm_device *dev, void *data,
u32 invalid_flags; u32 invalid_flags;
int r = 0; int r = 0;
if (!rdev->vm_manager.enabled) {
args->operation = RADEON_VA_RESULT_ERROR;
return -ENOTTY;
}
/* !! DONT REMOVE !! /* !! DONT REMOVE !!
* We don't support vm_id yet, to be sure we don't have have broken * We don't support vm_id yet, to be sure we don't have have broken
* userspace, reject anyone trying to use non 0 value thus moving * userspace, reject anyone trying to use non 0 value thus moving