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

Commit 97d1ebaf authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/debug: Remove defunct WATCH_LRU 



This has bitrotted through inuse and superseded by tracing and debugfs.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent f573c660

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ enum plane { 
#define WATCH_COHERENCY	0

#define WATCH_BUF	0

#define WATCH_EXEC	0

#define WATCH_LRU	0

#define WATCH_RELOC	0

#define WATCH_INACTIVE	0

#define WATCH_PWRITE	0
@@ -1089,7 +1088,6 @@ void i915_verify_inactive(struct drm_device *dev, char *file, int line); 
void i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle);

void i915_gem_dump_object(struct drm_gem_object *obj, int len,

			  const char *where, uint32_t mark);

void i915_dump_lru(struct drm_device *dev, const char *where);



/* i915_debugfs.c */

int i915_debugfs_init(struct drm_minor *minor);

drivers/gpu/drm/i915/i915_gem.c

+0 −16
Original line number Diff line number Diff line
@@ -1865,12 +1865,6 @@ i915_gem_retire_requests_ring(struct drm_device *dev, 
			break;



		obj = &obj_priv->base;



#if WATCH_LRU

		DRM_INFO("%s: retire %d moves to inactive list %p\n",

			 __func__, request->seqno, obj);

#endif



		if (obj->write_domain != 0)

			i915_gem_object_move_to_flushing(obj);

		else
@@ -2646,9 +2640,6 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) 
		/* If the gtt is empty and we're still having trouble

		 * fitting our object in, we're out of memory.

		 */

#if WATCH_LRU

		DRM_INFO("%s: GTT full, evicting something\n", __func__);

#endif

		ret = i915_gem_evict_something(dev, obj->size, alignment);

		if (ret)

			return ret;
@@ -3950,18 +3941,11 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
		obj_priv = to_intel_bo(obj);



		i915_gem_object_move_to_active(obj, ring);

#if WATCH_LRU

		DRM_INFO("%s: move to exec list %p\n", __func__, obj);

#endif

	}



	i915_add_request(dev, file_priv, request, ring);

	request = NULL;



#if WATCH_LRU

	i915_dump_lru(dev, __func__);

#endif



	i915_verify_inactive(dev, __FILE__, __LINE__);



err:

drivers/gpu/drm/i915/i915_gem_debug.c

+0 −35
Original line number Diff line number Diff line
@@ -97,41 +97,6 @@ i915_gem_dump_object(struct drm_gem_object *obj, int len, 
}

#endif



#if WATCH_LRU

void

i915_dump_lru(struct drm_device *dev, const char *where)

{

	drm_i915_private_t		*dev_priv = dev->dev_private;

	struct drm_i915_gem_object	*obj_priv;



	DRM_INFO("active list %s {\n", where);

	spin_lock(&dev_priv->mm.active_list_lock);

	list_for_each_entry(obj_priv, &dev_priv->mm.active_list,

			    list)

	{

		DRM_INFO("    %p: %08x\n", obj_priv,

			 obj_priv->last_rendering_seqno);

	}

	spin_unlock(&dev_priv->mm.active_list_lock);

	DRM_INFO("}\n");

	DRM_INFO("flushing list %s {\n", where);

	list_for_each_entry(obj_priv, &dev_priv->mm.flushing_list,

			    list)

	{

		DRM_INFO("    %p: %08x\n", obj_priv,

			 obj_priv->last_rendering_seqno);

	}

	DRM_INFO("}\n");

	DRM_INFO("inactive %s {\n", where);

	list_for_each_entry(obj_priv, &dev_priv->mm.inactive_list, list) {

		DRM_INFO("    %p: %08x\n", obj_priv,

			 obj_priv->last_rendering_seqno);

	}

	DRM_INFO("}\n");

}

#endif





#if WATCH_COHERENCY

void

i915_gem_object_check_coherency(struct drm_gem_object *obj, int handle)

drivers/gpu/drm/i915/i915_gem_evict.c

+0 −3
Original line number Diff line number Diff line
@@ -190,9 +190,6 @@ found: 
	/* Unbinding will emit any required flushes */

	list_for_each_entry_safe(obj_priv, tmp_obj_priv,

				 &eviction_list, evict_list) {

#if WATCH_LRU

		DRM_INFO("%s: evicting %p\n", __func__, &obj_priv->base);

#endif

		ret = i915_gem_object_unbind(&obj_priv->base);

		if (ret)

			return ret;