From patchwork Mon Oct 24 19:22:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hamza Mahfooz X-Patchwork-Id: 10318 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp659201wru; Mon, 24 Oct 2022 14:27:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7os/B0ZAddTMvUkWwVZY/hS7a+jTQUdZR4uQqv4K3vd66G+tJcNQhiKjbJ9c4I12NHwD3C X-Received: by 2002:a17:907:e93:b0:78d:b8ff:9b5f with SMTP id ho19-20020a1709070e9300b0078db8ff9b5fmr29739536ejc.12.1666646847252; Mon, 24 Oct 2022 14:27:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1666646847; cv=pass; d=google.com; s=arc-20160816; b=qAVLzR0IoBzPuvfhhgbEn8eYSPuccb4hVaAW/G+qi2fTASVjZvltxigbD+iJWjAUMq iFszHyaKAu2DQJoU0crRjL93Jkbgo9hsCprW+5nt454MU41Ue5anL2MfhHiDMNNcawGa i1EduV5KYrAt5K/lS4eVOpUJfjqu0ofAYEteoge8pJFLlN8TSrwrQDAYuutt1zklxAQE Y+JhfuN7mgyqn2+/PAZk789kJWdr6GHHFK7JdhOyct8aT11OUQK+BiE5+L0tZsOLmyWh 1TtcQu1ov9Npfw9bmHlbou0Y9ib7yVeQu/8QwpUSNWLT5ZcalGo0NsLe5YcIFH16njff Dmrg== ARC-Message-Signature: i=2; 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=cMnXVaY5RyOYqYXy5gC6NAtXTn+KN1+YVIUuZP1m2vo=; b=nIVCwZwOkEqS6+LQ8KyciWvM2kFDDIH4vSBe5nY2JPLmFPf/dk2xr1h2GxrUFZvWBx mRg4+NPTk039TcJSYL+tEwd4wbqKrxgQ1HrppaaNVX2URT4xryVTZjPqL87TOl2GLq8G Wa8NP4IM10udr5lOWgWpigE43TC5sOwlSIWfm5pzo4jjhPWEf6w2pNHyaJi7HBRrvRq2 MCbm5uAYZhERJh6og/5mIQinaaFaevM5gqbANZIP2L4LIpvleHbgmMPbRvvX0T2z4QdJ sJ14/ZMjTvfi5R5cgz0hgl2P4CB0qQMPXo6CYWUSM3QgPHogIwAaWSA8CMSytyCEUHIk rHyg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b="XTW2o5/U"; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cs14-20020a170906dc8e00b007a0b28c324esi688171ejc.1008.2022.10.24.14.26.47; Mon, 24 Oct 2022 14:27:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b="XTW2o5/U"; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234839AbiJXVZk (ORCPT + 99 others); Mon, 24 Oct 2022 17:25:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234375AbiJXVZJ (ORCPT ); Mon, 24 Oct 2022 17:25:09 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20611.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::611]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71EA01C5A63 for ; Mon, 24 Oct 2022 12:31:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XEaZgvYzrsKaSFrdcR9FRVBHmff3hupPhn68+woh4+atgjvZlssuDwzGa9TW5BrlQZLeCmbqsNZUYs4uQTySmN2EE1uCqg8VmBl+UQrqpuwi28x9nPwau5r4vM0JG+dN417GOmrMeCyl7lujXuo2jrkIOVPXmT6HSvkTGLaxEcCHNBlR2OKRiGf/ZW72ftLpZC3lxO2Ohy+KvZCZv+IDesfHeAUWbGAEf2DHr6F53DCE5eUMOag6EqRfE5CwSBP45mcgsws9hOs3X88YwYI/FLJdn+vU2Wg5w/kQM4MIw7kpyhjrb74PzO03zbTbKnm+7Djb3bpPw9K501TXnEgO0Q== 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=cMnXVaY5RyOYqYXy5gC6NAtXTn+KN1+YVIUuZP1m2vo=; b=UxDCb57bUNSTGm8Wvlb5/Fho3HkbcXnyemKMPumvusnyJFh1om9C+WePII1yB4rMVsDmgcNqwqrHmm3uPectS1nrpJA32h801fFkVF+oqk4bUtIuqfEoCjbKsL63WyxlgEuyEZJvjWmJNFvkTYVm8onmQYdC9gzTV1GbhrpQc7GO5rpUL6x9e8bm8NpYsYoa/83+1ZNQIqEota/wVVYx8Q2iIPXHpVv0xqSxRn/OJlcJP66KqZXWQk0/t1+T8ERQf0O6pYQDtyQZlV3v8n2aGY7gtmKDF5NSidXcAkuvdXR2U8fWs7PbUDk54iRS2wbGEqWqTOLyjmzW7XyWFOyKsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.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=cMnXVaY5RyOYqYXy5gC6NAtXTn+KN1+YVIUuZP1m2vo=; b=XTW2o5/Uy8lulNObSwvAFtxB1Wxn6r649n308k0BqALxAi3Lz6ofET3LST5fT/Foeu1qQ496JwwBUTC0sBapM6omeOcOIEOnqgHyKGU+dZX1abtKzHVne9QFGlqraHxz6yx51EGDG0suSH8zWFEia2GU0pRlNP2NvVtfsrweSFA= Received: from BN0PR04CA0116.namprd04.prod.outlook.com (2603:10b6:408:ec::31) by SJ0PR12MB5662.namprd12.prod.outlook.com (2603:10b6:a03:429::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34; Mon, 24 Oct 2022 19:22:13 +0000 Received: from BL02EPF0000C403.namprd05.prod.outlook.com (2603:10b6:408:ec:cafe::57) by BN0PR04CA0116.outlook.office365.com (2603:10b6:408:ec::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.26 via Frontend Transport; Mon, 24 Oct 2022 19:22:13 +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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL02EPF0000C403.mail.protection.outlook.com (10.167.241.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5723.20 via Frontend Transport; Mon, 24 Oct 2022 19:22:13 +0000 Received: from hamza-pc.amd.com (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.31; Mon, 24 Oct 2022 14:22:11 -0500 From: Hamza Mahfooz To: CC: Roman Li , Hamza Mahfooz , "Harry Wentland" , Leo Li , "Rodrigo Siqueira" , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Nicholas Kazlauskas , Aurabindo Pillai , Wayne Lin , Fangzhi Zuo , Lyude Paul , Ian Chen , Mikita Lipski , Claudio Suarez , Colin Ian King , hersen wu , , Subject: [PATCH 2/3] drm/amd/display: use max_dsc_bpp in amdgpu_dm Date: Mon, 24 Oct 2022 15:22:22 -0400 Message-ID: <20221024192224.180507-2-hamza.mahfooz@amd.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221024192224.180507-1-hamza.mahfooz@amd.com> References: <20221024192224.180507-1-hamza.mahfooz@amd.com> MIME-Version: 1.0 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-TrafficTypeDiagnostic: BL02EPF0000C403:EE_|SJ0PR12MB5662:EE_ X-MS-Office365-Filtering-Correlation-Id: 92db5140-9e84-4811-f9c3-08dab5f50dea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m1wwP7LWmmKq16133R2GpHrHGODxDK76P9W26bNZihFCxPCqRJoKd0h+Wnpz4YKPdmfn0u2tdjBMPppbSOetOXNBcBkxuyb7Zc68b6DD5CDgJiUnAmL3LwsIq1YKD+b83gvGbLLXAEJ35oJV1gkx/0kEy0aNqros0t028uL1avfzCNjkHjs7g0Y7pM6Smdd49PhuvIBuPlLdKNu+7yA1vVBX3G4zB+/dyqVn0FPZBnH97nykSIVXOUo2tdOUYofNo+/mJqiRMcik/+i2g7eAnNvJoMv6hvFVpUcNPburrL6MGenk6PslB4sJUeIDVcm3PjR7+FAgDlg93eON+vFVZNqPe48b6NZjtb6XQEwWYEVeoe2o7Vz67RvR3eVoWzYV64+sc2Cu86mTFxSymmNg6sYzmNSTQLIsz6tri7751iz3Qpxpn7Asg8LhpdKMxldppj1lZQ5Hb83CeJhI6amkTzhoxydecQeJBIeaKLyHtECZPW6F2EOlY6aAh3MFQF6FipdbGUyAU9tWV8H8zDyNUuHDkXN4tSh57iOiQ44NFKHHbjMstYCPD1I/t6XCywMX8z9+eKui3H8+YLSThQaLqLqs/s4R1XzL65v6SgiFrL52LnndfmQq8SQ4ylUIcZcxNlCG6RY9m9FLMHZ6F6nhn1kjUJk2beruYHzXBgfqCLgPC6G/gZMSS5DppEtFLrXzQPd4REOBGSDt6ycRkIQ95Xm5/6+LbhuMh19aVm1BpDY2czwolU7Des3n+J+BZ0D8lbG3T6AVx4xg9NdKoSICEgVphslLRs7mwY9WIyS259APecOGxsN0fSZ8deNBiJTgHPwCWPakRFD5YtACc8/Nzg== 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:(13230022)(4636009)(346002)(39860400002)(376002)(136003)(396003)(451199015)(46966006)(36840700001)(40470700004)(6916009)(70206006)(478600001)(54906003)(316002)(70586007)(7696005)(6666004)(8676002)(4326008)(81166007)(41300700001)(47076005)(26005)(8936002)(336012)(186003)(426003)(5660300002)(44832011)(1076003)(2616005)(7416002)(2906002)(83380400001)(86362001)(40460700003)(16526019)(36860700001)(82740400003)(356005)(36756003)(82310400005)(40480700001)(36900700001)(16060500005);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2022 19:22:13.0995 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92db5140-9e84-4811-f9c3-08dab5f50dea 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: BL02EPF0000C403.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5662 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747605884501553929?= X-GMAIL-MSGID: =?utf-8?q?1747605884501553929?= Since, the quirk is handled in the DRM core now, we can use that value instead of the internal value. Signed-off-by: Hamza Mahfooz --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++---- .../drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 11 +++++++++-- 2 files changed, 11 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 63f076a46260..9b9cca8cb71a 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5618,16 +5618,14 @@ static void apply_dsc_policy_for_stream(struct amdgpu_dm_connector *aconnector, { struct drm_connector *drm_connector = &aconnector->base; uint32_t link_bandwidth_kbps; - uint32_t max_dsc_target_bpp_limit_override = 0; struct dc *dc = sink->ctx->dc; uint32_t max_supported_bw_in_kbps, timing_bw_in_kbps; uint32_t dsc_max_supported_bw_in_kbps; + uint32_t max_dsc_target_bpp_limit_override = + drm_connector->display_info.max_dsc_bpp; link_bandwidth_kbps = dc_link_bandwidth_kbps(aconnector->dc_link, dc_link_get_link_cap(aconnector->dc_link)); - if (stream->link && stream->link->local_sink) - max_dsc_target_bpp_limit_override = - stream->link->local_sink->edid_caps.panel_patch.max_dsc_target_bpp_limit; /* Set DSC policy according to dsc_clock_en */ dc_dsc_policy_set_enable_dsc_when_not_needed( diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index ce6929224a6e..eb42c0e21a28 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -670,15 +670,18 @@ static void set_dsc_configs_from_fairness_vars(struct dsc_mst_fairness_params *p int count, int k) { + struct drm_connector *drm_connector; int i; for (i = 0; i < count; i++) { + drm_connector = ¶ms[i].aconnector->base; + memset(¶ms[i].timing->dsc_cfg, 0, sizeof(params[i].timing->dsc_cfg)); if (vars[i + k].dsc_enabled && dc_dsc_compute_config( params[i].sink->ctx->dc->res_pool->dscs[0], ¶ms[i].sink->dsc_caps.dsc_dec_caps, params[i].sink->ctx->dc->debug.dsc_min_slice_height_override, - params[i].sink->edid_caps.panel_patch.max_dsc_target_bpp_limit, + drm_connector->display_info.max_dsc_bpp, 0, params[i].timing, ¶ms[i].timing->dsc_cfg)) { @@ -720,12 +723,16 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn) struct dc_dsc_config dsc_config; u64 kbps; + struct drm_connector *drm_connector = ¶m.aconnector->base; + uint32_t max_dsc_target_bpp_limit_override = + drm_connector->display_info.max_dsc_bpp; + kbps = div_u64((u64)pbn * 994 * 8 * 54, 64); dc_dsc_compute_config( param.sink->ctx->dc->res_pool->dscs[0], ¶m.sink->dsc_caps.dsc_dec_caps, param.sink->ctx->dc->debug.dsc_min_slice_height_override, - param.sink->edid_caps.panel_patch.max_dsc_target_bpp_limit, + max_dsc_target_bpp_limit_override, (int) kbps, param.timing, &dsc_config); return dsc_config.bits_per_pixel;