From patchwork Wed May 24 14:51:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9746159 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 630D760209 for ; Wed, 24 May 2017 14:53:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 592652852A for ; Wed, 24 May 2017 14:53:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DF2F2877B; Wed, 24 May 2017 14:53:47 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM,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 DC9972852A for ; Wed, 24 May 2017 14:53:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 192FF6E7A4; Wed, 24 May 2017 14:52:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3308E6E78B for ; Wed, 24 May 2017 14:52:41 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id d127so47736603wmf.1 for ; Wed, 24 May 2017 07:52:41 -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=42QhBVpof2DN/nYNwhvSPJ8EKrAPnr9+kus3i4rnZLM=; b=GX9WUhokuQ62qXK/i3WIRrzdQAd2EUyBgbMfvEGJJ2Gndp6qO4jWZP4yQNBGY3Djm+ LEEE1LqCBNifCJ1t5nrLyATE5M21b8LbOO6Jos8uN6dsVtmE7Ye4LZhLe5A+yfIuobcK 3WOnUmyEC8BsmLDac62KigaHP0FGBGMFr5ro0= 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=42QhBVpof2DN/nYNwhvSPJ8EKrAPnr9+kus3i4rnZLM=; b=qB7M+sjOgNtZmIStgAm/Hr9qFTdzQLJx+8Dk42M52qHthWpPlVYbStjiSCP3XfKp2x b7dyw/ABXHgFiuECF1yowmun56J3XfXpNehbKOXLkriGYKzv1j1JADvVcIktEedaDdK4 EYcFHlpLl3UaCzxMnXTnNr+VPOdoVDmzZrTETNmLDPE4XnLIVhkRvNZx5ikUBgJ3wrcQ 0wCOgXuQqjOcOaHIZ7zJHkGdrbsezJNfF2i/PmExUt38djGVhe0phTnqpvr8Bf4Z7kiR 9/Mn1ZPfQMV7gsE00MF83Uoq5KcG1jdDbBpCeJtnJrQOVHbzyiC/Yy3+lT80D3A9Dv66 P6xw== X-Gm-Message-State: AODbwcBLOT1OkLiw9lJe7DHn2WXEpdmB3qMJ4vNaT5z0764evHkoYY4S g+Fdnu6n6O/c2zFWW58= X-Received: by 10.80.182.35 with SMTP id b32mr25771064ede.123.1495637559468; Wed, 24 May 2017 07:52:39 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id m9sm1778858edm.62.2017.05.24.07.52.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 07:52:38 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 16/37] drm/hdlcd|mali: Drop drm_vblank_cleanup Date: Wed, 24 May 2017 16:51:51 +0200 Message-Id: <20170524145212.27837-17-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170524145212.27837-1-daniel.vetter@ffwll.ch> References: <20170524145212.27837-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Liviu Dudau , 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 IRQs are properly shut down, so it almost works as race-free shutdown. Except the irq is stopped after the vblank stuff, so boom anyway. Proper way would be to call drm_atomic_helper_shutdown before any of the kms things gets stopped. So no harm in removing the drm_vblank_cleanup here really. Same story for both hdlcd and mali. v2: Move misplaced malidp hunk to this patch (Liviu). Cc: Liviu Dudau Cc: Brian Starkey Signed-off-by: Daniel Vetter Acked-by: Liviu Dudau --- drivers/gpu/drm/arm/hdlcd_drv.c | 2 -- drivers/gpu/drm/arm/malidp_drv.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index 0f49c4b12772..345c8357b273 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -340,7 +340,6 @@ static int hdlcd_drm_bind(struct device *dev) } err_fbdev: drm_kms_helper_poll_fini(drm); - drm_vblank_cleanup(drm); err_vblank: pm_runtime_disable(drm->dev); err_pm_active: @@ -368,7 +367,6 @@ static void hdlcd_drm_unbind(struct device *dev) } drm_kms_helper_poll_fini(drm); component_unbind_all(dev, drm); - drm_vblank_cleanup(drm); pm_runtime_get_sync(drm->dev); drm_irq_uninstall(drm); pm_runtime_put_sync(drm->dev); diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 0d3eb537d08b..01b13d219917 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -652,7 +652,6 @@ static int malidp_bind(struct device *dev) drm_kms_helper_poll_fini(drm); fbdev_fail: pm_runtime_get_sync(dev); - drm_vblank_cleanup(drm); vblank_fail: malidp_se_irq_fini(drm); malidp_de_irq_fini(drm); @@ -692,7 +691,6 @@ static void malidp_unbind(struct device *dev) } drm_kms_helper_poll_fini(drm); pm_runtime_get_sync(dev); - drm_vblank_cleanup(drm); malidp_se_irq_fini(drm); malidp_de_irq_fini(drm); component_unbind_all(dev, drm);