From patchwork Wed Jun 21 08:28:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9801145 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 4B8376038C for ; Wed, 21 Jun 2017 08:29:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3906128548 for ; Wed, 21 Jun 2017 08:29:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C28928550; Wed, 21 Jun 2017 08:29:11 +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]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EFF5828548 for ; Wed, 21 Jun 2017 08:29:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BFA6A6E433; Wed, 21 Jun 2017 08:29:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x242.google.com (mail-qt0-x242.google.com [IPv6:2607:f8b0:400d:c0d::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id D64796E42D for ; Wed, 21 Jun 2017 08:29:04 +0000 (UTC) Received: by mail-qt0-x242.google.com with SMTP id s33so26360200qtg.3 for ; Wed, 21 Jun 2017 01:29:04 -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:in-reply-to:references; bh=7vo5lVsOno9uWpjT1CyCjSGIclEsfnTRiTo/wJv8x5k=; b=jUxMTUDqFhfGqQWNuYwXlUXtmWtDFxIelCI9vIOeKCE13bG1QWC6wudcGjzHFE0vSi Qy1uXlW6r6+ai707fV7K8VpZX/gqppBDUKxt+h6F0tbGt9xm1AH/kB6MrkZlM47I7V5N xmMO6kzpHdxFwkqVG1IGD1FCCaRquPuI74vAM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7vo5lVsOno9uWpjT1CyCjSGIclEsfnTRiTo/wJv8x5k=; b=BoreNcW/lOHSr1vV8TW4Z5fwR6rb5gVHnv5+BZjCnJa+iKkfSehJGbNKmnf9Uy2MoK QFJvYze6UICMR5Sg9vpFcfTefYWkC+yaGkCfqNyrQD4RDVpvA4IH78w4/J9hPdccXvmw 8cZDhJRyDhqbhzaqIOLAkasdpfxzsLxjYxxEJNEC8yrgxljaVhlV6dTx6/4GSdSCaK8q uGIyGeY6mRB4Mx3xWnRuJMvrNMX3w7jR/Bvw0KNjqh8UCJIF2gfvIO2yjF4f3oW85J3J gL+otpHGQJ3ISbASqQerlOnEhEtrN0iKPrPqW9JRFtGJ3myvuWMj6a5flqLqcKnwQ47U Ccjw== X-Gm-Message-State: AKS2vOzzmT833yGEJ81+ot2kJjb1Rs6Z3FlXm1tBHyWl2py4B0qrnS32 hZTrPlxRzE25F/b7sFQ= X-Received: by 10.80.151.221 with SMTP id f29mr23905964edb.126.1498033743692; Wed, 21 Jun 2017 01:29:03 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id i38sm8730912eda.18.2017.06.21.01.29.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Jun 2017 01:29:02 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 02/13] drm/hibmc: Drop drm_vblank_cleanup Date: Wed, 21 Jun 2017 10:28:39 +0200 Message-Id: <20170621082850.13224-3-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170621082850.13224-1-daniel.vetter@ffwll.ch> References: <20170621082850.13224-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Xinliang Liu , Xinwei Kong , Chen Feng , Rongrong Zou , Daniel Vetter 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 So this seems to be the first driver that does it the right way round, so fix it up by calling drm_atomic_helper_shutdown instead. We need to do that before the last kms user is gone (fbdev emulation), but before we start shutting down hw stuff like interrupts. Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Signed-off-by: Daniel Vetter --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c index 2ffdbf9801bd..4d018ca98581 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c @@ -276,11 +276,12 @@ static int hibmc_unload(struct drm_device *dev) hibmc_fbdev_fini(priv); + drm_atomic_helper_shutdown(dev); + if (dev->irq_enabled) drm_irq_uninstall(dev); if (priv->msi_enabled) pci_disable_msi(dev->pdev); - drm_vblank_cleanup(dev); hibmc_kms_fini(priv); hibmc_mm_fini(priv);