Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3385318pxb; Mon, 17 Jan 2022 19:16:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwi9+FomOlmUhMfymH8Guk6VxfpmifHah+SC6PBTuoxpKZE5PZcAIEtUro0Z80T43Cnhbnr X-Received: by 2002:a63:87c8:: with SMTP id i191mr14935842pge.465.1642475765208; Mon, 17 Jan 2022 19:16:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642475765; cv=none; d=google.com; s=arc-20160816; b=gncR3oxo8VBsE6bTt2Yigm7RqRytkIX9Tx2sgPhT6Z3NDAZ9WD6wvfzTYsvKmdV1r7 ZLmAtBmteICmpx2sD3+gSweSa6UYY+Wq20hllVQIRBn0HpnXrqOZ1WS6+trbHTzg9/Ei t8bhPtp8u/IpgO/kvhHCdK8hT8vnx4MvfsuSLwWfkvTkyTuzCPKc0kDNo2UD7mPTufqz dOTqxRgTQCH+ytrBFUvXZYTMxjaP89zeNOPellCUKt866xNok7oMMlfSFqBRlkEouhdY HavjHexqF/bgf6QXUel17IEXSK4w/gWyMEj3K/xvYcTEoKOlD+VCAJBq4aJYDmuTiq3t V5oQ== 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=XAkcV+F3OI7YqXpQKmseMAKyKot+cRGj/vLKX0hqBCM=; b=Y5FyANsnjIsiYyJA2EckAfpPfEFZoObCmutcACotrzODUHk8hy2YDGzQsfhtJXvvkB hInz/ZQCQntZ8iQHPMdBX6Os0B6UR7fB5F47k7AkY6y5NzmocJQypkXSFF33nHkzARuz dq2NzL+Yoivx0gNSI7PvZ88TA9qQOLLrA2pmzEz2CDQ2WtsggqAb6qBji/RMh1sTEBRK pqWYMpGWqwR/X9/crF25jiBDGcHqLFWiNuy0sdATe3qkndURCBenGzw3LqEUSr938+VY Cqk+TjvAAVprxhzWZ7ni2cJJgivR0xMjErBbR8hgxQejlaulAqgtgZiuVi4lemsZ5pbV yu+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pnpgwMvu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z14si1032555pjh.105.2022.01.17.19.15.52; Mon, 17 Jan 2022 19:16:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pnpgwMvu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S245281AbiARCZO (ORCPT + 99 others); Mon, 17 Jan 2022 21:25:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244943AbiARCXa (ORCPT ); Mon, 17 Jan 2022 21:23:30 -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 552ADC06178C; Mon, 17 Jan 2022 18:23:20 -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 0FF04B81236; Tue, 18 Jan 2022 02:23:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3FD1C36AEF; Tue, 18 Jan 2022 02:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642472597; bh=REBuG4OoCqpO2dEgywiMEnlKX2lH4hWXFOcoOtaLmws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pnpgwMvuYcFIuLoKX2K6wgK2KP3nvpe/VKllPRp4G+ihdqMGBajrOBxdk5vPi0tUF Hok4NMHKHEBJQL79YupI58Bjql6ZmcXHnqc0pdYCgx5uFVB5YAMkcjWzA4q93u5tAh 44gi8czc/RHnIb13uoXA4LiwQKXw5K+LyjojK1pxvgMCBVRVaW6ISoY92Y93YXJDjQ 8fe6xBel1MBN4nuzZtgCydLQAxb95zBv1r3kY8Zz786nA1Hp40Uex6ymOsx74Clisj WHd5PgauRqW39Ikx/EiyXAEDJ88OBnD6rRKzudahbLOASyGRC6THeanZYKuVB5i/9Y G45t3UgCF2jog== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Leung , Aric Cyr , Qingqing Zhuo , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, nicholas.kazlauskas@amd.com, charlene.liu@amd.com, Dmytro.Laktyushkin@amd.com, agustin.gutierrez@amd.com, haonan.wang2@amd.com, mikita.lipski@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.16 064/217] drm/amd/display: add else to avoid double destroy clk_mgr Date: Mon, 17 Jan 2022 21:17:07 -0500 Message-Id: <20220118021940.1942199-64-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118021940.1942199-1-sashal@kernel.org> References: <20220118021940.1942199-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Leung [ Upstream commit 11dff0e871037a6ad978e52f826a2eb7f5fb274a ] [Why & How] when changing some code we accidentally changed else if-> if. reverting that. Reviewed-by: Aric Cyr Acked-by: Qingqing Zhuo Signed-off-by: Martin Leung Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c index 26f96ee324729..9200c8ce02ba9 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c @@ -308,8 +308,7 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base) case FAMILY_NV: if (ASICREV_IS_SIENNA_CICHLID_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) { dcn3_clk_mgr_destroy(clk_mgr); - } - if (ASICREV_IS_DIMGREY_CAVEFISH_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) { + } else if (ASICREV_IS_DIMGREY_CAVEFISH_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) { dcn3_clk_mgr_destroy(clk_mgr); } if (ASICREV_IS_BEIGE_GOBY_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) { -- 2.34.1