Received: by 2002:ac0:e350:0:0:0:0:0 with SMTP id g16csp783258imn; Sat, 30 Jul 2022 02:57:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR6kYLoNn8wrpYy5cddrvjMjBwoNn5aJjGTlT2WjWnbh1Thyv3PlmtDJTGk8kJQvKZ2wb+pV X-Received: by 2002:a17:902:f70c:b0:16d:20ef:7e42 with SMTP id h12-20020a170902f70c00b0016d20ef7e42mr7789234plo.54.1659175065151; Sat, 30 Jul 2022 02:57:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659175065; cv=none; d=google.com; s=arc-20160816; b=PnridWjaXIjEvTB5jKGps84OFWzkk19KI72d8V3gVjvLYkBLMNlWrh0bt13zDZ1EPg jKlMDIIkbZnwDLVsYCanht6if3f1GBBSPkMIl1U+B3ZHptKEoyvCEM/9I6IsFUzBCejr bVtkiqCE+s5OI3xugt6EG8I/UoFXTzJrKegl7EcPaH9bYMinrpJI9pBDOj0Y+u3e9mcR Cb0xN7Dsy/5SbWbfHnnFfJtryncu+MVu3ByFeENO0477nCAb47B+OibJTFGiEtvIgS1f qpGWMJZ5+lonoQA3l3wxSrJpMstknq7g4z04pYYEH4HBW+OjeaPsdg8o/u99QxPVUVX6 vzfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=x5l1wkmdsRZBunkWcYFQkbtqD5PkHotLXuooX3FGyRs=; b=adCifxODzDwhK8ZU+Km3kF+io8TtUupof5CaMDwamI4VFhylH7qQQ3EQSv6xoXTnYT LwPPlGODk/jzwgqP51TlSs/hQq9ha6ydlBuPSNUiFHwBO9maTl5qCbpTa34GLhWOJGSp M0hThFNdHEkOKyNNKGM76qjXXJuC5o2HuAIsIg23Sj+LYT9y8l9PqfTSfUlJsy/8QztJ XVacouL6h4KstEn1H5KqyKYt/sfFL4RNZ9tPT3wvkeV3OgFEVFfp0m6S1HR5wjWQaxWN CxY6dyrOhbCxk0fwuOM1fVM7mR19EHocvi+GKmZFsnWLwA9B9EAB32BQVfWrw113h0O0 T/5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcdkim header.b=wtuBP6Qs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t5-20020a170902bc4500b0016d338a9320si5921937plz.53.2022.07.30.02.57.30; Sat, 30 Jul 2022 02:57:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcdkim header.b=wtuBP6Qs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236628AbiG3Jlh (ORCPT + 99 others); Sat, 30 Jul 2022 05:41:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234353AbiG3Jl2 (ORCPT ); Sat, 30 Jul 2022 05:41:28 -0400 Received: from alexa-out.qualcomm.com (alexa-out.qualcomm.com [129.46.98.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5392911C14; Sat, 30 Jul 2022 02:41:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1659174087; x=1690710087; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=x5l1wkmdsRZBunkWcYFQkbtqD5PkHotLXuooX3FGyRs=; b=wtuBP6QsoxN2hAfVqcn/DJpwgrmy/c26jvAD3rWr6mJcgVfFKV/S9QjN yZ2BvS6ie8b6TeKTjGJz81TOSVAai3s+/HMV9alhHNKEepUfNt659cVZa C7Vh6V7eWrtNA68P2fM3C5dfQTk9BXQA5sB8gH9RLieK1GTuaS1cXULbO M=; Received: from ironmsg-lv-alpha.qualcomm.com ([10.47.202.13]) by alexa-out.qualcomm.com with ESMTP; 30 Jul 2022 02:41:27 -0700 X-QCInternal: smtphost Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg-lv-alpha.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2022 02:41:26 -0700 Received: from nalasex01a.na.qualcomm.com (10.47.209.196) by nasanex01c.na.qualcomm.com (10.47.97.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Sat, 30 Jul 2022 02:41:26 -0700 Received: from hyd-lnxbld559.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Sat, 30 Jul 2022 02:41:21 -0700 From: Akhil P Oommen To: freedreno , , , Rob Clark , Bjorn Andersson CC: Jordan Crouse , Jonathan Marek , Douglas Anderson , "Matthias Kaehlcke" , Akhil P Oommen , Abhinav Kumar , Daniel Vetter , David Airlie , Dmitry Baryshkov , Sean Paul , Subject: [PATCH v3 3/8] drm/msm: Correct pm_runtime votes in recover worker Date: Sat, 30 Jul 2022 15:10:46 +0530 Message-ID: <20220730150952.v3.3.Ib07ecec3d5c17cb0e1efa6fcddaaa019ec2fb556@changeid> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1659174051-27816-1-git-send-email-quic_akhilpo@quicinc.com> References: <1659174051-27816-1-git-send-email-quic_akhilpo@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham 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 In the scenario where there is one a single submit which is hung, gpu is power collapsed when it is retired. Because of this, by the time we call reover(), gpu state would be already clear. Fix this by correctly managing the pm runtime votes. Signed-off-by: Akhil P Oommen --- (no changes since v1) drivers/gpu/drm/msm/msm_gpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index e1dd3cc..1945efb 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -398,7 +398,6 @@ static void recover_worker(struct kthread_work *work) /* Record the crash state */ pm_runtime_get_sync(&gpu->pdev->dev); msm_gpu_crashstate_capture(gpu, submit, comm, cmd); - pm_runtime_put_sync(&gpu->pdev->dev); kfree(cmd); kfree(comm); @@ -446,6 +445,8 @@ static void recover_worker(struct kthread_work *work) } } + pm_runtime_put_sync(&gpu->pdev->dev); + mutex_unlock(&gpu->lock); msm_gpu_retire(gpu); -- 2.7.4