From 9afd5b1c521d0761b2ea2564a556baa1be4a15b2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= <ftigeot@wolfpond.org>
Date: Sun, 9 Nov 2014 14:16:33 +0100
Subject: [PATCH] drm: Remove some useless macros

---
 sys/dev/drm/i915/i915_gem.c       |  3 ---
 sys/dev/drm/include/drm/drmP.h    |  7 -------
 sys/dev/drm/radeon/radeon_fence.c | 10 ----------
 sys/dev/drm/ttm/ttm_lock.c        |  2 --
 4 files changed, 22 deletions(-)

diff --git a/sys/dev/drm/i915/i915_gem.c b/sys/dev/drm/i915/i915_gem.c
index 2233aaa815..e726aa525e 100644
--- a/sys/dev/drm/i915/i915_gem.c
+++ b/sys/dev/drm/i915/i915_gem.c
@@ -931,13 +931,10 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
 		goto out;
 
 	size = round_page(args->size);
-	PROC_LOCK(p);
 	if (map->size + size > p->p_rlimit[RLIMIT_VMEM].rlim_cur) {
-		PROC_UNLOCK(p);
 		error = ENOMEM;
 		goto out;
 	}
-	PROC_UNLOCK(p);
 
 	addr = 0;
 	vm_object_hold(obj->vm_obj);
diff --git a/sys/dev/drm/include/drm/drmP.h b/sys/dev/drm/include/drm/drmP.h
index 50f5ec70d5..a2f778ac45 100644
--- a/sys/dev/drm/include/drm/drmP.h
+++ b/sys/dev/drm/include/drm/drmP.h
@@ -1609,16 +1609,9 @@ static __inline__ void drm_core_dropmap(struct drm_map *map)
 #include <drm/drm_mem_util.h>
 
 /* FreeBSD compatibility macros */
-#define PROC_LOCK(p)
-#define PROC_UNLOCK(p)
-
-#define VM_OBJECT_RLOCK(object)		VM_OBJECT_LOCK(object)
-#define VM_OBJECT_RUNLOCK(object)	VM_OBJECT_UNLOCK(object)
 #define VM_OBJECT_WLOCK(object)		VM_OBJECT_LOCK(object)
 #define VM_OBJECT_WUNLOCK(object)	VM_OBJECT_UNLOCK(object)
 
-#define CTR2(one,two,three,four)
-
 #define DRM_PCIE_SPEED_25 1
 #define DRM_PCIE_SPEED_50 2
 #define DRM_PCIE_SPEED_80 4
diff --git a/sys/dev/drm/radeon/radeon_fence.c b/sys/dev/drm/radeon/radeon_fence.c
index b7cc9b722b..0ac380685c 100644
--- a/sys/dev/drm/radeon/radeon_fence.c
+++ b/sys/dev/drm/radeon/radeon_fence.c
@@ -115,7 +115,6 @@ int radeon_fence_emit(struct radeon_device *rdev,
 	(*fence)->seq = ++rdev->fence_drv[ring].sync_seq[ring];
 	(*fence)->ring = ring;
 	radeon_fence_ring_emit(rdev, ring, *fence);
-	CTR2(KTR_DRM, "radeon fence: emit (ring=%d, seq=%d)", ring, (*fence)->seq);
 	return 0;
 }
 
@@ -300,9 +299,6 @@ static int radeon_fence_wait_seq(struct radeon_device *rdev, u64 target_seq,
 		/* Save current last activity valuee, used to check for GPU lockups */
 		last_activity = rdev->fence_drv[ring].last_activity;
 
-		CTR2(KTR_DRM, "radeon fence: wait begin (ring=%d, seq=%d)",
-		    ring, seq);
-
 		radeon_irq_kms_sw_irq_get(rdev, ring);
 		fence_queue_locked = false;
 		r = 0;
@@ -337,8 +333,6 @@ static int radeon_fence_wait_seq(struct radeon_device *rdev, u64 target_seq,
 		if (unlikely(r == EINTR || r == ERESTART)) {
 			return -r;
 		}
-		CTR2(KTR_DRM, "radeon fence: wait end (ring=%d, seq=%d)",
-		    ring, seq);
 
 		if (unlikely(!signaled)) {
 #ifndef __FreeBSD__
@@ -490,8 +484,6 @@ static int radeon_fence_wait_any_seq(struct radeon_device *rdev,
 			timeout = 1;
 		}
 
-		CTR2(KTR_DRM, "radeon fence: wait begin (ring=%d, target_seq=%d)",
-		    ring, target_seq[ring]);
 		for (i = 0; i < RADEON_NUM_RINGS; ++i) {
 			if (target_seq[i]) {
 				radeon_irq_kms_sw_irq_get(rdev, i);
@@ -534,8 +526,6 @@ static int radeon_fence_wait_any_seq(struct radeon_device *rdev,
 		if (unlikely(r == EINTR || r == ERESTART)) {
 			return -r;
 		}
-		CTR2(KTR_DRM, "radeon fence: wait end (ring=%d, target_seq=%d)",
-		    ring, target_seq[ring]);
 
 		if (unlikely(!signaled)) {
 #ifndef __FreeBSD__
diff --git a/sys/dev/drm/ttm/ttm_lock.c b/sys/dev/drm/ttm/ttm_lock.c
index c70c1401f1..79c7c302ae 100644
--- a/sys/dev/drm/ttm/ttm_lock.c
+++ b/sys/dev/drm/ttm/ttm_lock.c
@@ -64,9 +64,7 @@ ttm_lock_send_sig(int signo)
 	struct proc *p;
 
 	p = curproc;	/* XXXKIB curthread ? */
-	PROC_LOCK(p);
 	ksignal(p, signo);
-	PROC_UNLOCK(p);
 }
 
 void ttm_read_unlock(struct ttm_lock *lock)
-- 
2.41.0