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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 23D59C4332D for ; Wed, 23 Dec 2020 02:17:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E425F23380 for ; Wed, 23 Dec 2020 02:17:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727239AbgLWCRQ (ORCPT ); Tue, 22 Dec 2020 21:17:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:44620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727234AbgLWCRO (ORCPT ); Tue, 22 Dec 2020 21:17:14 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0D85122248; Wed, 23 Dec 2020 02:16:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608689793; bh=lJ5yxKRFM+bJLKd/Ns3NYPBSkBeHsGXFVHnerk6Oihg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dcuoejv8CnujBKhiMVRWD5JFfzEIPKeUf19INm35+dEaC5jeWI+iR/sT56GAuZf0C EMjsns7dHOcFbsmuGoxDDosqJpSjDcY8ISYpdlzctl8bG2bE4QYTFR+ooHY8ZYTSsP 322mHjL3rRkgQ7+yU64WXt9Klc1zae51q4DjLXNrg+sp6pT8lpiOarhvhaQ4eU+l6o XXn81hazqPcRIfhQF8b5LzjcMEh3pS9NEqU7UnEVPtTPCt6KvjwzB8gwKKssziqN8F VEjSwHBPqkJtDlJfVRlqf7XDDMZUfMvvKRG5sDmTMLvF6ZrWhbu8fsBnzqS+iegPdu ovtyNyIZI7lVQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yifan Zhang , Matt Coffin , Alex Deucher , Roman Li , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.10 005/217] drm/amd/display: Fix the display corruption issue on Navi10 Date: Tue, 22 Dec 2020 21:12:54 -0500 Message-Id: <20201223021626.2790791-5-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223021626.2790791-1-sashal@kernel.org> References: <20201223021626.2790791-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: stable@vger.kernel.org From: Yifan Zhang [ Upstream commit 0b08c54bb7a37047a3a006e36c2270ebc62fef7d ] [Why] Screen corruption on Navi10 card [How] Set system context in DCN only on Renoir Tested-by: Matt Coffin Acked-by: Alex Deucher Signed-off-by: Yifan Zhang Reviewed-by: Roman Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 547928cf284b5..96907707fdd94 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1085,10 +1085,14 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) dc_hardware_init(adev->dm.dc); - mmhub_read_system_context(adev, &pa_config); +#if defined(CONFIG_DRM_AMD_DC_DCN) + if (adev->asic_type == CHIP_RENOIR) { + mmhub_read_system_context(adev, &pa_config); - // Call the DC init_memory func - dc_setup_system_context(adev->dm.dc, &pa_config); + // Call the DC init_memory func + dc_setup_system_context(adev->dm.dc, &pa_config); + } +#endif adev->dm.freesync_module = mod_freesync_create(adev->dm.dc); if (!adev->dm.freesync_module) { -- 2.27.0