hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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=78283
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Mika Kuoppala 2014-05-15 20:58:07 +03:00 committed by Daniel Vetter
parent df38e6558d
commit 6e450ab24d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/intel_ringbuffer.c
View File

@ -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)