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

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

drm/i915: Allow objects to be created with no backing pages, but stolen space 



In order to accommodate objects that are not backed by struct pages, but
instead point into a contiguous region of stolen space, we need to make
various changes to avoid dereferencing obj->pages or obj->base.filp.

First introduce a marker for the stolen object, that specifies its
offset into the stolen region and implies that it has no backing pages.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 11be49eb

drivers/gpu/drm/i915/i915_debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) 
	if (obj->gtt_space != NULL)

		seq_printf(m, " (gtt offset: %08x, size: %08x)",

			   obj->gtt_offset, (unsigned int)obj->gtt_space->size);

	if (obj->stolen)

		seq_printf(m, " (stolen: %08lx)", obj->stolen->start);

	if (obj->pin_mappable || obj->fault_mappable) {

		char s[3], *t = s;

		if (obj->pin_mappable)

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -962,6 +962,8 @@ struct drm_i915_gem_object { 


	/** Current space allocated to this object in the GTT, if any. */

	struct drm_mm_node *gtt_space;

	/** Stolen memory for this object, instead of being backed by shmem. */

	struct drm_mm_node *stolen;

	struct list_head gtt_list;



	/** This object's place on the active/inactive lists */