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

Commit b1252bcf authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Daniel Vetter
Browse files

drm/i915: Organize bind_vma funcs 



Let's be optimistic that for future platforms this will remain the same
and reorg a bit.
This reorg in if blocks instead of switch make life easier for future
platform support addition.

Cc: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 563f94f6

drivers/gpu/drm/i915/i915_gem_gtt.c

+2 −13
Original line number Original line Diff line number Diff line
@@ -2243,11 +2243,7 @@ static struct i915_vma *__i915_gem_vma_create(struct drm_i915_gem_object *obj, 
	vma->obj = obj;

	vma->obj = obj;

	vma->ggtt_view = *view;

	vma->ggtt_view = *view;





	switch (INTEL_INFO(vm->dev)->gen) {

	if (INTEL_INFO(vm->dev)->gen >= 6) {

	case 9:

	case 8:

	case 7:

	case 6:

		if (i915_is_ggtt(vm)) {

		if (i915_is_ggtt(vm)) {

			vma->unbind_vma = ggtt_unbind_vma;

			vma->unbind_vma = ggtt_unbind_vma;

			vma->bind_vma = ggtt_bind_vma;

			vma->bind_vma = ggtt_bind_vma;
@@ -2255,17 +2251,10 @@ static struct i915_vma *__i915_gem_vma_create(struct drm_i915_gem_object *obj, 
			vma->unbind_vma = ppgtt_unbind_vma;

			vma->unbind_vma = ppgtt_unbind_vma;

			vma->bind_vma = ppgtt_bind_vma;

			vma->bind_vma = ppgtt_bind_vma;

		}

		}

		break;

	} else {

	case 5:

	case 4:

	case 3:

	case 2:

		BUG_ON(!i915_is_ggtt(vm));

		BUG_ON(!i915_is_ggtt(vm));

		vma->unbind_vma = i915_ggtt_unbind_vma;

		vma->unbind_vma = i915_ggtt_unbind_vma;

		vma->bind_vma = i915_ggtt_bind_vma;

		vma->bind_vma = i915_ggtt_bind_vma;

		break;

	default:

		BUG();

	}

	}





	list_add_tail(&vma->vma_link, &obj->vma_list);

	list_add_tail(&vma->vma_link, &obj->vma_list);