From patchwork Wed Dec 5 18:16:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 10714725 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F99418B8 for ; Wed, 5 Dec 2018 18:17:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F3AE2E003 for ; Wed, 5 Dec 2018 18:17:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32FB92E019; Wed, 5 Dec 2018 18:17:26 +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=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D05D62E004 for ; Wed, 5 Dec 2018 18:17:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=nO+fQmvvEP3+tBVuYnbbvaX2GiceQ9C/fIpr1iezBXU=; b=EbqrrzpNC1Iw+b jVFGpHkN0JznylcUZFlVvzdm2ll1O9W55EEls3neIGBBGGzaJVNRJ2wv1RfH9k2/gbFSksM0Zm0hX gqz7VsPi0zoa02TNv1PfNkp4XeqlnqoMkjgo+5o/FrLfjP7Zgt6Jfybdk2nlw+vTYF3e53zZjqR8A YueV/V47/u2oxG9UbyGejL97JzL544trgpn5V3w4ZOnClBwQLDKr5CKjt3YgZ++dARbK5jFIeJqH2 ZvukJJ636qZyUOyy9JqiYrYbrFiMLHqytAvBtfx0bZbKSERytpyy386BGXkLxC0vitsQVVUDbDxzA Y+fogX3hnM0KXW4pLHCA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUbjd-00049a-R2; Wed, 05 Dec 2018 18:17:21 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUbja-00048f-63 for linux-rockchip@lists.infradead.org; Wed, 05 Dec 2018 18:17:20 +0000 Received: by mail-pf1-x443.google.com with SMTP id 64so10397055pfr.9 for ; Wed, 05 Dec 2018 10:17:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6vMht8+Ph9JHpETTWF5GW6LB5/gngb0kDvS5i0Ablh0=; b=O7BtN5y/jc8pG7n9rlH2yavCcgsXRlYXvkH6x6VfMOtfIbvE4IRjaJ6DgW625xSZ5C AsnvmXyNeDYZFKuYvJgpFykWxavJi7lf5tozQfx57/YlBTXQeNdSSw6Jk9aC5j+Ea/Ki OtgbIbl6TLsEJpDi9q/yYjUsoxJtLVFtpvIb8= 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:mime-version :content-transfer-encoding; bh=6vMht8+Ph9JHpETTWF5GW6LB5/gngb0kDvS5i0Ablh0=; b=bntsi6fJxdpmy0sxfQDfBc6xk8FwgwrB8FVgjBG5k26Xmiy5p4MM0oW2+bnh6dgcpf X6qAbSd+5Kq0JmUcwKSj+k/n5JddrFlBerPlU/lI1Twast0qYHZ4PHHQTPjd2ZwWANaI zGez7LtLYnXK5pcfod1dfPaYGF1QUFyePHVQmStM4Pl7cIZzOOGOurwYpo1tGt4Vx4xY 4hmXLLJC9l951ZD6gexnXws3PjjZViohT+Up4/fpIDqDGrPdp0rYoS+u4lTVvUKKx4fc gznD0khTML9RXTX1a/X2MK6s8OkDUX8SoCue3wtexohaIweBeSKi8YRoasknmSbB9W5t sysQ== X-Gm-Message-State: AA+aEWYtB8aDCOBmhU4Ymq5JwrTDIgLBv6rlGsdlHPHzfw1OEWWvY2/r 7Z/MtYIu5exoh5g4Tdty/s7kp3sBXP0= X-Google-Smtp-Source: AFSGD/UNOuP1DFWZAhtStiObktfOGcOAV8B2mnfuBvwmMAPxs4uJYKeyjgD7750wF4j4ydZKruQcaA== X-Received: by 2002:a65:610d:: with SMTP id z13mr21601439pgu.427.1544033827360; Wed, 05 Dec 2018 10:17:07 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:1:534:b7c0:a63c:460c]) by smtp.gmail.com with ESMTPSA id w88sm21061483pfk.11.2018.12.05.10.17.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 10:17:05 -0800 (PST) From: Brian Norris To: Heiko Stuebner , Sandy Huang Subject: [PATCH for-4.20] Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec" Date: Wed, 5 Dec 2018 10:16:57 -0800 Message-Id: <20181205181657.177703-1-briannorris@chromium.org> X-Mailer: git-send-email 2.20.0.rc1.387.gf8505762e3-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181205_101718_250055_CA48EB4F X-CRM114-Status: GOOD ( 11.35 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jeffy Chen , Vicente Bergas , Brian Norris , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Sean Paul , Guenter Roeck , Marc Zyngier , stable@vger.kernel.org, Robin Murphy , linux-arm-kernel@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 7f3ef5dedb146e3d5063b6845781ad1bb59b92b5. It causes new warnings [1] on shutdown when running the Google Kevin or Scarlet (RK3399) boards under Chrome OS. Presumably our usage of DRM is different than what Marc and Heiko test. We're looking at a different approach (e.g., [2]) to replace this, but IMO the revert should be taken first, as it already propagated to -stable. [1] Report here: http://lkml.kernel.org/lkml/20181205030127.GA200921@google.com WARNING: CPU: 4 PID: 2035 at drivers/gpu/drm/drm_mode_config.c:477 drm_mode_config_cleanup+0x1c4/0x294 ... Call trace: drm_mode_config_cleanup+0x1c4/0x294 rockchip_drm_unbind+0x4c/0x8c component_master_del+0x88/0xb8 rockchip_drm_platform_remove+0x2c/0x44 rockchip_drm_platform_shutdown+0x20/0x2c platform_drv_shutdown+0x2c/0x38 device_shutdown+0x164/0x1b8 kernel_restart_prepare+0x40/0x48 kernel_restart+0x20/0x68 ... Memory manager not clean during takedown. WARNING: CPU: 4 PID: 2035 at drivers/gpu/drm/drm_mm.c:950 drm_mm_takedown+0x34/0x44 ... drm_mm_takedown+0x34/0x44 rockchip_drm_unbind+0x64/0x8c component_master_del+0x88/0xb8 rockchip_drm_platform_remove+0x2c/0x44 rockchip_drm_platform_shutdown+0x20/0x2c platform_drv_shutdown+0x2c/0x38 device_shutdown+0x164/0x1b8 kernel_restart_prepare+0x40/0x48 kernel_restart+0x20/0x68 ... [2] https://patchwork.kernel.org/patch/10556151/ https://www.spinics.net/lists/linux-rockchip/msg21342.html [PATCH] drm/rockchip: shutdown drm subsystem on shutdown Fixes: 7f3ef5dedb14 ("drm/rockchip: Allow driver to be shutdown on reboot/kexec") Cc: Jeffy Chen Cc: Robin Murphy Cc: Vicente Bergas Cc: Marc Zyngier Cc: Heiko Stuebner Cc: stable@vger.kernel.org Signed-off-by: Brian Norris --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 941f35233b1f..5864cb452c5c 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -448,11 +448,6 @@ static int rockchip_drm_platform_remove(struct platform_device *pdev) return 0; } -static void rockchip_drm_platform_shutdown(struct platform_device *pdev) -{ - rockchip_drm_platform_remove(pdev); -} - static const struct of_device_id rockchip_drm_dt_ids[] = { { .compatible = "rockchip,display-subsystem", }, { /* sentinel */ }, @@ -462,7 +457,6 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ids); static struct platform_driver rockchip_drm_platform_driver = { .probe = rockchip_drm_platform_probe, .remove = rockchip_drm_platform_remove, - .shutdown = rockchip_drm_platform_shutdown, .driver = { .name = "rockchip-drm", .of_match_table = rockchip_drm_dt_ids,