From patchwork Wed Jun 15 12:17:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9178343 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E83276021C for ; Wed, 15 Jun 2016 12:18:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8BDA27C26 for ; Wed, 15 Jun 2016 12:18:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD02A27BFC; Wed, 15 Jun 2016 12:18:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D424127BFC for ; Wed, 15 Jun 2016 12:18:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E0A36E914; Wed, 15 Jun 2016 12:18:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6772B6E912; Wed, 15 Jun 2016 12:18:45 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id 187so3568866wmz.1; Wed, 15 Jun 2016 05:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=d4W38mafplpmKMNyWuC6b/NCZx6XGZGlrHHC2e8Rksw=; b=I0J1lxMviqCaOEf563PlrQiSlYLnBQZItcHfhqsuQ4p9yF/L8vrTX38j9+84P9plIL 1kX1nGwlIw/awRtBau+iaooCoa+CzGZuyy7lF5xZbSQoXv2/osOifQjdWLu2mmJ8TcfI 719NoAbJRM6XvZuWZpeyxijojs/Cc74J8UXHJmIu0W5mAioGr7SrHPwAJETR2rjNiLXy hZmvpoDCn5nncZhZOjZ6bdyEt1PZFAP5dMidYbHxnsi5aOfAhpXCAXuT6NAhgv/rnDT9 F1KkLuaDxaQc58P/ZF/gL72PjwWxExBigPMoxlMI1cF0pnK1RZGclHlGXsk14RFqPOdT w9CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=d4W38mafplpmKMNyWuC6b/NCZx6XGZGlrHHC2e8Rksw=; b=PPELn2ogDqqluSf3IwwCDiNWv9Q9tv6oXUj9kpOdUqodNCd3HHckhQXE9mM97QLf5o 1vpZS2mukeYXPiFG0pJ+Ay1dm9BvLNZyrccX/bMlB7P3nd+o38uK+opboIWiLZXSuZve OBRsVtUWp4Kk2BFenr4Ldcvgmc1l3eYZLzw92kpApNcgtgTftosT5Zpm2uwrjNXpJagG jIrD/Gb2VyhzWCgTyTZW4RYEzCxXu7brAy3SneiFzveXZAlLv0/So1q0a+yLFQMCVkF9 zVtMoyBuqdCcLUw9LFCCPMAA0NzT2DU68ZrxbcxnsdsqcBq+5yOVWEgT5118nJVa7/+H hXKQ== X-Gm-Message-State: ALyK8tLUJnGoK/9hIXyZC/l3SesvzYSxBhUTuhEomh4RTiLjNXBROM4LRWL0wwzUNbtZzg== X-Received: by 10.194.79.198 with SMTP id l6mr11054999wjx.27.1465993123663; Wed, 15 Jun 2016 05:18:43 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id jf3sm7450242wjb.41.2016.06.15.05.18.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2016 05:18:42 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Subject: [PATCH 04/44] drm: Automatically unregister the connector during cleanup Date: Wed, 15 Jun 2016 13:17:49 +0100 Message-Id: <1465993109-19523-5-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> References: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> Cc: Daniel Vetter , Dave Airlie , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP As we now can call drm_connector_unregister() multiple times, provide a failsafe unregister for a connector when cleaning it up. v2: Add a WARN to catch any connectors that are still visible to userspace when we come to destoy them. Signed-off-by: Chris Wilson Cc: Dave Airlie Cc: dri-devel@lists.freedesktop.org Reviewed-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index ea5ec641eacc..316dea9bea08 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -938,6 +938,12 @@ void drm_connector_cleanup(struct drm_connector *connector) struct drm_device *dev = connector->dev; struct drm_display_mode *mode, *t; + /* The connector should have been removed from userspace long before + * it is finally destroyed. + */ + if (WARN_ON(connector->registered)) + drm_connector_unregister(connector); + if (connector->tile_group) { drm_mode_put_tile_group(dev, connector->tile_group); connector->tile_group = NULL;