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

Commit 0079a7df authored by Brad Volkin's avatar Brad Volkin Committed by Daniel Vetter
Browse files

drm/i915: Mark shadow batch buffers as purgeable 



By adding a new exec_entry flag, we cleanly mark the shadow objects
as purgeable after they are on the active list.

v2:
- Move 'shadow_batch_obj->madv = I915_MADV_WILLNEED' inside _get
  fnc (danvet, from v4 6/7 feedback)

v3:
- Remove duplicate 'madv = I915_MADV_WILLNEED' (danvet, from v6 4/5)

Issue: VIZ-4719
Signed-off-by: default avatarBrad Volkin <bradley.d.volkin@intel.com>
Reviewed-By: default avatarJon Bloomfield <jon.bloomfield@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b9ffd80e

drivers/gpu/drm/i915/i915_gem_batch_pool.c

+2 −0
Original line number Diff line number Diff line
@@ -131,5 +131,7 @@ i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool, 
		/* Keep list in LRU order */

		list_move_tail(&obj->batch_pool_list, &pool->cache_list);



	obj->madv = I915_MADV_WILLNEED;



	return obj;

}

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+8 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define  __EXEC_OBJECT_HAS_FENCE (1<<30)

#define  __EXEC_OBJECT_NEEDS_MAP (1<<29)

#define  __EXEC_OBJECT_NEEDS_BIAS (1<<28)

#define  __EXEC_OBJECT_PURGEABLE (1<<27)



#define BATCH_OFFSET_BIAS (256*1024)
@@ -226,7 +227,12 @@ i915_gem_execbuffer_unreserve_vma(struct i915_vma *vma) 
	if (entry->flags & __EXEC_OBJECT_HAS_PIN)

		vma->pin_count--;



	entry->flags &= ~(__EXEC_OBJECT_HAS_FENCE | __EXEC_OBJECT_HAS_PIN);

	if (entry->flags & __EXEC_OBJECT_PURGEABLE)

		obj->madv = I915_MADV_DONTNEED;



	entry->flags &= ~(__EXEC_OBJECT_HAS_FENCE |

			  __EXEC_OBJECT_HAS_PIN |

			  __EXEC_OBJECT_PURGEABLE);

}



static void eb_destroy(struct eb_vmas *eb)
@@ -1436,6 +1442,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 


			vma = i915_gem_obj_to_ggtt(shadow_batch_obj);

			vma->exec_entry = &shadow_exec_entry;

			vma->exec_entry->flags = __EXEC_OBJECT_PURGEABLE;

			drm_gem_object_reference(&shadow_batch_obj->base);

			list_add_tail(&vma->exec_list, &eb->vmas);