evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: Organize bind_vma funcs

Browse source 
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: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Rodrigo Vivi 2014-12-03 04:55:29 -08:00 • committed by Daniel Vetter
parent 563f94f6fa
commit b1252bcfe5
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/gpu/drm/i915/i915_gem_gtt.c
View file

@ -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);