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

Commit ef0cf27c authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Use the .release hook to drop the stolen drm_mm tracking 



Now that we have a release hook into i915_gem_object_free, we can move
the explicit call to the internal stolen function and hook it up
throught the callback instead.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a33d7105

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -2439,7 +2439,6 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, 
					       u32 stolen_offset,

					       u32 gtt_offset,

					       u32 size);

void i915_gem_object_release_stolen(struct drm_i915_gem_object *obj);



/* i915_gem_tiling.c */

static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj)

drivers/gpu/drm/i915/i915_gem.c

+0 −1
Original line number Diff line number Diff line
@@ -4444,7 +4444,6 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj) 
		obj->madv = I915_MADV_DONTNEED;

	i915_gem_object_put_pages(obj);

	i915_gem_object_free_mmap_offset(obj);

	i915_gem_object_release_stolen(obj);



	BUG_ON(obj->pages);

drivers/gpu/drm/i915/i915_gem_stolen.c

+11 −10
Original line number Diff line number Diff line
@@ -292,9 +292,20 @@ static void i915_gem_object_put_pages_stolen(struct drm_i915_gem_object *obj) 
	kfree(obj->pages);

}





static void

i915_gem_object_release_stolen(struct drm_i915_gem_object *obj)

{

	if (obj->stolen) {

		drm_mm_remove_node(obj->stolen);

		kfree(obj->stolen);

		obj->stolen = NULL;

	}

}

static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = {

	.get_pages = i915_gem_object_get_pages_stolen,

	.put_pages = i915_gem_object_put_pages_stolen,

	.release = i915_gem_object_release_stolen,

};



static struct drm_i915_gem_object *
@@ -452,13 +463,3 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, 
	drm_gem_object_unreference(&obj->base);

	return NULL;

}
 


void

i915_gem_object_release_stolen(struct drm_i915_gem_object *obj)

{

	if (obj->stolen) {

		drm_mm_remove_node(obj->stolen);

		kfree(obj->stolen);

		obj->stolen = NULL;

	}

}