From patchwork Tue Feb 21 10:14:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 59846 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1787222wrn; Tue, 21 Feb 2023 02:30:03 -0800 (PST) X-Google-Smtp-Source: AK7set9ewtMl+cxR0ARcwWUGdmHsAbWMHbF74MSJjZC16ZI18MR0gZq6iMsk5rDQkRPRzlOeIRiP X-Received: by 2002:a17:902:ec92:b0:19a:eef0:3392 with SMTP id x18-20020a170902ec9200b0019aeef03392mr7448299plg.43.1676975403003; Tue, 21 Feb 2023 02:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676975402; cv=none; d=google.com; s=arc-20160816; b=Ck0CI+vahJ+BRalfzn55o2s7DJmRbPti13OopObuC9t74b6KUtbh+vQJ9s5YD/da9l joGyiNM6U0xv3Ayn6f2ryN3tkOueKnWDUkcF0SjH6EwpE96Q1sv6IY9nx4XpZyh0XkNw c+BX/HxPjFBSRPwoNCJHdpH1XbCFT4ZQs0lb5rDRAOC9axoHOnQ683VrahvILjNHQTgm KywVnyU6fPu7R4SutUiOmCvea+O9fA7CyE/rbPBvZr0t0nWPUagZU9f/m0/o8/iJn8R9 mOTPF1oVBct3178e9bGFGVvmQyFJQRxRfwfcICXnBcOZp7RwNvDQ4uBKh4w0ReSra0vk HPkQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VO7w0qYrQ06K0M9OmQsyqk/fCUs2+ccyDrIasGutPzQ=; b=0QkTSiMrjFWkr4Vh7LPP4gtUNbu0GprX0Rxkq9uaRL4ompUHFQX6+LfmSyjxeuSwJZ EBfG01m4MJV89sUJge8LsVGPQPu/t3hR/aSbUAiqpVQKv/lrGVA2mUEUN4KY7+2m0kVN IVxor/r2X0n0Z+2YLPRV8Gs5dHCYIk3Oq5w1YK4cLlunoY9xDRA53fUWtUqzTFs2XMYs IHi2J741mAKuD00T4a+/tVg6j0m4dY8SGanjqPS5b+oeUhBX81wU9ck8xjIMHuFB785w jkaH2vVHp7NsO1xb8hXv6SPxppt/f4xlaQT9+hTOxi1UN0TIghyhSnF49818vQbD1dxC XYGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UxVTeCgQ; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a170902f54600b0019aa8ffd978si13744037plf.253.2023.02.21.02.29.50; Tue, 21 Feb 2023 02:30:02 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=UxVTeCgQ; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233776AbjBUKQ4 (ORCPT + 99 others); Tue, 21 Feb 2023 05:16:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233015AbjBUKQu (ORCPT ); Tue, 21 Feb 2023 05:16:50 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CE43233E3; Tue, 21 Feb 2023 02:16:49 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 6C3CACE09B5; Tue, 21 Feb 2023 10:16:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57961C433EF; Tue, 21 Feb 2023 10:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676974605; bh=rsIBiufyPVeN/iiBVMiUsYKGl4amMszJEzKK1e3KNPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UxVTeCgQv7nr7fYeRtAYvutvyfzn2nEPwWXUgm5gZhaSUjA5fv+/yLOaoWghcY3gw Jo0MgAIQgCMPKgLsPh6eCP5d1g8ZZyXEYFZvoPLom5oeoEtXstfg54huEzCDIU2IMK SO8XmIZukdkDZDbt7ZGjA6IfildbkNuJPq9fydFZ3N1YTxYd6F7i8v+0E/xSuEPQl4 7VgVHwizHTh6QBb5IM4bnoM6kKdvXlubmLzUhY+xGJzD6+TqtWDaGOr1+e7tZ2ImzN SmafOtsH99Wa2sH/tDjbJ37zsyJbgJauoNmdk1TIPU6kUc8oegUBXWLvgKYeDDGufB /NkwxzCndLo2Q== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pUPhX-0003oF-WE; Tue, 21 Feb 2023 11:16:48 +0100 From: Johan Hovold To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov Cc: Sean Paul , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold , Bjorn Andersson , stable@vger.kernel.org Subject: [PATCH 1/4] drm/msm/adreno: fix runtime PM imbalance at unbind Date: Tue, 21 Feb 2023 11:14:27 +0100 Message-Id: <20230221101430.14546-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230221101430.14546-1-johan+linaro@kernel.org> References: <20230221101430.14546-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758436129189570428?= X-GMAIL-MSGID: =?utf-8?q?1758436160136603318?= A recent commit moved enabling of runtime PM from adreno_gpu_init() to adreno_load_gpu() (called on first open()), which means that unbind() may now be called with runtime PM disabled in case the device was never opened in between. Make sure to only forcibly suspend and disable runtime PM at unbind() in case runtime PM has been enabled to prevent a disable count imbalance. This specifically avoids leaving runtime PM disabled when the device is later opened after a successful bind: msm_dpu ae01000.display-controller: [drm:adreno_load_gpu [msm]] *ERROR* Couldn't power up the GPU: -13 Fixes: 4b18299b3365 ("drm/msm/adreno: Defer enabling runpm until hw_init()") Reported-by: Bjorn Andersson Link: https://lore.kernel.org/lkml/20230203181245.3523937-1-quic_bjorande@quicinc.com Cc: stable@vger.kernel.org # 6.0 Signed-off-by: Johan Hovold --- drivers/gpu/drm/msm/adreno/adreno_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 36f062c7582f..c5c4c93b3689 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -558,7 +558,8 @@ static void adreno_unbind(struct device *dev, struct device *master, struct msm_drm_private *priv = dev_get_drvdata(master); struct msm_gpu *gpu = dev_to_gpu(dev); - WARN_ON_ONCE(adreno_system_suspend(dev)); + if (pm_runtime_enabled(dev)) + WARN_ON_ONCE(adreno_system_suspend(dev)); gpu->funcs->destroy(gpu); priv->gpu_pdev = NULL; From patchwork Tue Feb 21 10:14:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 59849 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1787685wrn; Tue, 21 Feb 2023 02:31:03 -0800 (PST) X-Google-Smtp-Source: AK7set9tmMmpIvLxkQdvAlne6gfDO5kF8ebdYNmXnAvmP6RC5YeHnXegf0tXIXbwAs+ppAp/PFe8 X-Received: by 2002:a17:90a:195:b0:22b:f622:56ae with SMTP id 21-20020a17090a019500b0022bf62256aemr6568841pjc.23.1676975463683; Tue, 21 Feb 2023 02:31:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676975463; cv=none; d=google.com; s=arc-20160816; b=X59kfQJOkGjLCeLRptTsgDBQyJ1zN8WdtV9BO25Yl7ckjbPSL0tIxjEVsG2qp5fygo fahIxjctW8PlsaocviUg6P9HMvj/SfBcCyd3Qt/j75RarhZLanbFMKNaXP5in/lnXM+r POiG810xleB03D3z6wctZNlLgo8c1pe1e6NSMXulOQfJecsfuRP8lVj/q+VecxUxXGve 4z6o6Vnl0AkN7I8JEdbko8cBqE03hj0FaJZoGKJ+hBFvkmd5iCv6vUq1qBJ/Y0iltW4v pzYmhO2vkSt67QcwXNYDpuuetI7iIx95sjvIBJUmBAnCcsAziyLN0Sqbp56kCVOs62hh aKzQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jX1hCYEh39KDMtgJeNx0nJg9tGGATWM0JySX/XKvPA8=; b=qdp+lSx5hevDtudPfkmj0qd2c+/mT5UsRFOfPccaZVuby+j41MtCt/3tjoFFukbUFX p3tvapV4kcu/KKI/t4y1ZWtrkjhylte/UEqqxnwVSr1NO7U/3IRMDAdC4pJ5Dy4Forhy ZSwlBj4ubiAeWxfE+oPixdIspF0vU6THqzelN77+wke+Urvpe17KMzgaT2OjbjUbO+Ib Upja1iBJ5HOh1Eg1zxWyWZxYS+FxRWqhhQiBcsRLFr+H/agO/seWYznQ3XlOUpKYDb2i PKLHco0uNGZCF5zLjQok41ChrS6iA+ibrW+n7kewch94kgVnbTCzZ+eU7iDKkSMQvRGu OGcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="CslmcW/G"; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l192-20020a6391c9000000b004fbfeed0842si11620567pge.787.2023.02.21.02.30.50; Tue, 21 Feb 2023 02:31:03 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b="CslmcW/G"; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233590AbjBUKRD (ORCPT + 99 others); Tue, 21 Feb 2023 05:17:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233753AbjBUKQu (ORCPT ); Tue, 21 Feb 2023 05:16:50 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E363233F0; Tue, 21 Feb 2023 02:16:49 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 6F9F6CE19AD; Tue, 21 Feb 2023 10:16:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D379C433D2; Tue, 21 Feb 2023 10:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676974605; bh=O3ZdmShGWbUJjxtHFjkD8zibeYG5rnq2WGdw9cH2vEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CslmcW/Gqc+so6rQNDhpB3QFJPYSPJ+L9XRpRtiodR+VWvYXjJcZfxsh4rxoxmTlH priGA26mi1SACSFhFvc5qDaf6T5r0+xrfgFFhz7kzWgDENfdI1m4JnXZ6AlMzh5HWz yXHlK0ilaAKac4mn4R/o7/J7bETbRdK3aR9hXJt9Kxt+6chm5nslHqCLGtnT71acj3 gAvEaG8rtyVofpeWVy2MB3htYDVsGsxRksYPCXoyM6pg5EPK56o8CjxtGpt6XM35Ta VkRFmiMIDq4jAdRg/bB8hnYvvYqLu9mMltZjCYL5ygCe7je6E0xhZKcmwkpdDYgrcd bCiaoni1OEikQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pUPhY-0003oH-2p; Tue, 21 Feb 2023 11:16:48 +0100 From: Johan Hovold To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov Cc: Sean Paul , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 2/4] drm/msm/adreno: drop bogus pm_runtime_set_active() Date: Tue, 21 Feb 2023 11:14:28 +0100 Message-Id: <20230221101430.14546-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230221101430.14546-1-johan+linaro@kernel.org> References: <20230221101430.14546-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758436223748728222?= X-GMAIL-MSGID: =?utf-8?q?1758436223748728222?= The runtime PM status can only be updated while runtime PM is disabled. Drop the bogus pm_runtime_set_active() call that was made after enabling runtime PM and which (incidentally but correctly) left the runtime PM status set to 'suspended'. Fixes: 2c087a336676 ("drm/msm/adreno: Load the firmware before bringing up the hardware") Signed-off-by: Johan Hovold --- drivers/gpu/drm/msm/adreno/adreno_device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index c5c4c93b3689..cd009d56d35d 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -438,9 +438,6 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) */ pm_runtime_enable(&pdev->dev); - /* Make sure pm runtime is active and reset any previous errors */ - pm_runtime_set_active(&pdev->dev); - ret = pm_runtime_get_sync(&pdev->dev); if (ret < 0) { pm_runtime_put_sync(&pdev->dev); From patchwork Tue Feb 21 10:14:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 59848 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1787441wrn; Tue, 21 Feb 2023 02:30:32 -0800 (PST) X-Google-Smtp-Source: AK7set+zGsP83BITWRF0mgC8aIq4Z279WzP+Ttm1l523KUVoMQPOI844k7JkkBh5WpoMyN3XSIz2 X-Received: by 2002:a05:6402:4d4:b0:4ab:44bd:80a1 with SMTP id n20-20020a05640204d400b004ab44bd80a1mr3174327edw.22.1676975432307; Tue, 21 Feb 2023 02:30:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676975432; cv=none; d=google.com; s=arc-20160816; b=jItWIExb9694pXoNnJrJL0Awb4b1qsJRDs2DMO/BKc+7jjWimAM6gB4kdxfnbFPnWM SbqNQXUWpkIINak9yDGoi2IF/VyJvn6WlaIUpYbyvLnchUNMy2CjipRmPw2bkzwG8AZf j+O9cwEGd+gaADrZgjn4QkBPkH1nrwkB2a8YDE5HJCqYjt5CNoNbOo7W7HK8zfeej+m6 xIGAS4l7q8KiX8iw/vKtfOkPjLxSS3Dd2a9mBr5lcU84DgiffwMX8B/u82DemDqs2g8P JJ2CLuEjPq+peuQV59La63jt8jmZF2N4whv7biYmRXVmvShcWcMq+vXQhG91L/idq+vL EcBA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Toqkn1bCvE3U6GiDqK3jzq6torbjIElLgINmlQ7j0Y8=; b=mJEJ2Fdk8Eq72erHxOfIH4DmIA5DCQvcit7uWW3flF78ceWe4tWmoJQ+8dTEvnoyda T1n5uOLJtxAAqQMxr0GktANmcKAurE8FfvDGURFyy2KdUbYDpBztEMcvV+PduM1rK6vI Jyh0j18TysZEsYq8fk8cy1tW+YDehJIvo9ha/02tKUnI9k4+NbREMEbGRdM8XmgSMP74 nFipREoNNF5S3oZJRtnNHGcvutI/+dfnOzbYjvWSe9CLXqSvk8NfOeent+hnuytIoTv5 +LBds4xxmmXNwcq8o3RAldvgVWhRf7k0fwUHWs76vH8IwxBUwdj0kbWqzQXALKxjE718 BdwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Y+V1fdK1; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z25-20020aa7c659000000b004ace655ef51si18576234edr.192.2023.02.21.02.30.08; Tue, 21 Feb 2023 02:30:32 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=Y+V1fdK1; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234132AbjBUKQv (ORCPT + 99 others); Tue, 21 Feb 2023 05:16:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233728AbjBUKQt (ORCPT ); Tue, 21 Feb 2023 05:16:49 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4813923665; Tue, 21 Feb 2023 02:16:48 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id AE4FCB80E96; Tue, 21 Feb 2023 10:16:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B0A2C4339E; Tue, 21 Feb 2023 10:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676974605; bh=CLnGEscqosrMeLtUFrN4NYlf8E7ksq4zdFj/Jlggmh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y+V1fdK1GKXHbxmqrbV9e4k/+EMq/lPTAGIm5msOM6r2++cH9mTlLG7UGkLSIKmai 68WtQLbR5MsoTCjy8rG+jOhcTXI3e60RRUZLbISeYQv7/6Z+xZ9G7ywThRzMT0b0q6 +ZE0O17llIV3WzZrlYA4eiwOQg59FYn5Xn6TCuyymUNOTRbA0waFR5ml0kdld0WZJr 6B+2RdncNDKvzgS9a3tS9aEevT9gmg+cWRnJHsz8Bxu/Thbyv1COe9SifpLyizvcfW U710lcZLepraPrQN8tTmx9p2ekPaYqdh5jS9q6MgryyNM9MZLpLB9DYlTF+i7ETzXW M0ebwVGhTpnrw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pUPhY-0003oJ-5w; Tue, 21 Feb 2023 11:16:48 +0100 From: Johan Hovold To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov Cc: Sean Paul , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 3/4] drm/msm/adreno: drop redundant pm_runtime_disable() Date: Tue, 21 Feb 2023 11:14:29 +0100 Message-Id: <20230221101430.14546-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230221101430.14546-1-johan+linaro@kernel.org> References: <20230221101430.14546-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758436191076346790?= X-GMAIL-MSGID: =?utf-8?q?1758436191076346790?= Since commit 4b18299b3365 ("drm/msm/adreno: Defer enabling runpm until hw_init()") runtime PM is no longer enabled at adreno_gpu_init(), which means that there are no longer any bind() error paths for which adreno_gpu_cleanup() is called with runtime PM enabled. As the runtime PM enable on first open() is balanced by the pm_runtime_force_suspend() call at unbind(), adreno_gpu_cleanup() is now always called with runtime PM disabled so that its pm_runtime_disable() call can be removed. Signed-off-by: Johan Hovold --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index ce6b76c45b6f..1101b8234b49 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -1082,15 +1082,10 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu) { - struct msm_gpu *gpu = &adreno_gpu->base; - struct msm_drm_private *priv = gpu->dev ? gpu->dev->dev_private : NULL; unsigned int i; for (i = 0; i < ARRAY_SIZE(adreno_gpu->info->fw); i++) release_firmware(adreno_gpu->fw[i]); - if (priv && pm_runtime_enabled(&priv->gpu_pdev->dev)) - pm_runtime_disable(&priv->gpu_pdev->dev); - msm_gpu_cleanup(&adreno_gpu->base); } From patchwork Tue Feb 21 10:14:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 59847 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1787359wrn; Tue, 21 Feb 2023 02:30:20 -0800 (PST) X-Google-Smtp-Source: AK7set9DOq2Apgfmt53cCkvFoJPVH2xSJNipNtEwwYbnUFjT6IMrliM2pGVsyEHt7ogQXoJUVrMV X-Received: by 2002:a17:903:803:b0:19a:e462:3e70 with SMTP id kr3-20020a170903080300b0019ae4623e70mr3684008plb.10.1676975420401; Tue, 21 Feb 2023 02:30:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676975420; cv=none; d=google.com; s=arc-20160816; b=UK49OE3YGVoufGkdyNBfAARFk8P47gZX6ZzcM4YQfuqP8oF5k8apJOdeqX/tdWa0Wf k0aI2iwWMKYsnX3lzsAHe7S1CbMQjYqV1UR0GDkCTn71xv+6hsZO/rQNKYMDY1kxcvuh ky1b6MnXCYdPpcMpOSF8OfUlgQKrZ3XdSIjFpUH8oIN1SwvDKHOEzN0778GL5qIGvhy8 9dEHm0iwtBPY+/NQUfo3wIiXkISw0E28RszSicldxMVRVhM1ijnRmCbEpmFbYudp12au 34zJoM2jYjJ6ArjN8V6BZLRv0D2GhUsjWB5tOkwh7Sc5L3qk+E/ZrHBCK4AC2otjqapQ wxaQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NKwvYyK2+wH0vQTKDF9N1tUvbSS25KA54cSnXVP94Kk=; b=zwZinzgU5OvOey50cka0LKTrleBLqKCg1PxTxAZubSAz+KN6cYAb9qb2Poj4VJxFmf 6Db+Q0X2p5YHgyAgNwg8mDWwp2I9bv0WpnuTwUyElbTCSpqCFt5uNWQMfC+SCOVwVdJN iTWSS2zRa+DjTFIIXHGnTz/2NDAXnnSNz3tkTvO/PqgJhJdJtKqJqjRDVcvHX93uCf4u Evmch36YHdvVs7TIU94kY0bAk28DxYjPllj1jh6Oq8N5KsX+q8MGW8r/Ue83iiaAjoiJ zF8dcrtlniw6UZG6/xs9fPzn+Z6EG1/xbtceBmh/B0vxG6ua6F6wcKpMcrRJqq8uFCuB 6QeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HDMSqzEI; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q16-20020a170902dad000b0019a826d304asi4128768plx.630.2023.02.21.02.30.08; Tue, 21 Feb 2023 02:30:20 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=HDMSqzEI; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234142AbjBUKQx (ORCPT + 99 others); Tue, 21 Feb 2023 05:16:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233863AbjBUKQt (ORCPT ); Tue, 21 Feb 2023 05:16:49 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94C4323306; Tue, 21 Feb 2023 02:16:48 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E0465B80E9D; Tue, 21 Feb 2023 10:16:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E5A4C433AF; Tue, 21 Feb 2023 10:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676974605; bh=yMvJYHxVZptlOU5QkNPi2i647YDtCkktqGaRKrHuIIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HDMSqzEIjkQp9Nbi1pc/AzuqhupeOI0A3vwNCZ+xQhLmKTVWYn/ECf7VyPVWCwLWD TuG7eYCCOaDEAGahZTISo0O92OQpg0Wy0ZylhuKSY364JZwl0PZN/d5PAJqjWOPTar UDHsyc2meB8Ioe2RWYK1b0W/OLDEvCQR65EUDoWh4OEtr/L4gHuLR+N8PhE/pY0UEw mCeQL/yDX+LVydQWluxQNOhU4w1cVrTfv9oJmTP2bI9Anz9A6jIrNY2IAEjrFEvisW nCnE9kysBsiCWJDtnFCLseC9daRe0P8aJpG2CSbTtOxSlgWMTgG3lH/GnNPtRoBVSL KYE9DoOW4CtlA== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pUPhY-0003oL-8z; Tue, 21 Feb 2023 11:16:48 +0100 From: Johan Hovold To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov Cc: Sean Paul , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 4/4] drm/msm/adreno: clean up component ops indentation Date: Tue, 21 Feb 2023 11:14:30 +0100 Message-Id: <20230221101430.14546-5-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230221101430.14546-1-johan+linaro@kernel.org> References: <20230221101430.14546-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758436178274732356?= X-GMAIL-MSGID: =?utf-8?q?1758436178274732356?= Clean up the component ops initialisers which were indented one level too far. Signed-off-by: Johan Hovold --- drivers/gpu/drm/msm/adreno/adreno_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index cd009d56d35d..80947420ac19 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -563,8 +563,8 @@ static void adreno_unbind(struct device *dev, struct device *master, } static const struct component_ops a3xx_ops = { - .bind = adreno_bind, - .unbind = adreno_unbind, + .bind = adreno_bind, + .unbind = adreno_unbind, }; static void adreno_device_register_headless(void)