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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08861C4332F for ; Fri, 11 Nov 2022 02:35:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232750AbiKKCfg (ORCPT ); Thu, 10 Nov 2022 21:35:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232825AbiKKCey (ORCPT ); Thu, 10 Nov 2022 21:34:54 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6B1467F6F; Thu, 10 Nov 2022 18:34:19 -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 535FBB822ED; Fri, 11 Nov 2022 02:34:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B834C433C1; Fri, 11 Nov 2022 02:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668134057; bh=Ur+6ung+1Jg5W4OUPwgfM4XGfn/eozgws0JTSUiElDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O10V8uNY3q4tFUuX15+VlfM8UNaZWZ9byJvNtMspm+Ecz/JKT9J4oPXMdXLrsTHN3 /A9gtk5dQdLGiA8TmzD4flubMFZegm8rP/+3s6PUQq8QVrb1TXnaORfIGGkNJ8Lo0e HohrJZCx/t/n2zUxAx9tFngu0U+LUcqlVpK2A3Lo/JhPT2FzHNkp69tq3hhIoivLpC tCmE4gl96Rzu+2wL0ZnhX6Ll0QhQI3palbEmCQOPJ7fwglv7awp+YF8Vcf0bK2OZGx +i7mAKCwl47xakUfL+JFvgU9lK5q5cDP5OFy/jESH5FitEHqdzYVz3RdJSo9sBWTL5 ivZA8mH611JUw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fangzhi Zuo , Mark Broadworth , Roman Li , Rodrigo Siqueira , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, nicholas.kazlauskas@amd.com, aurabindo.pillai@amd.com, roman.li@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.0 18/30] drm/amd/display: Ignore Cable ID Feature Date: Thu, 10 Nov 2022 21:33:26 -0500 Message-Id: <20221111023340.227279-18-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221111023340.227279-1-sashal@kernel.org> References: <20221111023340.227279-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: Fangzhi Zuo [ Upstream commit 14aed119942f6c2f1286022323139f7404db5d2b ] Ignore cable ID for DP2 receivers that does not support the feature. Tested-by: Mark Broadworth Reviewed-by: Roman Li Acked-by: Rodrigo Siqueira Signed-off-by: Fangzhi Zuo Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+) 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 3be70848b202..54c76ed1ad75 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1549,6 +1549,9 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) adev->dm.dc->debug.visual_confirm = amdgpu_dc_visual_confirm; + /* TODO: Remove after DP2 receiver gets proper support of Cable ID feature */ + adev->dm.dc->debug.ignore_cable_id = true; + r = dm_dmub_hw_init(adev); if (r) { DRM_ERROR("DMUB interface failed to initialize: status=%d\n", r); -- 2.35.1