Commit 6e450ab2 authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter

drm/i915: Bail out early on gen6_signal if no semaphores

If we dont have semaphores enabled, we allocate 4
dwords for signalling. But end up emitting more regardless.

Fix this by bailing out early if semaphores are not enabled.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78274
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78283Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent df38e655
...@@ -684,6 +684,8 @@ static int gen6_signal(struct intel_ring_buffer *signaller, ...@@ -684,6 +684,8 @@ static int gen6_signal(struct intel_ring_buffer *signaller,
#define MBOX_UPDATE_DWORDS 4 #define MBOX_UPDATE_DWORDS 4
if (i915_semaphore_is_enabled(dev)) if (i915_semaphore_is_enabled(dev))
num_dwords += ((I915_NUM_RINGS-1) * MBOX_UPDATE_DWORDS); num_dwords += ((I915_NUM_RINGS-1) * MBOX_UPDATE_DWORDS);
else
return intel_ring_begin(signaller, num_dwords);
ret = intel_ring_begin(signaller, num_dwords); ret = intel_ring_begin(signaller, num_dwords);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment