Commit 40e1956e authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/gem: replace IS_GEN and friends with GRAPHICS_VER 



This was done by the following semantic patch:

	@@ expression i915; @@
	- INTEL_GEN(i915)
	+ GRAPHICS_VER(i915)

	@@ expression i915; expression E; @@
	- INTEL_GEN(i915) >= E
	+ GRAPHICS_VER(i915) >= E

	@@ expression dev_priv; expression E; @@
	- !IS_GEN(dev_priv, E)
	+ GRAPHICS_VER(dev_priv) != E

	@@ expression dev_priv; expression E; @@
	- IS_GEN(dev_priv, E)
	+ GRAPHICS_VER(dev_priv) == E

	@@
	expression dev_priv;
	expression from, until;
	@@
	- IS_GEN_RANGE(dev_priv, from, until)
	+ IS_GRAPHICS_VER(dev_priv, from, until)

	@def@
	expression E;
	identifier id =~ "^gen$";
	@@
	- id = GRAPHICS_VER(E)
	+ ver = GRAPHICS_VER(E)

	@@
	identifier def.id;
	@@
	- id
	+ ver

It also takes care of renaming the variable we assign to GRAPHICS_VER()
so to use "ver" rather than "gen".

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210605155356.4183026-4-lucas.demarchi@intel.com
parent fa20cbdd

drivers/gpu/drm/i915/gem/i915_gem_context.c

