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

Commit 581ab1fe authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Unwind conversion to i915_gem_phys_ops on failure 



The physical object is treated as permanently pinned. If we fail to take
this initial pin during i915_gem_object_attach_phys() we need to revert
it back to an ordinary shmemfs object before reporting the failure.

v2: git-add

Reported-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170215163900.11606-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
parent c1d2061b

drivers/gpu/drm/i915/i915_gem.c

+12 −1
Original line number Diff line number Diff line
@@ -313,6 +313,8 @@ static const struct drm_i915_gem_object_ops i915_gem_phys_ops = { 
	.release = i915_gem_object_release_phys,

};



static const struct drm_i915_gem_object_ops i915_gem_object_ops;



int i915_gem_object_unbind(struct drm_i915_gem_object *obj)

{

	struct i915_vma *vma;
@@ -586,9 +588,18 @@ i915_gem_object_attach_phys(struct drm_i915_gem_object *obj, 
	if (obj->mm.pages)

		return -EBUSY;



	GEM_BUG_ON(obj->ops != &i915_gem_object_ops);

	obj->ops = &i915_gem_phys_ops;



	return i915_gem_object_pin_pages(obj);

	ret = i915_gem_object_pin_pages(obj);

	if (ret)

		goto err_xfer;



	return 0;



err_xfer:

	obj->ops = &i915_gem_object_ops;

	return ret;

}



static int