Commit 439e2ee4 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Move engine->needs_cmd_parser to engine->flags 



Will be adding a new per-engine flags shortly so it makes sense
to consolidate.

v2: Keep the original code flow in intel_engine_cleanup_cmd_parser.
    (Joonas Lahtinen)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarSagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171129082409.18189-1-tvrtko.ursulin@linux.intel.com
parent 9987da4b

drivers/gpu/drm/i915/i915_cmd_parser.c

+4 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
 */



#include "i915_drv.h"

#include "intel_ringbuffer.h"



/**

 * DOC: batch buffer command parser
@@ -940,7 +941,7 @@ void intel_engine_init_cmd_parser(struct intel_engine_cs *engine) 
		return;

	}



	engine->needs_cmd_parser = true;

	engine->flags |= I915_ENGINE_NEEDS_CMD_PARSER;

}



/**
@@ -952,7 +953,7 @@ void intel_engine_init_cmd_parser(struct intel_engine_cs *engine) 
 */

void intel_engine_cleanup_cmd_parser(struct intel_engine_cs *engine)

{

	if (!engine->needs_cmd_parser)

	if (!intel_engine_needs_cmd_parser(engine))

		return;



	fini_hash_table(engine);
@@ -1350,7 +1351,7 @@ int i915_cmd_parser_get_version(struct drm_i915_private *dev_priv) 


	/* If the command parser is not enabled, report 0 - unsupported */

	for_each_engine(engine, dev_priv, id) {

		if (engine->needs_cmd_parser) {

		if (intel_engine_needs_cmd_parser(engine)) {

			active = true;

			break;

		}

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static inline u64 gen8_noncanonical_addr(u64 address) 


static inline bool eb_use_cmdparser(const struct i915_execbuffer *eb)

{

	return eb->engine->needs_cmd_parser && eb->batch_len;

	return intel_engine_needs_cmd_parser(eb->engine) && eb->batch_len;

}



static int eb_create(struct i915_execbuffer *eb)

drivers/gpu/drm/i915/intel_ringbuffer.h

+7 −1
Original line number Diff line number Diff line
@@ -538,7 +538,8 @@ struct intel_engine_cs { 


	struct intel_engine_hangcheck hangcheck;



	bool needs_cmd_parser;

#define I915_ENGINE_NEEDS_CMD_PARSER BIT(0)

	unsigned int flags;



	/*

	 * Table of commands the command parser needs to know about
@@ -597,6 +598,11 @@ struct intel_engine_cs { 
	} stats;

};



static inline bool intel_engine_needs_cmd_parser(struct intel_engine_cs *engine)

{

	return engine->flags & I915_ENGINE_NEEDS_CMD_PARSER;

}



static inline void

execlists_set_active(struct intel_engine_execlists *execlists,

		     unsigned int bit)

CRA Git | Maintained and supported by SUSTech CRA and CCSE