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

Commit fd8e7427 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Greg Kroah-Hartman
Browse files

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



commit 439e2ee4ca520e72870e4fa44aa0076060ad6857 upstream.

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


Signed-off-by: default avatarJon Bloomfield <jon.bloomfield@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3c37ff5

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);
@@ -1355,7 +1356,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) {

		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
@@ -1711,7 +1711,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
	}



	params->args_batch_start_offset = args->batch_start_offset;

	if (engine->needs_cmd_parser && args->batch_len) {

	if (intel_engine_needs_cmd_parser(engine) && args->batch_len) {

		struct i915_vma *vma;



		vma = i915_gem_execbuffer_parse(engine, &shadow_exec_entry,

drivers/gpu/drm/i915/intel_ringbuffer.h

+8 −2
Original line number Diff line number Diff line
@@ -341,7 +341,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
@@ -374,7 +375,12 @@ intel_engine_initialized(const struct intel_engine_cs *engine) 
	return engine->i915 != NULL;

}



static inline unsigned

static inline bool intel_engine_needs_cmd_parser(struct intel_engine_cs *engine)

{

	return engine->flags & I915_ENGINE_NEEDS_CMD_PARSER;

}



static inline unsigned int

intel_engine_flag(const struct intel_engine_cs *engine)

{

	return 1 << engine->id;