diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2013-02-25 15:39:28 +1100 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-02-25 15:39:28 +1100 |
| commit | b52b99fbcaa7ff5c9ebc914dfc8f8fc7c973354c (patch) | |
| tree | bdd835dfede93bf21685eb0a3bbe1cff19272f0d /sys/dev/pci/drm/i915_drv.c | |
| parent | dc71ffe0069f3dcc0cd97a8097ecc58cf24e2983 (diff) | |
use the ring flush callbacks in the accel fb functions
Diffstat (limited to 'sys/dev/pci/drm/i915_drv.c')
| -rw-r--r-- | sys/dev/pci/drm/i915_drv.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c index 1865e495e93..8ec81de2b9e 100644 --- a/sys/dev/pci/drm/i915_drv.c +++ b/sys/dev/pci/drm/i915_drv.c @@ -806,14 +806,10 @@ inteldrm_copyrect(struct inteldrm_softc *dev_priv, int sx, int sy, intel_ring_emit(ring, base); intel_ring_advance(ring); - ret = intel_ring_begin(ring, 2); + ret = ring->flush(ring, 0, I915_GEM_GPU_DOMAINS); if (ret) return; - intel_ring_emit(ring, MI_FLUSH | MI_READ_FLUSH); - intel_ring_emit(ring, MI_NOOP); - intel_ring_advance(ring); - ret = i915_add_request(ring, NULL, &seqno); if (ret) return; @@ -861,14 +857,10 @@ inteldrm_fillrect(struct inteldrm_softc *dev_priv, int x, int y, intel_ring_emit(ring, color); intel_ring_advance(ring); - ret = intel_ring_begin(ring, 2); + ret = ring->flush(ring, 0, I915_GEM_GPU_DOMAINS); if (ret) return; - intel_ring_emit(ring, MI_FLUSH | MI_READ_FLUSH); - intel_ring_emit(ring, MI_NOOP); - intel_ring_advance(ring); - ret = i915_add_request(ring, NULL, &seqno); if (ret) return; |