Commit 7a859c65 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Eliminate use of PAGE_SIZE as a virtual alignment 



Using PAGE_SIZE for virtual offset alignment is superfluous as it is
equal to the minimum gtt alignment and so equivalent to 0. It is also
the wrong value to use as we stopped using physical page constructs for
the virtual GTT, i.e. it would be preferrable to use I915_GTT_PAGE_SIZE
and in these cases merely imply I915_GTT_MIN_ALIGNMENT.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180727091855.1879-1-chris@chris-wilson.co.uk
parent 6dc17d69

drivers/gpu/drm/i915/intel_engine_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ int intel_engine_create_scratch(struct intel_engine_cs *engine, 
		goto err_unref;

	}



	ret = i915_vma_pin(vma, 0, 4096, PIN_GLOBAL | PIN_HIGH);

	ret = i915_vma_pin(vma, 0, 0, PIN_GLOBAL | PIN_HIGH);

	if (ret)

		goto err_unref;
@@ -586,7 +586,7 @@ static int init_status_page(struct intel_engine_cs *engine) 
		flags |= PIN_MAPPABLE;

	else

		flags |= PIN_HIGH;

	ret = i915_vma_pin(vma, 0, 4096, flags);

	ret = i915_vma_pin(vma, 0, 0, flags);

	if (ret)

		goto err;

drivers/gpu/drm/i915/intel_guc.c

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size) 
	if (IS_ERR(vma))

		goto err;



	ret = i915_vma_pin(vma, 0, PAGE_SIZE,

	ret = i915_vma_pin(vma, 0, 0,

			   PIN_GLOBAL | PIN_OFFSET_BIAS | guc->ggtt_pin_bias);

	if (ret) {

		vma = ERR_PTR(ret);

drivers/gpu/drm/i915/intel_lrc.c

+1 −1
Original line number Diff line number Diff line
@@ -1643,7 +1643,7 @@ static int lrc_setup_wa_ctx(struct intel_engine_cs *engine) 
		goto err;

	}



	err = i915_vma_pin(vma, 0, PAGE_SIZE, PIN_GLOBAL | PIN_HIGH);

	err = i915_vma_pin(vma, 0, 0, PIN_GLOBAL | PIN_HIGH);

	if (err)

		goto err;

drivers/gpu/drm/i915/intel_ringbuffer.c

+2 −3
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ int intel_ring_pin(struct intel_ring *ring, 
			return ret;

	}



	ret = i915_vma_pin(vma, 0, PAGE_SIZE, flags);

	ret = i915_vma_pin(vma, 0, 0, flags);

	if (unlikely(ret))

		return ret;
@@ -1220,8 +1220,7 @@ static int __context_pin(struct intel_context *ce) 
			return err;

	}



	err = i915_vma_pin(vma, 0, I915_GTT_MIN_ALIGNMENT,

			   PIN_GLOBAL | PIN_HIGH);

	err = i915_vma_pin(vma, 0, 0, PIN_GLOBAL | PIN_HIGH);

	if (err)

		return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE