Commit 3a891a62 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h 



We want to use intel_engine_mask_t inside i915_request.h, which means
extracting it from the general header file mess and placing it inside a
types.h. A knock on effect is that the compiler wants to warn about
type-contraction of ALL_ENGINES into intel_engine_maskt_t, so prepare
for the worst.

v2: Use intel_engine_mask_t consistently
v3: Move I915_NUM_ENGINES to its natural home at the end of the enum

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190401162641.10963-1-chris@chris-wilson.co.uk


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

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o 
i915-$(CONFIG_DRM_I915_WERROR) += \

	test_i915_active_types_standalone.o \

	test_i915_gem_context_types_standalone.o \

	test_i915_scheduler_types_standalone.o \

	test_i915_timeline_types_standalone.o \

	test_intel_context_types_standalone.o \

	test_intel_engine_types_standalone.o \

drivers/gpu/drm/i915/gvt/execlist.c

+6 −5
Original line number Diff line number Diff line
@@ -526,12 +526,13 @@ static void init_vgpu_execlist(struct intel_vgpu *vgpu, int ring_id) 
	vgpu_vreg(vgpu, ctx_status_ptr_reg) = ctx_status_ptr.dw;

}



static void clean_execlist(struct intel_vgpu *vgpu, unsigned long engine_mask)

static void clean_execlist(struct intel_vgpu *vgpu,

			   intel_engine_mask_t engine_mask)

{

	unsigned int tmp;

	struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;

	struct intel_engine_cs *engine;

	struct intel_vgpu_submission *s = &vgpu->submission;

	intel_engine_mask_t tmp;



	for_each_engine_masked(engine, dev_priv, engine_mask, tmp) {

		kfree(s->ring_scan_buffer[engine->id]);
@@ -541,18 +542,18 @@ static void clean_execlist(struct intel_vgpu *vgpu, unsigned long engine_mask) 
}



static void reset_execlist(struct intel_vgpu *vgpu,

		unsigned long engine_mask)

			   intel_engine_mask_t engine_mask)

{

	struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;

	struct intel_engine_cs *engine;

	unsigned int tmp;

	intel_engine_mask_t tmp;



	for_each_engine_masked(engine, dev_priv, engine_mask, tmp)

		init_vgpu_execlist(vgpu, engine->id);

}



static int init_execlist(struct intel_vgpu *vgpu,

			 unsigned long engine_mask)

			 intel_engine_mask_t engine_mask)

{

	reset_execlist(vgpu, engine_mask);

	return 0;

drivers/gpu/drm/i915/gvt/execlist.h

+1 −1
Original line number Diff line number Diff line
@@ -180,6 +180,6 @@ int intel_vgpu_init_execlist(struct intel_vgpu *vgpu); 
int intel_vgpu_submit_execlist(struct intel_vgpu *vgpu, int ring_id);



void intel_vgpu_reset_execlist(struct intel_vgpu *vgpu,

		unsigned long engine_mask);

			       intel_engine_mask_t engine_mask);



#endif /*_GVT_EXECLIST_H_*/

drivers/gpu/drm/i915/gvt/gvt.h

+4 −4
Original line number Diff line number Diff line
@@ -144,9 +144,9 @@ enum { 


struct intel_vgpu_submission_ops {

	const char *name;

	int (*init)(struct intel_vgpu *vgpu, unsigned long engine_mask);

	void (*clean)(struct intel_vgpu *vgpu, unsigned long engine_mask);

	void (*reset)(struct intel_vgpu *vgpu, unsigned long engine_mask);

	int (*init)(struct intel_vgpu *vgpu, intel_engine_mask_t engine_mask);

	void (*clean)(struct intel_vgpu *vgpu, intel_engine_mask_t engine_mask);

	void (*reset)(struct intel_vgpu *vgpu, intel_engine_mask_t engine_mask);

};



struct intel_vgpu_submission {
@@ -488,7 +488,7 @@ struct intel_vgpu *intel_gvt_create_vgpu(struct intel_gvt *gvt, 
void intel_gvt_destroy_vgpu(struct intel_vgpu *vgpu);

void intel_gvt_release_vgpu(struct intel_vgpu *vgpu);

void intel_gvt_reset_vgpu_locked(struct intel_vgpu *vgpu, bool dmlr,

				 unsigned int engine_mask);

				 intel_engine_mask_t engine_mask);

void intel_gvt_reset_vgpu(struct intel_vgpu *vgpu);

void intel_gvt_activate_vgpu(struct intel_vgpu *vgpu);

void intel_gvt_deactivate_vgpu(struct intel_vgpu *vgpu);

drivers/gpu/drm/i915/gvt/handlers.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static int mul_force_wake_write(struct intel_vgpu *vgpu, 
static int gdrst_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,

			    void *p_data, unsigned int bytes)

{

	unsigned int engine_mask = 0;

	intel_engine_mask_t engine_mask = 0;

	u32 data;



	write_vreg(vgpu, offset, p_data, bytes);

CRA Git | Maintained and supported by SUSTech CRA and CCSE