From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6E52C11F69 for ; Tue, 29 Jun 2021 12:57:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 928EF61DF8 for ; Tue, 29 Jun 2021 12:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233748AbhF2NAR (ORCPT ); Tue, 29 Jun 2021 09:00:17 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:52685 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233507AbhF2NAO (ORCPT ); Tue, 29 Jun 2021 09:00:14 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id E794358042F; Tue, 29 Jun 2021 08:57:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 29 Jun 2021 08:57:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=g8a8wNRpa934Y MC6Pz3HoGGBUBjy+4EBkepvXyN4UFE=; b=SFYLC9TtlrYeYG/3DK1qewrtzglnR We2HrpXtLIdjoI1VNv2e8x9YpeJlGjCWxu0iaYJEczrdjdeh/PhvEt8MgfvNWDNw 8S4riPLiBEbq1mxSNmrUUpyGw/TpKEhq5aVzkbE9NEsn+E1PNFOxdeusncckQojM H69pMbUkS5ONvIogmjb6L+CsRHaZSKgQrYWV7wct2rQHaALEFi13y6rOCKa6SOmp b0rxDWhusfNSL/pCioR3WstSGBrWhRfImB80s7zshBIDBCj2nzpCzXlB0FQBo+Zi 27WNkQcFmpx4aigXl6etK2k02IwKd4ZU5jc2fV03LIeizAZLtOfciDRvA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=g8a8wNRpa934YMC6Pz3HoGGBUBjy+4EBkepvXyN4UFE=; b=Zr3YkCfg 8WZ1d4Cg88HDaPCsy5SjB3x6jdWI0ij4ahYYPhXAo9/2/g8P5aWEXon4+62zEQzK 7CICJk0KFM9nRKMomJRe0xWwY7oUGDNvTl7NVO/gH/7NjNbAuN3tudD3uvdqzB40 Dg/5vnOzREuDvWfA4DfjXSkZpAd2maerlQw2tA/hqk75Ku8N+zhpUhxlGNot1y5L PGM9WQLxmYZ6orLFwZutr2DOe4VmnyzDcheOhzaBb85xjD+w6hjJHHbDBRnIZ+n3 3Jx1joVDG2ZgbjfC6V36yLXjr5+Bhs4fyCINp3Jif1SzZaj4GNS8SH7dGmW9ore5 nB3jBZnkwVXWaA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfeeitddgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepvdekleevfeffkeejhfffueelteelfeduieefheduudfggffhhfffheevveeh hedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmh grgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 29 Jun 2021 08:57:45 -0400 (EDT) From: Maxime Ripard To: dri-devel@lists.freedesktop.org, Daniel Vetter , David Airlie , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard Cc: linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Boris Brezillon , Emma Anholt , Maxime Ripard , Dave Stevenson , Hans Verkuil , Nicolas Saenz Julienne , Phil Elwell , Tim Gover , Dom Cobley , linux-rpi-kernel@lists.infradead.org Subject: [PATCH 2/4] drm/vc4: hdmi: Put the device on error in pre_crtc_configure Date: Tue, 29 Jun 2021 14:57:34 +0200 Message-Id: <20210629125736.414467-3-maxime@cerno.tech> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210629125736.414467-1-maxime@cerno.tech> References: <20210629125736.414467-1-maxime@cerno.tech> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the vc4_hdmi_encoder_pre_crtc_configure() function error path we never actually call pm_runtime_put() even though pm_runtime_resume_and_get() is our very first call. Fixes: 4f6e3d66ac52 ("drm/vc4: Add runtime PM support to the HDMI encoder driver") Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 707fe43ffeea..b3db38d37550 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -958,6 +958,7 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder, if (ret) { DRM_ERROR("Failed to set pixel bvb clock rate: %d\n", ret); clk_disable_unprepare(vc4_hdmi->pixel_clock); + pm_runtime_put(&vc4_hdmi->pdev->dev); return; } @@ -965,6 +966,7 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder, if (ret) { DRM_ERROR("Failed to turn on pixel bvb clock: %d\n", ret); clk_disable_unprepare(vc4_hdmi->pixel_clock); + pm_runtime_put(&vc4_hdmi->pdev->dev); return; } -- 2.31.1