summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
diff options
context:
space:
mode:
authorChristian König2016-10-05 16:49:19 +0200
committerAlex Deucher2016-10-25 20:38:54 +0200
commit45088efc8529de969de91dcefb6284f8d7837cd6 (patch)
treeecd60344e8f2ec0a456312e5bd7fbda2576f4667 /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
parentdrm/amdgpu: refine set power state logic for dpm. (diff)
downloadkernel-qcow2-linux-45088efc8529de969de91dcefb6284f8d7837cd6.tar.gz
kernel-qcow2-linux-45088efc8529de969de91dcefb6284f8d7837cd6.tar.xz
kernel-qcow2-linux-45088efc8529de969de91dcefb6284f8d7837cd6.zip
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.c3
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)
uint32_t *size = &tmp;
int i, r, idx = 0;
+ p->job->vm = NULL;
+ ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo);
+
r = amdgpu_cs_sysvm_access_required(p);
if (r)
return r;