From patchwork Mon Nov 19 06:25:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jayant Shekhar X-Patchwork-Id: 10688231 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 AE96B15A7 for ; Mon, 19 Nov 2018 06:25:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CCAA29351 for ; Mon, 19 Nov 2018 06:25:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F7E829841; Mon, 19 Nov 2018 06:25:55 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2983A29351 for ; Mon, 19 Nov 2018 06:25:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725998AbeKSQsc (ORCPT ); Mon, 19 Nov 2018 11:48:32 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:34752 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725908AbeKSQsc (ORCPT ); Mon, 19 Nov 2018 11:48:32 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 8F9EA60A33; Mon, 19 Nov 2018 06:25:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1542608753; bh=JcnG5bE+977iRzpiMqix6Qtvcnm35/lPv8HX3yjDmYE=; h=From:To:Cc:Subject:Date:From; b=CMchDugwVDY+kplK94pAAVNPY6W0K7LrEP0DnOqeKh15VyDXWl8+La6Pu5JOv+p2S n3oQ995+8Z8cZx7kczQOLyGTG+tkUqrb8+rgRo+rIUCZ9JDmdoR/+wyyCKm7WtA43j yqA6SQsueQ2Ftf+HuAxWUt2+5rJVGDXgORMhc6Ws= Received: from jshekhar-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jshekhar@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 07A7D60227; Mon, 19 Nov 2018 06:25:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1542608752; bh=JcnG5bE+977iRzpiMqix6Qtvcnm35/lPv8HX3yjDmYE=; h=From:To:Cc:Subject:Date:From; b=X1aGxiZhifXEx9qb7HyBBQWJV2UfSf9J0kU2ATK19bWzLC1f2AFiowEh4OgbGB1Mz 57oWn4CuMUztfqXUMbqv1WHbofS7nx1p3pxzrYmxtRm4gmGQ2mub6CBftHt5ZzTsDY jXkn1HDIBXbDKL5K8NiZiuVcbPeY/QxgvJalv+Sg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 07A7D60227 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jshekhar@codeaurora.org From: Jayant Shekhar To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org Cc: Jayant Shekhar , linux-kernel@vger.kernel.org, robdclark@gmail.com, seanpaul@chromium.org, hoegsberg@chromium.org, abhinavk@codeaurora.org, jsanka@codeaurora.org, chandanu@codeaurora.org, nganji@codeaurora.org Subject: =?utf-8?q?=5BPatch_v3=C2=A0=5D_drm/msm/dpu=3A_Correct_dpu_destroy_a?= =?utf-8?q?nd_disable_order?= Date: Mon, 19 Nov 2018 11:55:38 +0530 Message-Id: <1542608738-3315-1-git-send-email-jshekhar@codeaurora.org> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In case of msm drm bind failure, pm runtime put sync is called from dsi driver which issues an asynchronous put on mdss device. Subsequently when dpu_mdss_destroy is triggered the change will make sure to put the mdss device in suspend and clearing pending work if not scheduled. Changes in v2: - Removed double spacings [Jeykumar] Changes in v3: - Fix clock on issue during bootup [Rajendra] Signed-off-by: Jayant Shekhar Tested-by: Rajendra Nayak Acked-by: Jeykumar Sankaran --- drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c index fd9c893..df8127b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c @@ -156,18 +156,16 @@ static void dpu_mdss_destroy(struct drm_device *dev) struct dpu_mdss *dpu_mdss = to_dpu_mdss(priv->mdss); struct dss_module_power *mp = &dpu_mdss->mp; + pm_runtime_suspend(dev->dev); + pm_runtime_disable(dev->dev); _dpu_mdss_irq_domain_fini(dpu_mdss); - free_irq(platform_get_irq(pdev, 0), dpu_mdss); - msm_dss_put_clk(mp->clk_config, mp->num_clk); devm_kfree(&pdev->dev, mp->clk_config); if (dpu_mdss->mmio) devm_iounmap(&pdev->dev, dpu_mdss->mmio); dpu_mdss->mmio = NULL; - - pm_runtime_disable(dev->dev); priv->mdss = NULL; }