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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D77F4C433F5 for ; Fri, 4 Feb 2022 19:04:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48A8B10E1FF; Fri, 4 Feb 2022 19:04:29 +0000 (UTC) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2054.outbound.protection.outlook.com [40.107.236.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5362010E1FF for ; Fri, 4 Feb 2022 19:04:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QE+lV3yUnpo3PvT1vLi7w0lXE3/qEylYJ+Z7M0fCRueCbBmMqQtDRBDZrVh2eQC/OKk5Gpnu3in8c+AJMi26YflSq+DL0ygeE1RzmGGwXzqVi029H2+eGiQsbhvPloFQrnP4I0YvEDgAAOonOo2bjGtFFV0KfkwdSekzU1g4/sGajp7/u2PJG5sIWulwE/w0RUI0dqzQmzwqc0ycqAOknyFmN3KruLbCfdQ5PTBT5Vu6vREnOf1WKsyfgqOf3OQ/74n9zEFS4xgH2I8z5Y5F5seeyWL/Dq1S/AiNMQBYG3+TlyNCD9tpc270tw1VI4gRxR/eX14Bc2YheeMF+u928A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pPz6/v1nrQEqZHWm9AfNH0IyVN3ueen5WHGpzV3WnnU=; b=hNOao3Ky9a6e2is7NBhQkX5P2WfKE/a/EO8i3YcWCQBo/eQOPlQnkQiz2Luc86+yl4QuSe+4EoHhOlwa6rVDtf38ALCpuVPoMHbVu/qu9cpBgfk5bEfQX4sQa4VRS1fxyQlkPhT7Jbn0uFejxQEJuqiwB2vMwmHCj3vVXwyV6q7reaqO36yk6xpdUgl/+zV2ZQ8HHFXpy05YFCIpHncgmL2JmAtdn/6gJxf8fjw+lYsLKVxQ2MqGQykHLIfGBw/whVk89xsm3rWccdWTa89EbtSBAAs8OTe03SpnZmGa4vyzyQygC3eqyCc+Bg+xgKGEjft+YR4yVcZ227DwOlEOrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pPz6/v1nrQEqZHWm9AfNH0IyVN3ueen5WHGpzV3WnnU=; b=3s4hHwG3JX+i9gqeiyMY5wstvvj11vTsg/xvnU6TjV246/hKLu/cUjcu67r+45G8ZLVQCLqh1KOoCvObDt9XXppQb4Yvazh7cS8JfVu5I4sgRoe4X0jHT6B7ndw2dN3Yb9xnz6j0iMfLGE3uALouqDHSt5bbR/KqMQ4Wa9/npQA= Received: from MWHPR12CA0071.namprd12.prod.outlook.com (2603:10b6:300:103::33) by MWHPR12MB1902.namprd12.prod.outlook.com (2603:10b6:300:10d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Fri, 4 Feb 2022 19:04:25 +0000 Received: from CO1NAM11FT053.eop-nam11.prod.protection.outlook.com (2603:10b6:300:103:cafe::5c) by MWHPR12CA0071.outlook.office365.com (2603:10b6:300:103::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.11 via Frontend Transport; Fri, 4 Feb 2022 19:04:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT053.mail.protection.outlook.com (10.13.175.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4951.12 via Frontend Transport; Fri, 4 Feb 2022 19:04:25 +0000 Received: from jasdeep-System-Product-Name.hitronhub.home (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Fri, 4 Feb 2022 13:04:20 -0600 From: Jasdeep Dhillon To: Subject: [PATCH 04/13] drm/amd/display: Basic support with device ID Date: Fri, 4 Feb 2022 14:03:48 -0500 Message-ID: <20220204190357.94538-5-jdhillon@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220204190357.94538-1-jdhillon@amd.com> References: <20220204190357.94538-1-jdhillon@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39647f45-868c-4e45-f5fc-08d9e8112939 X-MS-TrafficTypeDiagnostic: MWHPR12MB1902:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1051; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LM/Te91LzAgahi3PKq9myXB1z4PIfQoGExR7Cs/uD5qJPiNyRDPgnrNQX+sVNRVlJYyEWhQH3pX7sukjd4eRQ+2Nb03DV/KpQdym8mB6C/JPQSvf8pls+2SulEBXcy9OWHneW3i5hI19tJ0dZKffXbUepnyNsc4R8NzPE2PhLulVmwM3feJKJ5fQs/GxzKKc5IpCeyjC+zdEUULZYZ2SUUxGwpB/VP4oTu749B46aNVrEM0/bZXIgaE/VDGZ2t1+RDL1uV8DcnyEzItKhG8tNgZ6t4Z4yvPNHhtQL2GTniRcUuPBKFGZjEFBGsadjhmI/liEWXanypwfVvzMHd5U3X/R/FUAO/pkNIi/BDptkHu8K6BFQzQaS6pMSG6uujguYTM8QAucYP3qM5nY65sriSr3PdU6wNM+Z5cntNVDtpPw/PEPxXlsJ18BEWiY0/OOXO5AmcJNSwJ9kVx5BZpfSrIVHG0Q/HjwNATC2DbJD0bZgoCQU98/bP1wv0CdaxQ0+nUGtTpXmtFcyiDnFKs1f3bm3Lty9sx1ybtBlZM4MCpYUC+/DajRtYyCOYPCawcvse4Q2iRG9V0uC4I4S4XckeNJplbIWDWWFJTasX8JIJ7IPLfHyA17tTDbQQfJK9bnFDKdjKrBLveRvZ2zVivmCYuao92z4F7qeRneXISjIJDeVbgFlneOnhn1EsqnT0veMLnGcvjKOLLHQ3t902kf1A== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(2906002)(356005)(36860700001)(5660300002)(16526019)(26005)(36756003)(40460700003)(47076005)(81166007)(186003)(82310400004)(83380400001)(70586007)(508600001)(8936002)(70206006)(4326008)(1076003)(2616005)(6916009)(54906003)(426003)(316002)(336012)(6666004)(8676002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2022 19:04:25.1513 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39647f45-868c-4e45-f5fc-08d9e8112939 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT053.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1902 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stylon.wang@amd.com, Charlene Liu , Oliver Logush , Sunpeng.Li@amd.com, Harry.Wentland@amd.com, qingqing.zhuo@amd.com, Jasdeep Dhillon , Rodrigo.Siqueira@amd.com, roman.li@amd.com, solomon.chiu@amd.com, Aurabindo.Pillai@amd.com, wayne.lin@amd.com, Bhawanpreet.Lakha@amd.com, agustin.gutierrez@amd.com, pavle.kotarac@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Oliver Logush [why] To get the the cyan_skillfish check working Reviewed-by: Charlene Liu Reviewed-by: Charlene Liu Acked-by: Jasdeep Dhillon Signed-off-by: Oliver Logush --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 +++++++++++++++++-- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- .../gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 2 +- .../gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- .../gpu/drm/amd/display/include/dal_asic_id.h | 3 ++- 5 files changed, 27 insertions(+), 6 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 8f53c9f6b267..f5941e59e5ad 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1014,6 +1014,14 @@ static void amdgpu_dm_audio_eld_notify(struct amdgpu_device *adev, int pin) } } +bool is_skillfish_series(struct amdgpu_device *adev) +{ + if (adev->asic_type == CHIP_CYAN_SKILLFISH || adev->pdev->revision == 0x143F) { + return true; + } + return false; +} + static int dm_dmub_hw_init(struct amdgpu_device *adev) { const struct dmcub_firmware_header_v1_0 *hdr; @@ -1049,7 +1057,7 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev) return -EINVAL; } - if (!has_hw_support) { + if (is_skillfish_series(adev)) { DRM_INFO("DMUB unsupported on ASIC\n"); return 0; } @@ -1471,6 +1479,10 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) default: break; } + if (is_skillfish_series(adev)) { + init_data.flags.disable_dmcu = true; + break; + } break; } @@ -1777,7 +1789,6 @@ static int load_dmcu_fw(struct amdgpu_device *adev) case CHIP_VEGA10: case CHIP_VEGA12: case CHIP_VEGA20: - return 0; case CHIP_NAVI12: fw_name_dmcu = FIRMWARE_NAVI12_DMCU; break; @@ -1805,6 +1816,9 @@ static int load_dmcu_fw(struct amdgpu_device *adev) default: break; } + if (is_skillfish_series(adev)) { + return 0; + } DRM_ERROR("Unsupported ASIC type: 0x%X\n", adev->asic_type); return -EINVAL; } @@ -4515,6 +4529,12 @@ static int dm_early_init(void *handle) adev->mode_info.num_dig = 6; break; default: + if (is_skillfish_series(adev)) { + adev->mode_info.num_crtc = 2; + adev->mode_info.num_hpd = 2; + adev->mode_info.num_dig = 2; + break; + } #if defined(CONFIG_DRM_AMD_DC_DCN) switch (adev->ip_versions[DCE_HWIP][0]) { case IP_VERSION(2, 0, 2): diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h index e35977fda5c1..13875d669acd 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -82,7 +82,7 @@ struct common_irq_params { enum dc_irq_source irq_src; atomic64_t previous_timestamp; }; - +bool is_skillfish_series(struct amdgpu_device *adev); /** * struct dm_compressor_info - Buffer info used by frame buffer compression * @cpu_addr: MMIO cpu addr 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 9200c8ce02ba..54ef83fe5a9b 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 @@ -259,7 +259,7 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p dcn3_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg); return &clk_mgr->base; } - if (asic_id.chip_id == DEVICE_ID_NV_13FE) { + if (asic_id.chip_id == DEVICE_ID_NV_NAVI10_LITE_P_13FE) { dcn201_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg); return &clk_mgr->base; } diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 9df66501a453..8a199d661a66 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -135,7 +135,7 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id) case FAMILY_NV: dc_version = DCN_VERSION_2_0; - if (asic_id.chip_id == DEVICE_ID_NV_13FE) { + if (asic_id.chip_id == DEVICE_ID_NV_NAVI10_LITE_P_13FE || asic_id.chip_id == DEVICE_ID_NV_NAVI10_LITE_P_143F) { dc_version = DCN_VERSION_2_01; break; } diff --git a/drivers/gpu/drm/amd/display/include/dal_asic_id.h b/drivers/gpu/drm/amd/display/include/dal_asic_id.h index e4a2dfacab4c..c25bc4d9cd4b 100644 --- a/drivers/gpu/drm/amd/display/include/dal_asic_id.h +++ b/drivers/gpu/drm/amd/display/include/dal_asic_id.h @@ -211,7 +211,8 @@ enum { #ifndef ASICREV_IS_GREEN_SARDINE #define ASICREV_IS_GREEN_SARDINE(eChipRev) ((eChipRev >= GREEN_SARDINE_A0) && (eChipRev < 0xFF)) #endif -#define DEVICE_ID_NV_13FE 0x13FE // CYAN_SKILLFISH +#define DEVICE_ID_NV_NAVI10_LITE_P_13FE 0x13FE // CYAN_SKILLFISH +#define DEVICE_ID_NV_NAVI10_LITE_P_143F 0x143F // ROBIN+ #define FAMILY_VGH 144 #define DEVICE_ID_VGH_163F 0x163F #define VANGOGH_A0 0x01 -- 2.25.1