drm/i915: Organize PPGTT init

rodrigovivi · danvet · commit 1eb0f0061d82 · 2014-12-17T18:18:19.000+01:00
Let's be optimistic that for future platforms memory management doesn't change
that much and reuse gen8 function for PPGTT init.

Cc: Damien Lespiau &lt;damien.lespiau@intel.com&gt;
Signed-off-by: Rodrigo Vivi &lt;rodrigo.vivi@intel.com&gt;
Reviewed-by: Paulo Zanoni &lt;paulo.r.zanoni@intel.com&gt;
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1165,10 +1165,8 @@ static int __hw_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt)
 
 	if (INTEL_INFO(dev)->gen < 8)
 		return gen6_ppgtt_init(ppgtt);
-	else if (IS_GEN8(dev) || IS_GEN9(dev))
-		return gen8_ppgtt_init(ppgtt, dev_priv->gtt.base.total);
 	else
-		BUG();
+		return gen8_ppgtt_init(ppgtt, dev_priv->gtt.base.total);
 }
 int i915_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt)
 {

Original file line number	Diff line number	Diff line change
`@@ -1165,10 +1165,8 @@ static int __hw_ppgtt_init(struct drm_device dev, struct i915_hw_ppgtt ppgtt)`
`1165`	`1165`
`1166`	`1166`	`if (INTEL_INFO(dev)->gen < 8)`
`1167`	`1167`	`return gen6_ppgtt_init(ppgtt);`
`1168`		`- else if (IS_GEN8(dev) \|\| IS_GEN9(dev))`
`1169`		`- return gen8_ppgtt_init(ppgtt, dev_priv->gtt.base.total);`
`1170`	`1168`	`else`
`1171`		`- BUG();`
	`1169`	`+ return gen8_ppgtt_init(ppgtt, dev_priv->gtt.base.total);`
`1172`	`1170`	`}`
`1173`	`1171`	`int i915_ppgtt_init(struct drm_device dev, struct i915_hw_ppgtt ppgtt)`
`1174`	`1172`	`{`