Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4567829pxv; Tue, 6 Jul 2021 04:15:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6nwcNQg3iiD7gCXSh4ET6PE1vtkQIlk8W57/9A2iUoyFqspA76BLL2QXzWtvqPzIw1Hc7 X-Received: by 2002:a02:818c:: with SMTP id n12mr16582634jag.2.1625570132613; Tue, 06 Jul 2021 04:15:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570132; cv=none; d=google.com; s=arc-20160816; b=AOkphKvLJrXFCLnhu7c7Q1Cuh0S6rSh4j9ZMfVf1xxOrdGUp2eETVf6gW5GyM53Q9o nAJGmtVtfmIwRzdm+cfdv1Bh8RuA4cH7V1AKI1mNspO3NvX3+JB/DT2K+5BjT3XqubRE a6SmYwUL850LzeyPAS8R8ccFTzDQBSLR2OtDsMDt7fryYqOk3Ho7PFDvU6WY0abgUAfw lRxiSz6zITNis2EKEXlRfKf+OfnxHFuLwc62nFxQOZAAGCSb7oHqFSn+F5xmzn0Dtn/f T3nHzz5rO/RuITBcvt2sTaPR7S2te+GnbF09RdzzZVLS7HT0QoiZu+gERCkn1pd0zT2d vqjA== 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=YY+QF6shkci+1D3WBQeX1nrzMdPptkOXvWcZBhTZqyA=; b=t9wNXS0u7e9WNKUaLnCbWGXsAMSIPc2MnuhF+NSZMSL8smmNSkNx8J6R09Zih8mEhn 9L0JCnfG4cQWoRGjj+8Kk0O8mtypxNkM2xri3FSGHzqcs5pA72nC2N0/BJuVSqwX7ZIF uJ1V5WQP7Xhj01lfFlX42r35BJzGBtKgK2CCSmUOEgkeNT6KMkHxkqtWe7pJVcL6cNx9 UCEwKv/c+Ny+LuVj8ZDo8thBztjrGwzM545DB7WE5R25a3Jx4CA03t+UcyPxzw/E63MP XH164UaPyaRrigKKviipGCZEVJBwVS/dD+US347Iad6+7XIwov9CcMg1Oup9kC7578xA gOQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NSbSsBsv; 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 g9si83275ilb.126.2021.07.06.04.15.20; Tue, 06 Jul 2021 04:15:32 -0700 (PDT) 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=NSbSsBsv; 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 S231952AbhGFLRI (ORCPT + 99 others); Tue, 6 Jul 2021 07:17:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:51514 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231892AbhGFLQ6 (ORCPT ); Tue, 6 Jul 2021 07:16:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5321661C20; Tue, 6 Jul 2021 11:14:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570060; bh=5lNEDT8qos+QLc8MRVxXgKYOzcrK5fqrjXUcMPRfdMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSbSsBsviB61XKXoBWYtR1Ue4YWqbRnGeuX5UXg7bUQp2NTK/4GlQrqvQ2PxR6L7t aD5QDX0VqSGL8mc9MUP5qRFOKmykCmnAH/YnkKjiBNU5PQ4trV5wBhbVWhRZFjAYjC li+CDSpXYTEpXwH0lrVkDkjSsIvSoWE2e7HmrnYUbT6WF5MoQpi9fEE/lnEmlCl6o9 zE7771nWSTd7l3Uoh/U+pCW60VOphmhEBFNlYoZjQfOj55LsaYczZw9JYNv9K7Vehw vvAOqvDka2Lon6/bkmMPfb9J2lIwCGypt5eR7DKDa+rXjAZaehok1OPsQIKtTNWt56 5f/uoVyohlklw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chris Park , Nicholas Kazlauskas , Wayne Lin , Daniel Wheeler , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.13 007/189] drm/amd/display: Fix BSOD with NULL check Date: Tue, 6 Jul 2021 07:11:07 -0400 Message-Id: <20210706111409.2058071-7-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-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: Chris Park [ Upstream commit b2d4b9f72fb14c1e6e4f0128964a84539a72d831 ] [Why] CLK mgr is null for server settings. [How] Guard the function with NULL check. Signed-off-by: Chris Park Reviewed-by: Nicholas Kazlauskas Acked-by: Wayne Lin Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index e57df2f6f824..a869702d77af 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -3274,7 +3274,7 @@ void dc_allow_idle_optimizations(struct dc *dc, bool allow) if (dc->debug.disable_idle_power_optimizations) return; - if (dc->clk_mgr->funcs->is_smu_present) + if (dc->clk_mgr != NULL && dc->clk_mgr->funcs->is_smu_present) if (!dc->clk_mgr->funcs->is_smu_present(dc->clk_mgr)) return; -- 2.30.2