From patchwork Mon Jun 22 12:02:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6655301 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3AED39F399 for ; Mon, 22 Jun 2015 12:00:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2F88E205EA for ; Mon, 22 Jun 2015 12:00:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2F812205E8 for ; Mon, 22 Jun 2015 12:00:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A24B06E1CE; Mon, 22 Jun 2015 05:00:10 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by gabe.freedesktop.org (Postfix) with ESMTP id A2DC36E1CE for ; Mon, 22 Jun 2015 05:00:09 -0700 (PDT) Received: by wgck11 with SMTP id k11so12057922wgc.0 for ; Mon, 22 Jun 2015 05:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=t0Fceu7ws5EAWdgpHY/TNxuLIRKDFtuixHoT7fdrl2o=; b=K7gV+Oh0/l543vBryi3SV6PHpJixdaf2o5Ry/A1UFhUOtpFH/cO+mBqzJbubkJd4CT 7N6ChyLen5qoNBr+J9waYAYPG6dTFRdEx4vrWuVQwVaitgL2XghEUpcEJoGGjQQ1JBG7 irQTV7sY+bs819XuDppWaidxvT3+/B5wVacEs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type:content-transfer-encoding; bh=t0Fceu7ws5EAWdgpHY/TNxuLIRKDFtuixHoT7fdrl2o=; b=BFiCJSmbcAVqCgFTfFrZkFuoHNzH9wwqb2V0jsMKxcin90CvwxsoClTLvDJ4zVFDHp VtocCIXxNIvttKrcsEV1lJ7oZqo8Xx4DsMwcuruV0+9q0wwn7Iiexbsv1GdCe0ENspIN huHx5HJWSz9QOZdoDJUaB3yXCF+PIRw5qmfBcFcT1dUTp7k5Zb4GlIl+Q1NA1pyoqlqa /QApkWH0L5zW0PJ6SBPt7Bkw3JP161xlMNjKcatM+8TPG9cJxuEuUX8jPLBVeschj8xn 5xDraNUh+U1vAwq6JRjcV1p469ckpZ6HneNOaT7nWZr8nB+SqN5eymXaOf3/WVd5EiTb xQ5A== X-Gm-Message-State: ALoCoQlnydytUEOr+AGLpgo8VvOGBr02ZWRBxlDKpTLRrlLs3vhmPnG1Jao9UlZxgwxef2zM9Aof X-Received: by 10.194.221.66 with SMTP id qc2mr725923wjc.80.1434974408927; Mon, 22 Jun 2015 05:00:08 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id f8sm16889033wiy.7.2015.06.22.05.00.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Jun 2015 05:00:08 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Mon, 22 Jun 2015 14:02:53 +0200 Message-Id: <1434974573-19528-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Daniel Vetter , =?UTF-8?q?Michel=20D=C3=A4nzer?= , DRI Development , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/vblank: WARN_ON nested use of drm_vblank_on/off X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We should never nest these since in theory kms drivers should know when a pipe is on/off and call the corresponding enable/disable functions for the vblank helper code only once. But for historical reasons (the shared-with-ums version of this code in modeset_pre/post needed to be able to cope with silly userspace that lost track of things) we still have this bit of "robustness" around. Enforce this with a WARN_ON, preparing to eventually rip out this special handling. Cc: Yogesh Mohan Marimuthu Cc: Gaurav K Singh Cc: Michel Dänzer Cc: Ville Syrjälä Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_irq.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index f9cc68fbd2a3..3819465abe22 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1219,6 +1219,8 @@ void drm_vblank_off(struct drm_device *dev, int crtc) vblank_disable_and_save(dev, crtc); wake_up(&vblank->queue); + WARN_ON(vblank->inmodeset); + /* * Prevent subsequent drm_vblank_get() from re-enabling * the vblank interrupt by bumping the refcount. @@ -1318,6 +1320,8 @@ void drm_vblank_on(struct drm_device *dev, int crtc) return; spin_lock_irqsave(&dev->vbl_lock, irqflags); + WARN_ON(!vblank->inmodeset); + /* Drop our private "prevent drm_vblank_get" refcount */ if (vblank->inmodeset) { atomic_dec(&vblank->refcount);