From patchwork Mon Jul 4 03:16:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ben Skeggs X-Patchwork-Id: 941402 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p643ORcW021105 for ; Mon, 4 Jul 2011 03:24:48 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 77F389E9FF for ; Sun, 3 Jul 2011 20:14:07 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vx0-f177.google.com (mail-vx0-f177.google.com [209.85.220.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 631539EC15 for ; Sun, 3 Jul 2011 20:13:43 -0700 (PDT) Received: by mail-vx0-f177.google.com with SMTP id 3so4252081vxd.36 for ; Sun, 03 Jul 2011 20:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=OshRuivGS7jypCCWzUzEOPISd83G5tndQn9nQX34zMw=; b=mA8aCM25lJ55RIk/6d77nSiMaFGpcjzloztigsy3eATMRi1+Kyc0RvKZJQj1m8I167 8ECSFsD0mA90MPRy2EeXFOaZjarB7O2SZ8NPmX2NN/d9sTurh1arMpjeKgWJLyqLqDka NSVY3MIvrkGeqzNyhtUSGeX13UdvTJjFy023c= Received: by 10.52.98.40 with SMTP id ef8mr7493206vdb.54.1309749223143; Sun, 03 Jul 2011 20:13:43 -0700 (PDT) Received: from nisroch.bne.redhat.com ([66.187.239.10]) by mx.google.com with ESMTPS id ha3sm2210292vbb.8.2011.07.03.20.13.40 (version=SSLv3 cipher=OTHER); Sun, 03 Jul 2011 20:13:42 -0700 (PDT) From: skeggsb@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm: make sure drm_vblank_init() has been called before touching vbl_lock Date: Mon, 4 Jul 2011 13:16:36 +1000 Message-Id: <1309749396-8422-1-git-send-email-skeggsb@gmail.com> X-Mailer: git-send-email 1.7.5.4 Cc: Ben Skeggs X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 04 Jul 2011 03:24:48 +0000 (UTC) From: Ben Skeggs Signed-off-by: Ben Skeggs Reviewed-by: Michel Dänzer --- drivers/gpu/drm/drm_irq.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 2022a5c..c3c87a1 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -397,13 +397,16 @@ int drm_irq_uninstall(struct drm_device *dev) /* * Wake up any waiters so they don't hang. */ - spin_lock_irqsave(&dev->vbl_lock, irqflags); - for (i = 0; i < dev->num_crtcs; i++) { - DRM_WAKEUP(&dev->vbl_queue[i]); - dev->vblank_enabled[i] = 0; - dev->last_vblank[i] = dev->driver->get_vblank_counter(dev, i); + if (dev->num_crtcs) { + spin_lock_irqsave(&dev->vbl_lock, irqflags); + for (i = 0; i < dev->num_crtcs; i++) { + DRM_WAKEUP(&dev->vbl_queue[i]); + dev->vblank_enabled[i] = 0; + dev->last_vblank[i] = + dev->driver->get_vblank_counter(dev, i); + } + spin_unlock_irqrestore(&dev->vbl_lock, irqflags); } - spin_unlock_irqrestore(&dev->vbl_lock, irqflags); if (!irq_enabled) return -EINVAL;