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

Commit 52613921 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

Revert "drm/i915: Allocate context objects from stolen" 



Stolen gets trashed during hibernation, so storing contexts there
is not a very good idea. On my IVB machines this leads to a totally
dead GPU on resume. A reboot is required to resurrect it. So let's
not store contexts where they will get trampled.

This reverts commit 149c86e7.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 19ee835c

drivers/gpu/drm/i915/i915_gem_context.c

+1 −3
Original line number Diff line number Diff line
@@ -157,8 +157,6 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size) 
	struct drm_i915_gem_object *obj;

	int ret;



	obj = i915_gem_object_create_stolen(dev, size);

	if (obj == NULL)

	obj = i915_gem_alloc_object(dev, size);

	if (obj == NULL)

		return ERR_PTR(-ENOMEM);