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

Commit e67b8ce1 authored by Chris Wilson's avatar Chris Wilson Committed by Jesse Barnes
Browse files

drm/i915: Remove stored gtt_alignment 



There is no need to store the gtt_alignment as it is either explicitly
set according to the hardware requirements (e.g. scanout) or the
minimum alignment is computed on demand.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 4960aaca

drivers/gpu/drm/i915/i915_drv.h

+1 −4
Original line number Diff line number Diff line
@@ -510,10 +510,7 @@ struct drm_i915_gem_object { 
	 * This is the same as gtt_space->start

	 */

	uint32_t gtt_offset;

	/**

	 * Required alignment for the object

	 */

	uint32_t gtt_alignment;



	/**

	 * Fake offset for use by mmap(2)

	 */

drivers/gpu/drm/i915/i915_gem.c

+2 −12
Original line number Diff line number Diff line
@@ -1155,7 +1155,7 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	/* Now bind it into the GTT if needed */

	mutex_lock(&dev->struct_mutex);

	if (!obj_priv->gtt_space) {

		ret = i915_gem_object_bind_to_gtt(obj, obj_priv->gtt_alignment);

		ret = i915_gem_object_bind_to_gtt(obj, 0);

		if (ret) {

			mutex_unlock(&dev->struct_mutex);

			return VM_FAULT_SIGBUS;
@@ -1398,22 +1398,12 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, 


	args->offset = obj_priv->mmap_offset;



	obj_priv->gtt_alignment = i915_gem_get_gtt_alignment(obj);



	/* Make sure the alignment is correct for fence regs etc */

	if (obj_priv->agp_mem &&

	    (obj_priv->gtt_offset & (obj_priv->gtt_alignment - 1))) {

		drm_gem_object_unreference(obj);

		mutex_unlock(&dev->struct_mutex);

		return -EINVAL;

	}



	/*

	 * Pull it into the GTT so that we have a page list (makes the

	 * initial fault faster and any subsequent flushing possible).

	 */

	if (!obj_priv->agp_mem) {

		ret = i915_gem_object_bind_to_gtt(obj, obj_priv->gtt_alignment);

		ret = i915_gem_object_bind_to_gtt(obj, 0);

		if (ret) {

			drm_gem_object_unreference(obj);

			mutex_unlock(&dev->struct_mutex);