commit d519de63cb6e3b603e42a067291de2dadc0eb15a
author Dave Barnish <dave.barnish@arm.com> Thu May 02 13:58:10 2013 +0100
committer Dave Barnish <dave.barnish@arm.com> Tue May 07 10:15:03 2013 +0100
tree cd0c088c45838b672def29f7c441b406d6fba111
parent 982518c9f26222820982c2b10ec8c06b31698fc2

Added asserts for non-zero refcounts in armsoc_bo operations.

Change-Id: I78d3387dde7adc48a09785ff32a6503b708b439d

src/armsoc_dumb.c

diff --git a/src/armsoc_dumb.c b/src/armsoc_dumb.c
index 5ac3a58..e24861f 100644
--- a/src/armsoc_dumb.c
+++ b/src/armsoc_dumb.c
@@ -83,6 +83,7 @@
 	int res;
 	struct drm_prime_handle prime_handle;
 
+	assert(bo->refcnt > 0);
 	assert(!armsoc_bo_has_dmabuf(bo));
 
 	/* Try to get dma_buf fd */
@@ -102,6 +103,7 @@
 
 void armsoc_bo_clear_dmabuf(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	assert(armsoc_bo_has_dmabuf(bo));
 
 	close(bo->dmabuf);
@@ -110,6 +112,7 @@
 
 int armsoc_bo_has_dmabuf(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	return bo->dmabuf >= 0;
 }
 
@@ -172,8 +175,8 @@
 
 	if (!bo)
 		return;
-
-	assert(!armsoc_bo_has_dmabuf(bo));
+	assert(bo->refcnt == 0);
+	assert(bo->dmabuf < 0);
 
 	if (bo->map_addr)
 	{
@@ -217,6 +220,7 @@
 	int ret;
 	struct drm_gem_flink flink;
 
+	assert(bo->refcnt > 0);
 	flink.handle = bo->handle;
 
 	ret = drmIoctl(bo->dev->fd, DRM_IOCTL_GEM_FLINK, &flink);
@@ -229,42 +233,50 @@
 
 uint32_t armsoc_bo_handle(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	return bo->handle;
 }
 
 uint32_t armsoc_bo_size(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	return bo->size;
 }
 
 uint32_t armsoc_bo_width(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	return bo->width;
 }
 
 uint32_t armsoc_bo_height(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	return bo->height;
 }
 
 uint32_t armsoc_bo_bpp(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	return bo->bpp;
 }
 
 /* Bytes per pixel */
 uint32_t armsoc_bo_Bpp(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	return (bo->bpp + 7) / 8;
 }
 
 uint32_t armsoc_bo_pitch(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	return bo->pitch;
 }
 
 void *armsoc_bo_map(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	if (!bo->map_addr)
 	{
 		struct drm_mode_map_dumb map_dumb;
@@ -291,6 +303,7 @@
 {
 	int ret = 0;
 
+	assert(bo->refcnt > 0);
 	if(armsoc_bo_has_dmabuf(bo))
 	{
 		fd_set fds;
@@ -317,6 +330,7 @@
 
 int armsoc_bo_cpu_fini(struct armsoc_bo *bo, enum armsoc_gem_op op)
 {
+	assert(bo->refcnt > 0);
 	return msync(bo->map_addr, bo->size, MS_SYNC | MS_INVALIDATE);
 }
 
@@ -324,6 +338,7 @@
 {
 	int ret;
 
+	assert(bo->refcnt > 0);
 	assert(bo->fb_id == 0);
 
 	ret = drmModeAddFB(bo->dev->fd, bo->width, bo->height, bo->depth,
@@ -338,6 +353,7 @@
 
 uint32_t armsoc_bo_get_fb(struct armsoc_bo *bo)
 {
+	assert(bo->refcnt > 0);
 	return bo->fb_id;
 }
 
@@ -345,6 +361,7 @@
 {
 	unsigned char *dst;
 
+	assert(bo->refcnt > 0);
 	if (!(dst = armsoc_bo_map(bo))) {
 		xf86DrvMsg(-1, X_ERROR,
 				"Couldn't map scanout bo\n");