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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 7A80DC2BB86 for ; Sat, 11 Apr 2020 23:32:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A88A2051A for ; Sat, 11 Apr 2020 23:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586647938; bh=hC0tRT7s7FAtnQHhA5C5oJkGKpQ3PjHd2+By1rljjAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UHyE32zJHplO6Z5HroMU31wMifBcZtBIqGNePiOOmhpx1LX0d3lZaQm+OWa8XDfBg yzAoQnIwYBihIUH+Q0zm3kF7mYLOWvgC8/3yaNI0rHYprt2O+QvNYBsttXwGHwwIvg EaxP+8ciCbr2x2fDGYxSU86rcJD7XE31dQpPHn7k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729940AbgDKXcQ (ORCPT ); Sat, 11 Apr 2020 19:32:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:48286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728027AbgDKXKK (ORCPT ); Sat, 11 Apr 2020 19:10:10 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0D37621835; Sat, 11 Apr 2020 23:10:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646610; bh=hC0tRT7s7FAtnQHhA5C5oJkGKpQ3PjHd2+By1rljjAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fzUQOozYlHq2OUGDkaSJHbNtnFWYcJdBCHQ90gzXokwXpseCu8ysEwheyjVaeSSW1 qWQuS74L3iJdcv1FyP+3BBRN0O2ioUz2jD+m3CNcx2UVwaHuzS/M3htP3x14CiTmO3 re24u89Kdkhn8R/l4+IFtrUc48j9O2ohO+ETv1I4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Osipenko , Thierry Reding , Sasha Levin , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 022/108] drm/tegra: dc: Release PM and RGB output when client's registration fails Date: Sat, 11 Apr 2020 19:08:17 -0400 Message-Id: <20200411230943.24951-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230943.24951-1-sashal@kernel.org> References: <20200411230943.24951-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Osipenko [ Upstream commit 0411ea89a689531e1829fdf8af3747646c02c721 ] Runtime PM and RGB output need to be released when host1x client registration fails. The releasing is missed in the code, let's correct it. Signed-off-by: Dmitry Osipenko Signed-off-by: Thierry Reding Signed-off-by: Sasha Levin --- drivers/gpu/drm/tegra/dc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index fbf57bc3cdaba..6dbbd238f60be 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -2496,10 +2496,16 @@ static int tegra_dc_probe(struct platform_device *pdev) if (err < 0) { dev_err(&pdev->dev, "failed to register host1x client: %d\n", err); - return err; + goto disable_pm; } return 0; + +disable_pm: + pm_runtime_disable(&pdev->dev); + tegra_dc_rgb_remove(dc); + + return err; } static int tegra_dc_remove(struct platform_device *pdev) -- 2.20.1