diff options
author | Chunming Zhou <david1.zhou@amd.com> | 2018-09-11 05:22:40 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-09-12 17:28:41 -0400 |
commit | 7e7bf8de432db3de912050856e641458de72a7b1 (patch) | |
tree | ff0dd080920e0f20602b4f06c437e1c95707e1b9 | |
parent | 433ca054949a6c9daac0ace1be5c33b25092bffa (diff) |
drm/amdgpu: move cs dependencies front a bit
cs dependencies handling doesn't need in vm resv
Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index c5cc648a1b4e..1081fd00b059 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |||
@@ -1285,6 +1285,12 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) | |||
1285 | if (r) | 1285 | if (r) |
1286 | goto out; | 1286 | goto out; |
1287 | 1287 | ||
1288 | r = amdgpu_cs_dependencies(adev, &parser); | ||
1289 | if (r) { | ||
1290 | DRM_ERROR("Failed in the dependencies handling %d!\n", r); | ||
1291 | goto out; | ||
1292 | } | ||
1293 | |||
1288 | r = amdgpu_cs_parser_bos(&parser, data); | 1294 | r = amdgpu_cs_parser_bos(&parser, data); |
1289 | if (r) { | 1295 | if (r) { |
1290 | if (r == -ENOMEM) | 1296 | if (r == -ENOMEM) |
@@ -1296,12 +1302,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) | |||
1296 | 1302 | ||
1297 | reserved_buffers = true; | 1303 | reserved_buffers = true; |
1298 | 1304 | ||
1299 | r = amdgpu_cs_dependencies(adev, &parser); | ||
1300 | if (r) { | ||
1301 | DRM_ERROR("Failed in the dependencies handling %d!\n", r); | ||
1302 | goto out; | ||
1303 | } | ||
1304 | |||
1305 | for (i = 0; i < parser.job->num_ibs; i++) | 1305 | for (i = 0; i < parser.job->num_ibs; i++) |
1306 | trace_amdgpu_cs(&parser, i); | 1306 | trace_amdgpu_cs(&parser, i); |
1307 | 1307 | ||