+3 −3
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ static void set_ppgtt_barrier(void *data) 
{

	struct i915_address_space *old = data;



	if (INTEL_GEN(old->i915) < 8)

	if (GRAPHICS_VER(old->i915) < 8)

		gen6_ppgtt_unpin_all(i915_vm_to_ppgtt(old));



	i915_vm_close(old);
@@ -1436,7 +1436,7 @@ i915_gem_user_to_context_sseu(struct intel_gt *gt, 
	context->max_eus_per_subslice = user->max_eus_per_subslice;



	/* Part specific restrictions. */

	if (IS_GEN(i915, 11)) {

	if (GRAPHICS_VER(i915) == 11) {

		unsigned int hw_s = hweight8(device->slice_mask);

		unsigned int hw_ss_per_s = hweight8(device->subslice_mask[0]);

		unsigned int req_s = hweight8(context->slice_mask);
@@ -1503,7 +1503,7 @@ static int set_sseu(struct i915_gem_context *ctx, 
	if (args->size < sizeof(user_sseu))

		return -EINVAL;



	if (!IS_GEN(i915, 11))

	if (GRAPHICS_VER(i915) != 11)

		return -ENODEV;



	if (copy_from_user(&user_sseu, u64_to_user_ptr(args->value),

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+5 −5
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ eb_validate_vma(struct i915_execbuffer *eb, 
	 * also covers all platforms with local memory.

	 */

	if (entry->relocation_count &&

	    INTEL_GEN(eb->i915) >= 12 && !IS_TIGERLAKE(eb->i915))

	    GRAPHICS_VER(eb->i915) >= 12 && !IS_TIGERLAKE(eb->i915))

		return -EINVAL;



	if (unlikely(entry->flags & eb->invalid_flags))
@@ -1439,7 +1439,7 @@ static int __reloc_gpu_alloc(struct i915_execbuffer *eb, 


static bool reloc_can_use_engine(const struct intel_engine_cs *engine)

{

	return engine->class != VIDEO_DECODE_CLASS || !IS_GEN(engine->i915, 6);

	return engine->class != VIDEO_DECODE_CLASS || GRAPHICS_VER(engine->i915) != 6;

}



static u32 *reloc_gpu(struct i915_execbuffer *eb,
@@ -1671,7 +1671,7 @@ eb_relocate_entry(struct i915_execbuffer *eb, 
		 * batchbuffers.

		 */

		if (reloc->write_domain == I915_GEM_DOMAIN_INSTRUCTION &&

		    IS_GEN(eb->i915, 6)) {

		    GRAPHICS_VER(eb->i915) == 6) {

			err = i915_vma_bind(target->vma,

					    target->vma->obj->cache_level,

					    PIN_GLOBAL, NULL);
@@ -2332,7 +2332,7 @@ static int i915_reset_gen7_sol_offsets(struct i915_request *rq) 
	u32 *cs;

	int i;



	if (!IS_GEN(rq->engine->i915, 7) || rq->engine->id != RCS0) {

	if (GRAPHICS_VER(rq->engine->i915) != 7 || rq->engine->id != RCS0) {

		drm_dbg(&rq->engine->i915->drm, "sol reset is gen7/rcs only\n");

		return -EINVAL;

	}
@@ -3375,7 +3375,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, 


	eb.batch_flags = 0;

	if (args->flags & I915_EXEC_SECURE) {

		if (INTEL_GEN(i915) >= 11)

		if (GRAPHICS_VER(i915) >= 11)

			return -ENODEV;



		/* Return -EPERM to trigger fallback code on old binaries. */

drivers/gpu/drm/i915/gem/i915_gem_mman.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
	/* mmap ioctl is disallowed for all platforms after TGL-LP.  This also

	 * covers all platforms with local memory.

	 */

	if (INTEL_GEN(i915) >= 12 && !IS_TIGERLAKE(i915))

	if (GRAPHICS_VER(i915) >= 12 && !IS_TIGERLAKE(i915))

		return -EOPNOTSUPP;



	if (args->flags & ~(I915_MMAP_WC))

drivers/gpu/drm/i915/gem/i915_gem_object_blt.c

+4 −4
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct i915_vma *intel_emit_vma_fill_blt(struct intel_context *ce, 


		GEM_BUG_ON(size >> PAGE_SHIFT > S16_MAX);



		if (INTEL_GEN(i915) >= 8) {

		if (GRAPHICS_VER(i915) >= 8) {

			*cmd++ = XY_COLOR_BLT_CMD | BLT_WRITE_RGBA | (7 - 2);

			*cmd++ = BLT_DEPTH_32 | BLT_ROP_COLOR_COPY | PAGE_SIZE;

			*cmd++ = 0;
@@ -232,7 +232,7 @@ static bool wa_1209644611_applies(struct drm_i915_private *i915, u32 size) 
{

	u32 height = size >> PAGE_SHIFT;



	if (!IS_GEN(i915, 11))

	if (GRAPHICS_VER(i915) != 11)

		return false;



	return height % 4 == 3 && height <= 8;
@@ -297,7 +297,7 @@ struct i915_vma *intel_emit_vma_copy_blt(struct intel_context *ce, 
		size = min_t(u64, rem, block_size);

		GEM_BUG_ON(size >> PAGE_SHIFT > S16_MAX);



		if (INTEL_GEN(i915) >= 9 &&

		if (GRAPHICS_VER(i915) >= 9 &&

		    !wa_1209644611_applies(i915, size)) {

			*cmd++ = GEN9_XY_FAST_COPY_BLT_CMD | (10 - 2);

			*cmd++ = BLT_DEPTH_32 | PAGE_SIZE;
@@ -309,7 +309,7 @@ struct i915_vma *intel_emit_vma_copy_blt(struct intel_context *ce, 
			*cmd++ = PAGE_SIZE;

			*cmd++ = lower_32_bits(src_offset);

			*cmd++ = upper_32_bits(src_offset);

		} else if (INTEL_GEN(i915) >= 8) {

		} else if (GRAPHICS_VER(i915) >= 8) {

			*cmd++ = XY_SRC_COPY_BLT_CMD | BLT_WRITE_RGBA | (10 - 2);

			*cmd++ = BLT_DEPTH_32 | BLT_ROP_SRC_COPY | PAGE_SIZE;

			*cmd++ = 0;

drivers/gpu/drm/i915/gem/i915_gem_stolen.c

+8 −8
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *i915, 
		return -ENODEV;



	/* WaSkipStolenMemoryFirstPage:bdw+ */

	if (INTEL_GEN(i915) >= 8 && start < 4096)

	if (GRAPHICS_VER(i915) >= 8 && start < 4096)

		start = 4096;



	mutex_lock(&i915->mm.stolen_lock);
@@ -84,14 +84,14 @@ static int i915_adjust_stolen(struct drm_i915_private *i915, 
	 */



	/* Make sure we don't clobber the GTT if it's within stolen memory */

	if (INTEL_GEN(i915) <= 4 &&

	if (GRAPHICS_VER(i915) <= 4 &&

	    !IS_G33(i915) && !IS_PINEVIEW(i915) && !IS_G4X(i915)) {

		struct resource stolen[2] = {*dsm, *dsm};

		struct resource ggtt_res;

		resource_size_t ggtt_start;



		ggtt_start = intel_uncore_read(uncore, PGTBL_CTL);

		if (IS_GEN(i915, 4))

		if (GRAPHICS_VER(i915) == 4)

			ggtt_start = (ggtt_start & PGTBL_ADDRESS_LO_MASK) |

				     (ggtt_start & PGTBL_ADDRESS_HI_MASK) << 28;

		else
@@ -156,7 +156,7 @@ static int i915_adjust_stolen(struct drm_i915_private *i915, 
		 * GEN3 firmware likes to smash pci bridges into the stolen

		 * range. Apparently this works.

		 */

		if (!r && !IS_GEN(i915, 3)) {

		if (!r && GRAPHICS_VER(i915) != 3) {

			drm_err(&i915->drm,

				"conflict detected with stolen region: %pR\n",

				dsm);
@@ -197,7 +197,7 @@ static void g4x_get_stolen_reserved(struct drm_i915_private *i915, 
	 * Whether ILK really reuses the ELK register for this is unclear.

	 * Let's see if we catch anyone with this supposedly enabled on ILK.

	 */

	drm_WARN(&i915->drm, IS_GEN(i915, 5),

	drm_WARN(&i915->drm, GRAPHICS_VER(i915) == 5,

		 "ILK stolen reserved found? 0x%08x\n",

		 reg_val);
@@ -399,7 +399,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem) 
		return 0;

	}



	if (intel_vtd_active() && INTEL_GEN(i915) < 8) {

	if (intel_vtd_active() && GRAPHICS_VER(i915) < 8) {

		drm_notice(&i915->drm,

			   "%s, disabling use of stolen memory\n",

			   "DMAR active");
@@ -421,7 +421,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem) 
	reserved_base = stolen_top;

	reserved_size = 0;



	switch (INTEL_GEN(i915)) {

	switch (GRAPHICS_VER(i915)) {

	case 2:

	case 3:

		break;
@@ -456,7 +456,7 @@ static int i915_gem_init_stolen(struct intel_memory_region *mem) 
						&reserved_base, &reserved_size);

		break;

	default:

		MISSING_CASE(INTEL_GEN(i915));

		MISSING_CASE(GRAPHICS_VER(i915));

		fallthrough;

	case 11:

	case 12: