]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/irq: BUG_ON() -> WARN_ON()
authorRob Clark <robdclark@gmail.com>
Sat, 8 Nov 2014 15:16:19 +0000 (10:16 -0500)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 12 Oct 2017 14:28:15 +0000 (15:28 +0100)
commit 7f907bf284ba7bb8d271f094b226699d3fef2142 upstream.

Let's make things a bit easier to debug when things go bad (potentially
under console_lock).

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/drm/drm_irq.c

index 0de123afdb346164d278bf801424629e2059b242..990e5ac8b18d0829b1612b990e31e3c84f6511ef 100644 (file)
@@ -973,7 +973,8 @@ EXPORT_SYMBOL(drm_crtc_vblank_get);
  */
 void drm_vblank_put(struct drm_device *dev, int crtc)
 {
-       BUG_ON(atomic_read(&dev->vblank[crtc].refcount) == 0);
+       if (WARN_ON(atomic_read(&dev->vblank[crtc].refcount) == 0))
+               return;
 
        /* Last user schedules interrupt disable */
        if (atomic_dec_and_test(&dev->vblank[crtc].refcount) &&