Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24caf655 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: intel_engine_init_global_seqno() requires atomic kmap 



As intel_engine_init_global_seqno() may be called by
nop_submit_request() from inside irq context, we have to use atomic
versions of kmap/kunmap. This is rare as this requires using gen8 legacy
ringbuffer submission.

Reported-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170320145609.4898-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent 467221bc

drivers/gpu/drm/i915/intel_engine_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -242,12 +242,12 @@ void intel_engine_init_global_seqno(struct intel_engine_cs *engine, u32 seqno) 
		void *semaphores;



		/* Semaphores are in noncoherent memory, flush to be safe */

		semaphores = kmap(page);

		semaphores = kmap_atomic(page);

		memset(semaphores + GEN8_SEMAPHORE_OFFSET(engine->id, 0),

		       0, I915_NUM_ENGINES * gen8_semaphore_seqno_size);

		drm_clflush_virt_range(semaphores + GEN8_SEMAPHORE_OFFSET(engine->id, 0),

				       I915_NUM_ENGINES * gen8_semaphore_seqno_size);

		kunmap(page);

		kunmap_atomic(semaphores);

	}



	intel_write_status_page(engine, I915_GEM_HWS_INDEX, seqno);