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

Commit 0fa87796 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: use gtt_get_size() instead of open coding it 



Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 56c844e5

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1564,6 +1564,8 @@ void i915_gem_detach_phys_object(struct drm_device *dev, 
void i915_gem_free_all_phys_object(struct drm_device *dev);

void i915_gem_free_all_phys_object(struct drm_device *dev);

void i915_gem_release(struct drm_device *dev, struct drm_file *file);

void i915_gem_release(struct drm_device *dev, struct drm_file *file);





uint32_t

i915_gem_get_gtt_size(struct drm_device *dev, uint32_t size, int tiling_mode);

uint32_t

uint32_t

i915_gem_get_gtt_alignment(struct drm_device *dev, uint32_t size,

i915_gem_get_gtt_alignment(struct drm_device *dev, uint32_t size,

			    int tiling_mode, bool fenced);

			    int tiling_mode, bool fenced);

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1435,7 +1435,7 @@ i915_gem_release_mmap(struct drm_i915_gem_object *obj) 
	obj->fault_mappable = false;

	obj->fault_mappable = false;

}

}





static uint32_t

uint32_t

i915_gem_get_gtt_size(struct drm_device *dev, uint32_t size, int tiling_mode)

i915_gem_get_gtt_size(struct drm_device *dev, uint32_t size, int tiling_mode)

{

{

	uint32_t gtt_size;

	uint32_t gtt_size;

drivers/gpu/drm/i915/i915_gem_tiling.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -272,18 +272,7 @@ i915_gem_object_fence_ok(struct drm_i915_gem_object *obj, int tiling_mode) 
			return false;

			return false;

	}

	}





	/*

	size = i915_gem_get_gtt_size(obj->base.dev, obj->base.size, tiling_mode);

	 * Previous chips need to be aligned to the size of the smallest

	 * fence register that can contain the object.

	 */

	if (INTEL_INFO(obj->base.dev)->gen == 3)

		size = 1024*1024;

	else

		size = 512*1024;



	while (size < obj->base.size)

		size <<= 1;



	if (obj->gtt_space->size != size)

	if (obj->gtt_space->size != size)

		return false;

		return false;