CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/dist/drm/i915

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Sep  8 16:02:21 UTC 2013

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]:
            intel_ringbuffer.c

Log Message:
More error branch cleanup.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.8 -r1.1.1.1.2.9 \
    src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.1.1.1.2.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.1.1.1.2.9
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c:1.1.1.1.2.8	Sun Sep  8 15:54:20 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c	Sun Sep  8 16:02:21 2013
@@ -1180,12 +1180,12 @@ static int intel_init_ring_buffer(struct
 	if (I915_NEED_GFX_HWS(dev)) {
 		ret = init_status_page(ring);
 		if (ret)
-			return ret;
+			goto err_waitqueue;
 	} else {
 		BUG_ON(ring->id != RCS);
 		ret = init_phys_hws_pga(ring);
 		if (ret)
-			return ret;
+			goto err_waitqueue;
 	}
 
 	obj = i915_gem_alloc_object(dev, ring->size);
@@ -1254,6 +1254,10 @@ err_unref:
 	ring->obj = NULL;
 err_hws:
 	cleanup_status_page(ring);
+err_waitqueue:
+#ifdef __NetBSD__
+	DRM_DESTROY_WAITQUEUE(&ring->irq_queue);
+#endif
 	return ret;
 }