diff options
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 6a978ce80244..48b612d80784 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c | |||
| @@ -841,11 +841,11 @@ static int logical_ring_prepare(struct drm_i915_gem_request *req, int bytes) | |||
| 841 | if (unlikely(total_bytes > remain_usable)) { | 841 | if (unlikely(total_bytes > remain_usable)) { |
| 842 | /* | 842 | /* |
| 843 | * The base request will fit but the reserved space | 843 | * The base request will fit but the reserved space |
| 844 | * falls off the end. So only need to to wait for the | 844 | * falls off the end. So don't need an immediate wrap |
| 845 | * reserved size after flushing out the remainder. | 845 | * and only need to effectively wait for the reserved |
| 846 | * size space from the start of ringbuffer. | ||
| 846 | */ | 847 | */ |
| 847 | wait_bytes = remain_actual + ringbuf->reserved_size; | 848 | wait_bytes = remain_actual + ringbuf->reserved_size; |
| 848 | need_wrap = true; | ||
| 849 | } else if (total_bytes > ringbuf->space) { | 849 | } else if (total_bytes > ringbuf->space) { |
| 850 | /* No wrapping required, just waiting. */ | 850 | /* No wrapping required, just waiting. */ |
| 851 | wait_bytes = total_bytes; | 851 | wait_bytes = total_bytes; |
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 45ce45a5e122..c2ea2cd80d70 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
| @@ -2454,11 +2454,11 @@ static int __intel_ring_prepare(struct intel_engine_cs *ring, int bytes) | |||
| 2454 | if (unlikely(total_bytes > remain_usable)) { | 2454 | if (unlikely(total_bytes > remain_usable)) { |
| 2455 | /* | 2455 | /* |
| 2456 | * The base request will fit but the reserved space | 2456 | * The base request will fit but the reserved space |
| 2457 | * falls off the end. So only need to to wait for the | 2457 | * falls off the end. So don't need an immediate wrap |
| 2458 | * reserved size after flushing out the remainder. | 2458 | * and only need to effectively wait for the reserved |
| 2459 | * size space from the start of ringbuffer. | ||
| 2459 | */ | 2460 | */ |
| 2460 | wait_bytes = remain_actual + ringbuf->reserved_size; | 2461 | wait_bytes = remain_actual + ringbuf->reserved_size; |
| 2461 | need_wrap = true; | ||
| 2462 | } else if (total_bytes > ringbuf->space) { | 2462 | } else if (total_bytes > ringbuf->space) { |
| 2463 | /* No wrapping required, just waiting. */ | 2463 | /* No wrapping required, just waiting. */ |
| 2464 | wait_bytes = total_bytes; | 2464 | wait_bytes = total_bytes; |