Commit 6e7186af authored May 06, 2014 by Ben Widawsky Committed by Daniel Vetter May 07, 2014

drm/i915: Make aliasing a 2nd class VM



There is a good debate to be had about how best to fit the aliasing
PPGTT into the code. However, as it stands right now, getting aliasing
PPGTT bindings is a hack, and done through implicit arguments. To make
this absolutely clear, WARN and return an error if a driver writer tries
to do something they shouldn't.

I have no issue with an eventual revert of this patch. It makes sense
for what we have today.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 3e8b5ae9

drivers/gpu/drm/i915/i915_gem.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -3852,9 +3852,13 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj,
		uint32_t alignment,
		unsigned flags)
		{
		struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
		struct i915_vma *vma;
		int ret;

		if (WARN_ON(vm == &dev_priv->mm.aliasing_ppgtt->base))
		return -ENODEV;

		if (WARN_ON(flags & (PIN_GLOBAL \| PIN_MAPPABLE) && !i915_is_ggtt(vm)))
		return -EINVAL;