diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-27 10:35:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-27 10:35:15 +1000 |
| commit | 59fd7e4b0b0769638b5162e56c28bbb027a118d3 (patch) | |
| tree | ee1941e1d299a91c0b5d5819e3cafb10d125f2c0 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | c8b3fd0ce313443731e8fd6d5a541085eb465f99 (diff) | |
| parent | b5f1c97f944482e98e6e39208af356630389d1ea (diff) | |
| download | linux-rt-59fd7e4b0b0769638b5162e56c28bbb027a118d3.tar.gz | |
Merge tag 'drm-intel-next-fixes-2015-04-25' of git://anongit.freedesktop.org/drm-intel into drm-fixes
three fixes for i915.
* tag 'drm-intel-next-fixes-2015-04-25' of git://anongit.freedesktop.org/drm-intel:
drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
drm/i915: Workaround to avoid lite restore with HEAD==TAIL
drm/i915: cope with large i2c transfers
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d07c0b1fb498..53394f998a1f 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2377,10 +2377,11 @@ int __i915_add_request(struct intel_engine_cs *ring, ret = ring->add_request(ring); if (ret) return ret; + + request->tail = intel_ring_get_tail(ringbuf); } request->head = request_start; - request->tail = intel_ring_get_tail(ringbuf); /* Whilst this request exists, batch_obj will be on the * active_list, and so will hold the active reference. Only when this |