diff options
| author |   kettenis <kettenis@openbsd.org> | 2013-11-17 20:04:47 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2013-11-17 20:04:47 +0000 |
| commit | 3b2e9e14d9690f3f8dcb55e84a680a0abb567809 (patch) | |
| tree | 5d7bcd291132438cc57879d8930f4feee75f1aff | |
| parent | Implement DRM_IOCTL_I915_GEM_WAIT. Based on an earlier diff from jsg@ (diff) | |
| download | wireguard-openbsd-3b2e9e14d9690f3f8dcb55e84a680a0abb567809.tar.xz wireguard-openbsd-3b2e9e14d9690f3f8dcb55e84a680a0abb567809.zip | |
Remove some more dead code.
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.c | 20 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.h | 7 |
2 files changed, 2 insertions, 25 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index 19cb45311ab..e21b3689217 100644 --- a/sys/dev/pci/drm/i915/i915_drv.c +++ b/sys/dev/pci/drm/i915/i915_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.c,v 1.47 2013/11/17 18:47:13 kettenis Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.48 2013/11/17 20:04:47 kettenis Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -1630,24 +1630,6 @@ i915_reset(struct drm_device *dev) /* * Debug code from here. */ -#ifdef WATCH_INACTIVE -void -inteldrm_verify_inactive(struct inteldrm_softc *dev_priv, char *file, - int line) -{ - struct drm_obj *obj; - struct drm_i915_gem_object *obj_priv; - - TAILQ_FOREACH(obj_priv, &dev_priv->mm.inactive_list, list) { - obj = &obj_priv->base; - if (obj_priv->pin_count || obj_priv->active || - obj->write_domain & I915_GEM_GPU_DOMAINS) - DRM_ERROR("inactive %p (p $d a $d w $x) %s:%d\n", - obj, obj_priv->pin_count, obj_priv->active, - obj->write_domain, file, line); - } -} -#endif /* WATCH_INACTIVE */ #if (INTELDRM_DEBUG > 1) diff --git a/sys/dev/pci/drm/i915/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h index dab92b4dd39..a0fd90a4b0d 100644 --- a/sys/dev/pci/drm/i915/i915_drv.h +++ b/sys/dev/pci/drm/i915/i915_drv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.h,v 1.33 2013/11/17 18:47:13 kettenis Exp $ */ +/* $OpenBSD: i915_drv.h,v 1.34 2013/11/17 20:04:47 kettenis Exp $ */ /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*- */ /* @@ -1153,11 +1153,6 @@ void i915_hws_info(int); void i915_batchbuffer_info(int); void i915_ringbuffer_data(int); void i915_ringbuffer_info(int); -#ifdef WATCH_INACTIVE -void inteldrm_verify_inactive(struct inteldrm_softc *, char *, int); -#else -#define inteldrm_verify_inactive(dev,file,line) -#endif int i915_gem_object_unbind(struct drm_i915_gem_object *); int i915_wait_seqno(struct intel_ring_buffer *, uint32_t); |