Skip to content

Commit

Permalink
drm/i915: Remove i915_gem_object_check_coherency()
Browse files Browse the repository at this point in the history
This code was dead since:

  commit 432e58e
  Author: Chris Wilson <chris@chris-wilson.co.uk>
  Date:   Thu Nov 25 19:32:06 2010 +0000

      drm/i915: Avoid allocation for execbuffer object list

so just put it to rest for good.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Damien Lespiau authored and Daniel Vetter committed Aug 9, 2013
1 parent a236716 commit ac44bfa
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 72 deletions.
3 changes: 0 additions & 3 deletions drivers/gpu/drm/i915/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ struct intel_ddi_plls {
#define DRIVER_MINOR 6
#define DRIVER_PATCHLEVEL 0

#define WATCH_COHERENCY 0
#define WATCH_LISTS 0
#define WATCH_GTT 0

Expand Down Expand Up @@ -2036,8 +2035,6 @@ int i915_verify_lists(struct drm_device *dev);
#else
#define i915_verify_lists(dev) 0
#endif
void i915_gem_object_check_coherency(struct drm_i915_gem_object *obj,
int handle);

/* i915_debugfs.c */
int i915_debugfs_init(struct drm_minor *minor);
Expand Down
69 changes: 0 additions & 69 deletions drivers/gpu/drm/i915/i915_gem_debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,72 +116,3 @@ i915_verify_lists(struct drm_device *dev)
return warned = err;
}
#endif /* WATCH_INACTIVE */

#if WATCH_COHERENCY
void
i915_gem_object_check_coherency(struct drm_i915_gem_object *obj, int handle)
{
struct drm_device *dev = obj->base.dev;
int page;
uint32_t *gtt_mapping;
uint32_t *backing_map = NULL;
int bad_count = 0;

DRM_INFO("%s: checking coherency of object %p@0x%08x (%d, %zdkb):\n",
__func__, obj, obj->gtt_offset, handle,
obj->size / 1024);

gtt_mapping = ioremap(dev_priv->mm.gtt_base_addr + obj->gtt_offset,
obj->base.size);
if (gtt_mapping == NULL) {
DRM_ERROR("failed to map GTT space\n");
return;
}

for (page = 0; page < obj->size / PAGE_SIZE; page++) {
int i;

backing_map = kmap_atomic(obj->pages[page]);

if (backing_map == NULL) {
DRM_ERROR("failed to map backing page\n");
goto out;
}

for (i = 0; i < PAGE_SIZE / 4; i++) {
uint32_t cpuval = backing_map[i];
uint32_t gttval = readl(gtt_mapping +
page * 1024 + i);

if (cpuval != gttval) {
DRM_INFO("incoherent CPU vs GPU at 0x%08x: "
"0x%08x vs 0x%08x\n",
(int)(obj->gtt_offset +
page * PAGE_SIZE + i * 4),
cpuval, gttval);
if (bad_count++ >= 8) {
DRM_INFO("...\n");
goto out;
}
}
}
kunmap_atomic(backing_map);
backing_map = NULL;
}

out:
if (backing_map != NULL)
kunmap_atomic(backing_map);
iounmap(gtt_mapping);

/* give syslog time to catch up */
msleep(1);

/* Directly flush the object, since we just loaded values with the CPU
* from the backing pages and we don't want to disturb the cache
* management that we're trying to observe.
*/

i915_gem_clflush_object(obj);
}
#endif

0 comments on commit ac44bfa

Please sign in to comment.