From patchwork Tue Aug 20 19:12:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104547 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9052E112C for ; Tue, 20 Aug 2019 19:12:55 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 781962332A for ; Tue, 20 Aug 2019 19:12:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 781962332A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E68986E876; Tue, 20 Aug 2019 19:12:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750040.outbound.protection.outlook.com [40.107.75.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id 387236E869; Tue, 20 Aug 2019 19:12:36 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E/PUSWstQa3xStCshcmSscd+1wofxjXjjokhxTrdSHfB5iUewPUoJBbVO/tsQOjJ+gFF+Cv79l0IyTE/M10QHOyAAfdrjH3JPDhPa2znmSdxWT7yrEO7nRBwnWhuPef60zolTHzi3Dl5EcNKBdcsspWIKy6gYVSZpGmdXfzAfO3cUy6OUV8pQefcVx7h42wTD3siuBtnV9pTgbXDxJ0UZJbNWacRHbemoqk9vnZ6KKlY7q2BE7ruPij45FMASXZ4c3PLbmAQcZ4whjRlDYt8GIJ9Ql7kvNVhvFx28hgDG/3iQd4TTn1ax7DAzG48RLzYL2nHNIvjCgdzz8iZ1nCs+Q== 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-SenderADCheck; bh=oOZrI9tcIvAzywlZL4IwEUISgUIiR80sWhNBq8yuZEc=; b=HaugrIk1Lbobiic+xJlGsYQ7bzeEwGqkKBjTMnv8600l3QUZ7TlXUy9T91B0wHlNnQBU1F4pxC50xQGQvIKJ9b0cbx75/Z5cBgb2WxVbmGPHKTuiQo+cpAyqCFwgYmBYETGACQG6oKu7uXFcPIvRkPJiH9mcbpPEzQpStXmLsQXDRbAzlPov4XtqnwjtUPT9zGHcD85v+dfPkcByWZG+lxtoxhLsEkEaZ+8FU/mXNJvwqUK0sgmwkm91CWLS3Kyw8EQqTB9tOwQZQvoZY1dZfTFzRpMwwT+DKTotTEF38FSv1Xi+QYM9qCrcsOE4REWBtDwbSWGKihaFj6Hwjb+oRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by MWHPR12MB1533.namprd12.prod.outlook.com (2603:10b6:301:f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:33 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:33 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:32 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:31 -0500 From: David Francis To: , Subject: [PATCH v2 14/14] drm/amd/display: Trigger modesets on MST DSC connectors Date: Tue, 20 Aug 2019 15:12:03 -0400 Message-ID: <20190820191203.25807-15-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(136003)(346002)(376002)(396003)(2980300002)(428003)(189003)(199004)(6666004)(356004)(47776003)(8936002)(4326008)(50226002)(5024004)(186003)(70206006)(14444005)(11346002)(49486002)(426003)(2616005)(446003)(486006)(86362001)(336012)(476003)(126002)(305945005)(36756003)(50466002)(2906002)(26005)(76176011)(16586007)(110136005)(70586007)(51416003)(54906003)(478600001)(450100002)(53936002)(5660300002)(81156014)(48376002)(1076003)(8676002)(316002)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1533; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 863c4f37-4d5d-48b5-1580-08d725a25a85 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:MWHPR12MB1533; X-MS-TrafficTypeDiagnostic: MWHPR12MB1533: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: iBbLKR/JdLBfnytsQq01+w51VPkLXQRMfO3ZNCSFkHtDMUf6YoEF0zhyf9xbH2DB19tKKyUV/mxbKZ1EP5++9nlkZ407qs1jx6jBZJGjV+xPp9WjV0p102jONVQ6ldqRW+itSWCZGKJkpuF0ukAbXr/UBEW7By5gPglviZpq7Q08p0Fh0rTcSjAEBqH4TWQj5jqBowm74N+d7IfCiL467dFTKVVjz4N+RCg1DvcjGNTlFI1GBUSTFHChLxyJgMCqEzmsDLLGccjsc65Nqf3xwrymxL8QsLnktcSr8uVb2yxEGUWtoLEQHSojip9Kb+xY+lDCMMMMEVczu4AhsOjLoV5YPyhO7K/5lry6S5gzdE78NpbD6tr0Vbk40qQr5gRaS6jih1KPP8OOJmGR4MprNZ8L0uvzh4Ugog1hC3KYUmM= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:32.8154 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 863c4f37-4d5d-48b5-1580-08d725a25a85 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=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1533 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oOZrI9tcIvAzywlZL4IwEUISgUIiR80sWhNBq8yuZEc=; b=APjzD3Eap/NP8buRBmazkmIkxpimOTi79VZJUQerByA/lgOYzukKDx/U7aVLUHWESzrxI1I2LlN08w+RmeFpUtd55Dik0TeFWx3ykMM37IGnvZBaz/w5IKelsNV3RCJ68IzbWePj9WqDVygCz8hzTLPcVNeQoPT8PiTvrxTadjc= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Li , David Francis , Nicholas Kazlauskas Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Whenever a connector on an MST network is attached, detached, or undergoes a modeset, the DSC configs for each stream on that topology will be recalculated. This can change their required bandwidth, requiring a full reprogramming, as though a modeset was performed, even if that stream did not change timing. Therefore, whenever a crtc has drm_atomic_crtc_needs_modeset, for each crtc that shares a MST topology with that stream and supports DSC, add that crtc (and all affected connectors and planes) to the atomic state and set mode_changed on its state v2: Do this check only on Navi and before adding connectors and planes on modesetting crtcs Cc: Leo Li Cc: Nicholas Kazlauskas Signed-off-by: David Francis --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 74 +++++++++++++++++++ 1 file changed, 74 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 145fd73025dc..e64f2a6eb71a 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6475,7 +6475,70 @@ static int do_aquire_global_lock(struct drm_device *dev, return ret < 0 ? ret : 0; } +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT +static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm_crtc *crtc) +{ + struct drm_connector *connector; + struct drm_connector_state *conn_state; + struct drm_connector_list_iter conn_iter; + struct drm_crtc_state *new_crtc_state; + struct amdgpu_dm_connector *aconnector = NULL, *aconnector_to_add; + int i, j; + struct drm_crtc *crtcs_affected[AMDGPU_MAX_CRTCS] = { 0 }; + + for_each_new_connector_in_state(state, connector, conn_state, i) { + if (conn_state->crtc != crtc) + continue; + + aconnector = to_amdgpu_dm_connector(connector); + if (!aconnector->port) + aconnector = NULL; + else + break; + } + + if (!aconnector) + return 0; + + i = 0; + drm_connector_list_iter_begin(state->dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + if (!connector->state || !connector->state->crtc) + continue; + + aconnector_to_add = to_amdgpu_dm_connector(connector); + if (!aconnector_to_add->port) + continue; + + if (aconnector_to_add->port->mgr != aconnector->port->mgr) + continue; + if (!aconnector_to_add->dc_sink) + continue; + + if (!aconnector_to_add->dc_sink->sink_dsc_caps.dsc_dec_caps.is_dsc_supported) + continue; + + if (i >= AMDGPU_MAX_CRTCS) + continue; + + crtcs_affected[i] = connector->state->crtc; + i++; + } + drm_connector_list_iter_end(&conn_iter); + + for (j = 0; j < i; j++) { + new_crtc_state = drm_atomic_get_crtc_state(state, crtcs_affected[j]); + if (IS_ERR(new_crtc_state)) + return PTR_ERR(new_crtc_state); + + new_crtc_state->mode_changed = true; + } + + return 0; + +} +#endif static void get_freesync_config_for_crtc( struct dm_crtc_state *new_crtc_state, struct dm_connector_state *new_con_state) @@ -7160,6 +7223,17 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, if (ret) goto fail; +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT + if (adev->asic_type >= CHIP_NAVI10) { + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { + if (drm_atomic_crtc_needs_modeset(new_crtc_state)) { + ret = add_affected_mst_dsc_crtcs(state, crtc); + if (ret) + goto fail; + } + } + } +#endif for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { if (!drm_atomic_crtc_needs_modeset(new_crtc_state) && !new_crtc_state->color_mgmt_changed &&