Rev 5354 | Rev 6084 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5354 | Rev 5367 | ||
|---|---|---|---|
| Line 1380... | Line 1380... | ||
| 1380 | if (i915_needs_cmd_parser(ring)) { |
1380 | if (i915_needs_cmd_parser(ring)) { |
| 1381 | ret = i915_parse_cmds(ring, |
1381 | ret = i915_parse_cmds(ring, |
| 1382 | batch_obj, |
1382 | batch_obj, |
| 1383 | args->batch_start_offset, |
1383 | args->batch_start_offset, |
| 1384 | file->is_master); |
1384 | file->is_master); |
| 1385 | if (ret) |
1385 | if (ret) { |
| - | 1386 | if (ret != -EACCES) |
|
| 1386 | goto err; |
1387 | goto err; |
| 1387 | 1388 | } else { |
|
| 1388 | /* |
1389 | /* |
| 1389 | * XXX: Actually do this when enabling batch copy... |
1390 | * XXX: Actually do this when enabling batch copy... |
| 1390 | * |
1391 | * |
| 1391 | * Set the DISPATCH_SECURE bit to remove the NON_SECURE bit |
1392 | * Set the DISPATCH_SECURE bit to remove the NON_SECURE bit |
| 1392 | * from MI_BATCH_BUFFER_START commands issued in the |
1393 | * from MI_BATCH_BUFFER_START commands issued in the |
| 1393 | * dispatch_execbuffer implementations. We specifically don't |
1394 | * dispatch_execbuffer implementations. We specifically don't |
| 1394 | * want that set when the command parser is enabled. |
1395 | * want that set when the command parser is enabled. |
| 1395 | */ |
1396 | */ |
| 1396 | } |
1397 | } |
| - | 1398 | } |
|
| - | 1399 | ||
| 1397 | #endif |
1400 | #endif |
| 1398 | /* snb/ivb/vlv conflate the "batch in ppgtt" bit with the "non-secure |
1401 | /* snb/ivb/vlv conflate the "batch in ppgtt" bit with the "non-secure |
| 1399 | * batch" bit. Hence we need to pin secure batches into the global gtt. |
1402 | * batch" bit. Hence we need to pin secure batches into the global gtt. |
| 1400 | * hsw should have this fixed, but bdw mucks it up again. */ |
1403 | * hsw should have this fixed, but bdw mucks it up again. */ |
| 1401 | if (flags & I915_DISPATCH_SECURE) { |
1404 | if (flags & I915_DISPATCH_SECURE) { |