diff options
author | Christian König <christian.koenig@amd.com> | 2016-10-05 10:49:19 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-10-25 14:38:54 -0400 |
commit | 45088efc8529de969de91dcefb6284f8d7837cd6 (patch) | |
tree | ecd60344e8f2ec0a456312e5bd7fbda2576f4667 /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |
parent | 5e876c62d85a93381140f5e37bfabfb9a5a3345d (diff) |
drm/amdgpu: improve parse_cs handling a bit
This way we can use parse_cs and still keep VM mode enabled.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-and-Tested by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index 2fb469aa850a..05a1ea998fd6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |||
@@ -642,6 +642,9 @@ int amdgpu_vce_ring_parse_cs(struct amdgpu_cs_parser *p, uint32_t ib_idx) | |||
642 | uint32_t *size = &tmp; | 642 | uint32_t *size = &tmp; |
643 | int i, r, idx = 0; | 643 | int i, r, idx = 0; |
644 | 644 | ||
645 | p->job->vm = NULL; | ||
646 | ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo); | ||
647 | |||
645 | r = amdgpu_cs_sysvm_access_required(p); | 648 | r = amdgpu_cs_sysvm_access_required(p); |
646 | if (r) | 649 | if (r) |
647 | return r; | 650 | return r; |