Add_request has always contained both the semaphore mailbox updates as well as the breadcrumb writes. Since the semaphore signal is the one which actually knows about the number of dwords it needs to emit to the ring, we move the ring_begin to that function. This allows us to remove the hideously shared #define On a related not, gen8 will use a different number of dwords for semaphores, but not for add request. v2: Make number of dwords an explicit part of signalling (via function argument). (Chris) v3: very slight comment change
Unified · Split
| @@ -663,18 +663,28 @@ static void render_ring_cleanup(struct intel_ring_buffer *ring) · 662 unmodified lines | ||
| 663 | 663 | ring->scratch.obj = NULL; |
| 664 | 664 | } |
| 665 | 665 | |
| 666 | −static void gen6_signal(struct intel_ring_buffer *signaller) | |
| 666 | +static int gen6_signal(struct intel_ring_buffer *signaller, | |
| 667 | + unsigned int num_dwords) | |
| 667 | 668 | { |
| 668 | − struct drm_i915_private *dev_priv = signaller->dev->dev_private; | |
| 669 | + struct drm_device *dev = signaller->dev; | |
| 670 | + struct drm_i915_private *dev_priv = dev->dev_private; | |
| 669 | 671 | struct intel_ring_buffer *useless; |
| 670 | − int i; | |
| 672 | + int i, ret; | |
| 671 | 673 | |
| 672 | −/* NB: In order to be able to do semaphore MBOX updates for varying number | |
| 673 | − * of rings, it's easiest if we round up each individual update to a | |
| 674 | − * multiple of 2 (since ring updates must always be a multiple of 2) | |
| 675 | − * even though the actual update only requires 3 dwords. | |
| 676 | − */ | |
| 674 | + /* NB: In order to be able to do semaphore MBOX updates for varying | |
| 675 | + * number of rings, it's easiest if we round up each individual update | |
| 676 | + * to a multiple of 2 (since ring updates must always be a multiple of | |
| 677 | + * 2) even though the actual update only requires 3 dwords. | |
| 678 | + */ | |
| 677 | 679 | #define MBOX_UPDATE_DWORDS 4 |
| 680 | + if (i915_semaphore_is_enabled(dev)) | |
| 681 | + num_dwords += ((I915_NUM_RINGS-1) * MBOX_UPDATE_DWORDS); | |
| 682 | + | |
| 683 | + ret = intel_ring_begin(signaller, num_dwords); | |
| 684 | + if (ret) | |
| 685 | + return ret; | |
| 686 | +#undef MBOX_UPDATE_DWORDS | |
| 687 | + | |
| 678 | 688 | for_each_ring(useless, dev_priv, i) { |
| 679 | 689 | u32 mbox_reg = signaller->semaphore.mbox.signal[i]; |
| 680 | 690 | if (mbox_reg != GEN6_NOSYNC) { |
| @@ -689,6 +699,8 @@ static void gen6_signal(struct intel_ring_buffer *signaller) · 8 unmodified lines | ||
| 689 | 699 | intel_ring_emit(signaller, MI_NOOP); |
| 690 | 700 | } |
| 691 | 701 | } |
| 702 | + | |
| 703 | + return 0; | |
| 692 | 704 | } |
| 693 | 705 | |
| 694 | 706 | /** |
| @@ -703,19 +715,12 @@ static void gen6_signal(struct intel_ring_buffer *signaller) · 8 unmodified lines | ||
| 703 | 715 | static int |
| 704 | 716 | gen6_add_request(struct intel_ring_buffer *ring) |
| 705 | 717 | { |
| 706 | − struct drm_device *dev = ring->dev; | |
| 707 | − int ret, num_dwords = 4; | |
| 708 | − | |
| 709 | − if (i915_semaphore_is_enabled(dev)) | |
| 710 | − num_dwords += ((I915_NUM_RINGS-1) * MBOX_UPDATE_DWORDS); | |
| 711 | −#undef MBOX_UPDATE_DWORDS | |
| 718 | + int ret; | |
| 712 | 719 | |
| 713 | − ret = intel_ring_begin(ring, num_dwords); | |
| 720 | + ret = ring->semaphore.signal(ring, 4); | |
| 714 | 721 | if (ret) |
| 715 | 722 | return ret; |
| 716 | 723 | |
| 717 | − ring->semaphore.signal(ring); | |
| 718 | − | |
| 719 | 724 | intel_ring_emit(ring, MI_STORE_DWORD_INDEX); |
| 720 | 725 | intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT); |
| 721 | 726 | intel_ring_emit(ring, ring->outstanding_lazy_seqno); |
| @@ -132,7 +132,9 @@ struct intel_ring_buffer { · 131 unmodified lines | ||
| 132 | 132 | int (*sync_to)(struct intel_ring_buffer *ring, |
| 133 | 133 | struct intel_ring_buffer *to, |
| 134 | 134 | u32 seqno); |
| 135 | − void (*signal)(struct intel_ring_buffer *signaller); | |
| 135 | + int (*signal)(struct intel_ring_buffer *signaller, | |
| 136 | + /* num_dwords needed by caller */ | |
| 137 | + unsigned int num_dwords); | |
| 136 | 138 | } semaphore; |
| 137 | 139 | |
| 138 | 140 | /** |