Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp5869549ioo; Wed, 1 Jun 2022 14:31:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5k9Q7ddbGb/nVrg5ArvBUyjesLkLvGHmTfwa6mqABDcL8ovZFl3HtsuK4blZAtk+4/NaE X-Received: by 2002:a17:90b:1044:b0:1e6:67a0:1c13 with SMTP id gq4-20020a17090b104400b001e667a01c13mr4022837pjb.236.1654119110685; Wed, 01 Jun 2022 14:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654119110; cv=none; d=google.com; s=arc-20160816; b=AIlvSQBaJ8u2UDPkQg/r4DDr9bilfrLGYhneCXemK85hH+xsvTpGeMVYewbA8B5u1W yD8o4I1OdZjvWtt1PJsA8lkWBb3aCDUJzDcMHcyel4a+qkOwWZVHLsDrcXBegjBrg9Xo Q6Egz3mpwvTAgj/dWoPndZrJJb3GFuI8GOUwi1H+0RlcHi7o+jWVbsafITNsOAC0nMou xBVA4mO7wL3SMyD5UPI5ZlhIZLiwkRX1tNY4Lo11vTaB5Xp9QsJC2oghLIcwZSKHS4at 7lo7dv7tcKeiQ/ukolTCXW/1Gq6ly9oWrBrkwLpBdThEXV+a22PSuao1H2k+hk4nHkfe 0O3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=YRYIF8QGPIv5YHK53kC4fYQBl0fPKRwkGLrQ86KpzLw=; b=lXK03hy4mJxw+0ixhZgcMUVugHrexEPCRwYnASeom7hVCDGNqhH1XGsMcqEu8WyvAU 0l6/rBvUEosofudpVoctj19D1B4XiZEqGP3jrcwd658ajBjUAPSIQUhGsXOaA0UP5w/P 0+1GNvgKsKxTlKqeu9d3NxbCz3aMVsmL3F8Xwu2bxsiplmrYge4khJoIfj5Zs2SkVZun iiyveSmVQ/u7Td0qqo9oXuX7U+k6q/gVAMf7kXT8S7Flkq/yWismWJLUoitm3XHg4H+Q ZKr9WBQpqtW9AGD43Xic9FzRxF32Ts1m4rmOh3kTHUcC1F25kTEQfMdJeuCn25YaVNAu IStQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KIidLJO1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id kk3-20020a17090b4a0300b001d1ad44a667si8755401pjb.6.2022.06.01.14.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 14:31:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KIidLJO1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9646E24E003; Wed, 1 Jun 2022 13:19:37 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243456AbiFAMWF (ORCPT + 99 others); Wed, 1 Jun 2022 08:22:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352956AbiFAMVU (ORCPT ); Wed, 1 Jun 2022 08:21:20 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 297615002C for ; Wed, 1 Jun 2022 05:21:19 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id v15so1728336pgk.11 for ; Wed, 01 Jun 2022 05:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YRYIF8QGPIv5YHK53kC4fYQBl0fPKRwkGLrQ86KpzLw=; b=KIidLJO1jlLoHuWi7Xpq7ZoYA102fCruSZsHK0gjeMktUqediZPb7K7OsGR5exNPPQ CRF5tUuHhsVWZkOPJkperWHmc1AVcoo9HCWYfbGf17b1fAy2Cw26jf//RarzxKnbc3Ao Zi4cDm5dP/b8PsGSFKOkhxz1FONT4ubKFh5yEv4Tzgnzc6gM6tonJldeQm2anqY58EMw l2SP/I3ebw8CPvRtHk1V42lU7CHV690cHiWkk82LoFX/agd0xHGwrIC0DCk1WfEgt75p 6fGVFlL9oYQBCQ/QHdkaVT+PHTS5IQI+Mjw+GrW9H4FXuROQeYNxqGK/d+eKFo8C9Ymv qJLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YRYIF8QGPIv5YHK53kC4fYQBl0fPKRwkGLrQ86KpzLw=; b=l9gW/w7Fc1LC50j1aFZqdcg3lNBMnVPbNmQFtRvWx0ZyVKPBVyhEsAD0bteTV/YrQY tzzOhpWXq0ogLn9XIzpvd22AMp+R+/UjrRw+T/UjZpyKBYzd3p9JQHpiXaPCFQ4nyk4e bkEW5OzMhSpfPxPncwGw1oyIyTssac4T6j9loO9aTEXAnvYOaOFkt/gZutWgOHn1Ij2R X8H6I9sqF+wzB7437HSCpuV0UzKyucjZqYu0TsU720anxS6oCMkbrSSMm3b3hzjnXeMf UUZ4HFbLa6HRKbMth2LeEEqhFVYC0rPWVAQAfk1dP4LVNtyaCxiWI1jdNThqIRUXjeLJ dkIg== X-Gm-Message-State: AOAM5314bjTeHqXGD5GVt/aoRep0cQiZ2AJ69upF60CkHkkdw5XFn/mJ 1GpXNqkg0nsCUgsCwRt4AH8= X-Received: by 2002:a05:6a00:24c1:b0:50d:33cf:811f with SMTP id d1-20020a056a0024c100b0050d33cf811fmr66275730pfv.78.1654086078691; Wed, 01 Jun 2022 05:21:18 -0700 (PDT) Received: from localhost.localdomain ([202.120.234.246]) by smtp.googlemail.com with ESMTPSA id t2-20020a62d142000000b0051868418b06sm1370811pfl.35.2022.06.01.05.21.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 05:21:18 -0700 (PDT) From: Miaoqian Lin To: Emma Anholt , David Airlie , Daniel Vetter , Eric Anholt , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH v3] drm/v3d/v3d_drv: Fix PM disable depth imbalance Date: Wed, 1 Jun 2022 16:20:50 +0400 Message-Id: <20220601122050.1822-1-linmq006@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The pm_runtime_enable will increase power disable depth. If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable(). Also call disable function in remove function. Fixes: 57692c94dcbe ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+") Signed-off-by: Miaoqian Lin --- Changes in v3: - call pm_runtime_disable() in v3d_platform_drm_remove - update commit message Changes in v2 - put pm_runtime_disable before dma_free_wc - rename dma_free to pm_disable v1: https://lore.kernel.org/r/20220105120442.14418-1-linmq006@gmail.com v2: https://lore.kernel.org/r/20220106124657.32737-1-linmq006@gmail.com --- drivers/gpu/drm/v3d/v3d_drv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index 1afcd54fbbd5..f3380399fe17 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -286,7 +286,7 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) ret = v3d_gem_init(drm); if (ret) - goto dma_free; + goto pm_disable; ret = v3d_irq_init(v3d); if (ret) @@ -302,7 +302,8 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) v3d_irq_disable(v3d); gem_destroy: v3d_gem_destroy(drm); -dma_free: +pm_disable: + pm_runtime_disable(dev); dma_free_wc(dev, 4096, v3d->mmu_scratch, v3d->mmu_scratch_paddr); return ret; } @@ -316,6 +317,7 @@ static int v3d_platform_drm_remove(struct platform_device *pdev) v3d_gem_destroy(drm); + pm_runtime_disable(&pdev->dev); dma_free_wc(v3d->drm.dev, 4096, v3d->mmu_scratch, v3d->mmu_scratch_paddr); -- 2.25.1