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

Commit 6e5248b5 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Clean up kerneldoc for intel_lrc.c 



Fairly minimal, there's still lots of functions without any docs, and
which aren't static. But probably we want to first clean this up some more.

- Drop the bogus const. Marking argument pointers themselves (instead of
  what they point at) as const provides roughly 0 value. And it's confusing,
  since the data the pointer points at _is_ being changed.

- Remove kerneldoc for static functions. Keep comments where they seem valuable.

- Indent and whitespace fixes.

- Blockquote the bit field definitions of the descriptor for correct layouting.

Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1468612088-9721-9-git-send-email-daniel.vetter@ffwll.ch
parent 3d466cd6

drivers/gpu/drm/i915/intel_lrc.c

+30 −69
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ logical_ring_init_platform_invariants(struct intel_engine_cs *engine) 
/**

 * intel_lr_context_descriptor_update() - calculate & cache the descriptor

 * 					  descriptor for a pinned context

 *

 * @ctx: Context to work on

 * @engine: Engine the descriptor will be used with

 *
@@ -297,7 +296,8 @@ logical_ring_init_platform_invariants(struct intel_engine_cs *engine) 
 * expensive to calculate, we'll just do it once and cache the result,

 * which remains valid until the context is unpinned.

 *

 * This is what a descriptor looks like, from LSB to MSB:

 * This is what a descriptor looks like, from LSB to MSB::

 *

 *      bits  0-11:    flags, GEN8_CTX_* (cached in ctx_desc_template)

 *      bits 12-31:    LRCA, GTT address of (the HWSP of) this context

 *      bits 32-52:    ctx ID, a globally unique tag
@@ -539,10 +539,7 @@ get_context_status(struct intel_engine_cs *engine, unsigned int read_pointer, 
	return status;

}



/**

 * intel_lrc_irq_handler() - handle Context Switch interrupts

 * @data: tasklet handler passed in unsigned long

 *

/*

 * Check the unread Context Status Buffers and manage the submission of new

 * contexts to the ELSP accordingly.

 */
@@ -807,7 +804,7 @@ intel_logical_ring_advance_and_submit(struct drm_i915_gem_request *request) 
}



/**

 * execlists_submission() - submit a batchbuffer for execution, Execlists style

 * intel_execlists_submission() - submit a batchbuffer for execution, Execlists style

 * @params: execbuffer call parameters.

 * @args: execbuffer call arguments.

 * @vmas: list of vmas.
@@ -1094,7 +1091,7 @@ static int intel_logical_ring_workarounds_emit(struct drm_i915_gem_request *req) 
 * code duplication.

 */

static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *engine,

						uint32_t *const batch,

						uint32_t *batch,

						uint32_t index)

{

	uint32_t l3sqc4_flush = (0x40400000 | GEN8_LQSC_FLUSH_COHERENT_LINES);
@@ -1155,17 +1152,7 @@ static inline int wa_ctx_end(struct i915_wa_ctx_bb *wa_ctx, 
	return 0;

}



/**

 * gen8_init_indirectctx_bb() - initialize indirect ctx batch with WA

 *

 * @engine: only applicable for RCS

 * @wa_ctx: structure representing wa_ctx

 *  offset: specifies start of the batch, should be cache-aligned. This is updated

 *    with the offset value received as input.

 *  size: size of the batch in DWORDS but HW expects in terms of cachelines

 * @batch: page in which WA are loaded

 * @offset: This field specifies the start of the batch, it should be

 *  cache-aligned otherwise it is adjusted accordingly.

/*

 * Typically we only have one indirect_ctx and per_ctx batch buffer which are

 * initialized at the beginning and shared across all contexts but this field

 * helps us to have multiple batches at different offsets and select them based
@@ -1179,13 +1166,10 @@ static inline int wa_ctx_end(struct i915_wa_ctx_bb *wa_ctx, 
 * so it adds NOOPs as padding to make it cacheline aligned.

 * MI_BATCH_BUFFER_END will be added to perctx batch and both of them together

 * makes a complete batch buffer.

 *

 * Return: non-zero if we exceed the PAGE_SIZE limit.

 */



static int gen8_init_indirectctx_bb(struct intel_engine_cs *engine,

				    struct i915_wa_ctx_bb *wa_ctx,

				    uint32_t *const batch,

				    uint32_t *batch,

				    uint32_t *offset)

{

	uint32_t scratch_addr;
@@ -1229,15 +1213,7 @@ static int gen8_init_indirectctx_bb(struct intel_engine_cs *engine, 
	return wa_ctx_end(wa_ctx, *offset = index, CACHELINE_DWORDS);

}



/**

 * gen8_init_perctx_bb() - initialize per ctx batch with WA

 *

 * @engine: only applicable for RCS

 * @wa_ctx: structure representing wa_ctx

 *  offset: specifies start of the batch, should be cache-aligned.

 *  size: size of the batch in DWORDS but HW expects in terms of cachelines

 * @batch: page in which WA are loaded

 * @offset: This field specifies the start of this batch.

/*

 *  This batch is started immediately after indirect_ctx batch. Since we ensure

 *  that indirect_ctx ends on a cacheline this batch is aligned automatically.

 *
@@ -1248,7 +1224,7 @@ static int gen8_init_indirectctx_bb(struct intel_engine_cs *engine, 
 */

static int gen8_init_perctx_bb(struct intel_engine_cs *engine,

			       struct i915_wa_ctx_bb *wa_ctx,

			       uint32_t *const batch,

			       uint32_t *batch,

			       uint32_t *offset)

{

	uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
@@ -1263,7 +1239,7 @@ static int gen8_init_perctx_bb(struct intel_engine_cs *engine, 


static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,

				    struct i915_wa_ctx_bb *wa_ctx,

				    uint32_t *const batch,

				    uint32_t *batch,

				    uint32_t *offset)

{

	int ret;
@@ -1330,7 +1306,7 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine, 


static int gen9_init_perctx_bb(struct intel_engine_cs *engine,

			       struct i915_wa_ctx_bb *wa_ctx,

			       uint32_t *const batch,

			       uint32_t *batch,

			       uint32_t *offset)

{

	uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
@@ -1916,9 +1892,7 @@ static int gen8_init_rcs_context(struct drm_i915_gem_request *req) 


/**

 * intel_logical_ring_cleanup() - deallocate the Engine Command Streamer

 *

 * @engine: Engine Command Streamer.

 *

 */

void intel_logical_ring_cleanup(struct intel_engine_cs *engine)

{
@@ -2365,19 +2339,6 @@ uint32_t intel_lr_context_size(struct intel_engine_cs *engine) 
	return ret;

}



/**

 * execlists_context_deferred_alloc() - create the LRC specific bits of a context

 * @ctx: LR context to create.

 * @engine: engine to be used with the context.

 *

 * This function can be called more than once, with different engines, if we plan

 * to use the context with them. The context backing objects and the ringbuffers

 * (specially the ringbuffer backing objects) suck a lot of memory up, and that's why

 * the creation is a deferred call: it's better to make sure first that we need to use

 * a given ring with the context.

 *

 * Return: non-zero on error.

 */

static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,

					    struct intel_engine_cs *engine)

{