FAILED: patch "[PATCH] drm/i915: Fix gen8 semaphores id for legacy mode" failed to apply to 4.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
83e538020018e3235f5ec40a1f2dfc673bb5ae3cMon Sep 17 00:00:00 2001
From: Chris Wilson <[email protected]>
Date: Fri, 29 Apr 2016 13:18:23 +0100
Subject: [PATCH] drm/i915: Fix gen8 semaphores id for legacy mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
With the introduction of a distinct engine->id vs the hardware id, we need to fix up the value we use for selecting the target engine when signaling a semaphore. Note that these values can be merged with engine->guc_id.
drivers/gpu/drm/i915/intel_ringbuffer.c +7 -2
@@ -1309,7 +1309,7 @@ static int gen8_rcs_signal(struct drm_i915_gem_request *signaller_req,intel_ring_emit (signaller, seqno);intel_ring_emit (signaller,0 );intel_ring_emit (signaller,MI_SEMAPHORE_SIGNAL | -MI_SEMAPHORE_TARGET (waiter->id)); +MI_SEMAPHORE_TARGET (waiter->hw_id));intel_ring_emit (signaller,0 ); }
@@ -1349,7 +1349,7 @@ static int gen8_xcs_signal(struct drm_i915_gem_request *signaller_req,intel_ring_emit (signaller,upper_32_bits (gtt_offset));intel_ring_emit (signaller, seqno);intel_ring_emit (signaller,MI_SEMAPHORE_SIGNAL | -MI_SEMAPHORE_TARGET (waiter->id)); +MI_SEMAPHORE_TARGET (waiter->hw_id));intel_ring_emit (signaller,0 ); }
@@ -2778,6 +2778,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) engine->name ="render ring" ; engine->id =RCS ; engine->exec_id =I915_EXEC_RENDER ; + engine->hw_id =0 ; engine->mmio_base =RENDER_RING_BASE ;if (INTEL_INFO (dev)->gen >=8 ) {
@@ -2929,6 +2930,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) engine->name ="bsd ring" ; engine->id =VCS ; engine->exec_id =I915_EXEC_BSD ; + engine->hw_id =1 ; engine->write_tail = ring_write_tail;if (INTEL_INFO (dev)->gen >=6 ) {
@@ -3007,6 +3009,7 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev) engine->name ="bsd2 ring" ; engine->id =VCS2 ; engine->exec_id =I915_EXEC_BSD ; + engine->hw_id =4 ; engine->write_tail = ring_write_tail; engine->mmio_base =GEN8_BSD2_RING_BASE ;
@@ -3039,6 +3042,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) engine->name ="blitter ring" ; engine->id =BCS ; engine->exec_id =I915_EXEC_BLT ; + engine->hw_id =2 ; engine->mmio_base =BLT_RING_BASE ; engine->write_tail = ring_write_tail;
@@ -3098,6 +3102,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) engine->name ="video enhancement ring" ; engine->id =VECS ; engine->exec_id =I915_EXEC_VEBOX ; + engine->hw_id =3 ; engine->mmio_base =VEBOX_RING_BASE ; engine->write_tail = ring_write_tail;
drivers/gpu/drm/i915/intel_ringbuffer.h +2 -1
@@ -156,7 +156,8 @@ struct intel_engine_cs {#define I915_NUM_ENGINES 5#define _VCS (n) (VCS + (n))unsigned int exec_id; -unsigned int guc_id; +unsigned int hw_id; +unsigned int guc_id;/* XXX same as hw_id? */ u32 mmio_base;struct drm_device *dev;struct intel_ringbuffer *buffer;