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

Commit 237ae7c7 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915: Don't use enums for hardware engine id 



Generally we are using macros for any hardware identifiers as these
may change between Gens. Do the same with hardware engine ids.

v2: move hw engine defs to i915_reg.h (Chris)

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170301202615.118632-1-michal.wajdeczko@intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 61d3dc70

drivers/gpu/drm/i915/i915_reg.h

+6 −0
Original line number Diff line number Diff line
@@ -77,7 +77,13 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) 
#define _MASKED_BIT_ENABLE(a)	({ typeof(a) _a = (a); _MASKED_FIELD(_a, _a); })

#define _MASKED_BIT_DISABLE(a)	(_MASKED_FIELD((a), 0))



/* Engine ID */



#define RCS_HW		0

#define VCS_HW		1

#define BCS_HW		2

#define VECS_HW		3

#define VCS2_HW		4



/* PCI config space */

drivers/gpu/drm/i915/intel_engine_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 


static const struct engine_info {

	const char *name;

	unsigned exec_id;

	enum intel_engine_hw_id hw_id;

	unsigned int exec_id;

	unsigned int hw_id;

	u32 mmio_base;

	unsigned irq_shift;

	int (*init_legacy)(struct intel_engine_cs *engine);

drivers/gpu/drm/i915/intel_ringbuffer.h

+16 −16
Original line number Diff line number Diff line
@@ -186,26 +186,26 @@ struct i915_ctx_workarounds { 
struct drm_i915_gem_request;

struct intel_render_state;



struct intel_engine_cs {

	struct drm_i915_private *i915;

	const char	*name;

/*

 * Engine IDs definitions.

 * Keep instances of the same type engine together.

 */

enum intel_engine_id {

	RCS = 0,

	BCS,

	VCS,

		VCS2,	/* Keep instances of the same type engine together. */

		VECS

	} id;

	VCS2,

#define _VCS(n) (VCS + (n))

	VECS

};



struct intel_engine_cs {

	struct drm_i915_private *i915;

	const char	*name;

	enum intel_engine_id id;

	unsigned int exec_id;

	enum intel_engine_hw_id {

		RCS_HW = 0,

		VCS_HW,

		BCS_HW,

		VECS_HW,

		VCS2_HW

	} hw_id;

	enum intel_engine_hw_id guc_id; /* XXX same as hw_id? */

	unsigned int hw_id;

	unsigned int guc_id;

	u32		mmio_base;

	unsigned int irq_shift;

	struct intel_ring *buffer;