---

yaml --- r: 117237 b: refs/heads/master c: 35ad68c h: refs/heads/master i: 117235: 8a9538a v: v3
git-mirror · Oct 23, 2008 · 81ee39b · 81ee39b
1 parent f6cda9f
commit 81ee39b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 786225eb2f4e55b5dda3cf8c62a145e824aae199
+refs/heads/master: 35ad68c18148a18938ff4f40e945c9734e7d2265
diff --git a/trunk/drivers/gpu/drm/drm_irq.c b/trunk/drivers/gpu/drm/drm_irq.c
@@ -594,11 +594,14 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
 			goto done;
 		}
 
+		/* Get a refcount on the vblank, which will be released by
+		 * drm_vbl_send_signals().
+		 */
 		ret = drm_vblank_get(dev, crtc);
 		if (ret) {
 			drm_free(vbl_sig, sizeof(struct drm_vbl_sig),
 				 DRM_MEM_DRIVER);
-			return ret;
+			goto done;
 		}
 
 		atomic_inc(&dev->vbl_signal_pending);

diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -771,6 +771,7 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
 		    vbl_swap->plane == plane &&
 		    vbl_swap->sequence == swap->sequence) {
 			spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
+			drm_vblank_put(dev, pipe);
 			DRM_DEBUG("Already scheduled\n");
 			return 0;
 		}