diff options
author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2014-12-03 07:55:29 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-12-17 12:23:12 -0500 |
commit | b1252bcfe53f8ced80ce4e07d761304e755594db (patch) | |
tree | 1e6fa3f4d553a2bf1a37c7316c2cbf9b402ca75e /drivers/gpu/drm/i915 | |
parent | 563f94f6faefe8cb497245a3511b272587ebd85b (diff) |
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: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 82cb5666583f..746f77fb57a3 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c | |||
@@ -2243,11 +2243,7 @@ static struct i915_vma *__i915_gem_vma_create(struct drm_i915_gem_object *obj, | |||
2243 | vma->obj = obj; | 2243 | vma->obj = obj; |
2244 | vma->ggtt_view = *view; | 2244 | vma->ggtt_view = *view; |
2245 | 2245 | ||
2246 | switch (INTEL_INFO(vm->dev)->gen) { | 2246 | if (INTEL_INFO(vm->dev)->gen >= 6) { |
2247 | case 9: | ||
2248 | case 8: | ||
2249 | case 7: | ||
2250 | case 6: | ||
2251 | if (i915_is_ggtt(vm)) { | 2247 | if (i915_is_ggtt(vm)) { |
2252 | vma->unbind_vma = ggtt_unbind_vma; | 2248 | vma->unbind_vma = ggtt_unbind_vma; |
2253 | vma->bind_vma = ggtt_bind_vma; | 2249 | vma->bind_vma = ggtt_bind_vma; |
@@ -2255,17 +2251,10 @@ static struct i915_vma *__i915_gem_vma_create(struct drm_i915_gem_object *obj, | |||
2255 | vma->unbind_vma = ppgtt_unbind_vma; | 2251 | vma->unbind_vma = ppgtt_unbind_vma; |
2256 | vma->bind_vma = ppgtt_bind_vma; | 2252 | vma->bind_vma = ppgtt_bind_vma; |
2257 | } | 2253 | } |
2258 | break; | 2254 | } else { |
2259 | case 5: | ||
2260 | case 4: | ||
2261 | case 3: | ||
2262 | case 2: | ||
2263 | BUG_ON(!i915_is_ggtt(vm)); | 2255 | BUG_ON(!i915_is_ggtt(vm)); |
2264 | vma->unbind_vma = i915_ggtt_unbind_vma; | 2256 | vma->unbind_vma = i915_ggtt_unbind_vma; |
2265 | vma->bind_vma = i915_ggtt_bind_vma; | 2257 | vma->bind_vma = i915_ggtt_bind_vma; |
2266 | break; | ||
2267 | default: | ||
2268 | BUG(); | ||
2269 | } | 2258 | } |
2270 | 2259 | ||
2271 | list_add_tail(&vma->vma_link, &obj->vma_list); | 2260 | list_add_tail(&vma->vma_link, &obj->vma_list); |