From patchwork Thu Feb 11 17:20:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harry Wentland X-Patchwork-Id: 8283311 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 642B4BEEE5 for ; Thu, 11 Feb 2016 17:22:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E0477202EB for ; Thu, 11 Feb 2016 17:22:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 455EA203AC for ; Thu, 11 Feb 2016 17:22:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FDFD72100; Thu, 11 Feb 2016 09:21:13 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0060.outbound.protection.outlook.com [157.56.111.60]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C20D72102 for ; Thu, 11 Feb 2016 09:21:11 -0800 (PST) Received: from BN1PR12CA0035.namprd12.prod.outlook.com (10.160.77.45) by CY1PR12MB0855.namprd12.prod.outlook.com (10.164.70.13) with Microsoft SMTP Server (TLS) id 15.1.403.16; Thu, 11 Feb 2016 17:21:06 +0000 Received: from BY2NAM03FT019.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::206) by BN1PR12CA0035.outlook.office365.com (2a01:111:e400:49::45) with Microsoft SMTP Server (TLS) id 15.1.403.16 via Frontend Transport; Thu, 11 Feb 2016 17:21:06 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.222) 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; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from atltwp02.amd.com (165.204.84.222) by BY2NAM03FT019.mail.protection.outlook.com (10.152.84.221) with Microsoft SMTP Server id 15.1.415.6 via Frontend Transport; Thu, 11 Feb 2016 17:21:06 +0000 X-WSS-ID: 0O2E872-08-0A9-02 X-M-MSG: Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by atltwp02.amd.com (Axway MailGate 5.3.1) with ESMTPS id 2D3E8D22F90 for ; Thu, 11 Feb 2016 12:21:01 -0500 (EST) Received: from SATLEXDAG01.amd.com (10.181.40.3) by SATLVEXEDGE02.amd.com (10.177.96.29) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 11 Feb 2016 11:21:37 -0600 Received: from STOREXDAG03.amd.com (10.1.13.12) by SATLEXDAG01.amd.com (10.181.40.3) with Microsoft SMTP Server (TLS) id 14.3.266.1; Thu, 11 Feb 2016 12:21:04 -0500 Received: from cnhwentlanub.amd.com (172.29.225.36) by storexdag03.amd.com (10.1.13.12) with Microsoft SMTP Server id 14.3.266.1; Thu, 11 Feb 2016 12:21:04 -0500 From: Harry Wentland To: Subject: [PATCH 29/29] drm/amd/dal: Force bw programming for DCE 10 until we start calculate BW. Date: Thu, 11 Feb 2016 12:20:09 -0500 Message-ID: <1455211209-26733-30-git-send-email-harry.wentland@amd.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455211209-26733-1-git-send-email-harry.wentland@amd.com> References: <1455211209-26733-1-git-send-email-harry.wentland@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(48376002)(76176999)(101416001)(50986999)(86362001)(19580405001)(19580395003)(50226001)(450100001)(2950100001)(105586002)(2906002)(4326007)(229853001)(586003)(1096002)(2351001)(106466001)(92566002)(5003940100001)(1220700001)(5008740100001)(36756003)(77096005)(33646002)(53416004)(50466002)(189998001)(5003600100002)(11100500001)(87936001)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0855; H:atltwp02.amd.com; FPR:; SPF:None; MLV:sfv; A:1; MX:1; LANG:en; X-MS-Office365-Filtering-Correlation-Id: 65bfb1a8-2bf7-4e26-1fd1-08d33307b9dd X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0855; 2:BMQCCWv87gCqhoAF+YfppiIfzT/a6EyisW8Kw0lqrQHmrIf1J0yYfmWtj8moH4E4uhSNhHZyEHi8LS1lC7vU39ld9JUrPoNuULzKp1O9E5evuFPlF0pQuPSOZctaavuhmnKxpVXZt1EY0hNGIf4z7lSgGDWduB4xdSTtlPHOZ+podVRQXLvK/hI31ookxVfs; 3:eNL/UkVFYclRP0+hCVORpsn3QKoJwhu05ATwo5vcFSMFYGvo32932AppNsX6XlG+Btn8hMeylPQ1KCtr/49YNtHB8Bz3THI7RjWgxMbbG37ghjxPi3YMp4FzQEeJcE2zKWFqC34CRAf2pUCo97K1YhyOaRHS4kJbaIZzhNjA6WGVx2DFG8RmzrVvDDQN8GDKLj2GAGmNbQR3Aq3w3fGQ+FTIrCDkjnvDAV7FQFOcuWg=; 25:llNgOP9MCCWcDKSpG2S85ze3fqtbntwgde+RoWCStcVO1iMKaZZXlHs69Jkbijcn8gTN8jkqJWSL0BmhsTHOg636aL+e+oIOLGQMHL5/33/tpPHmsH1JL0gDWE/fslvCoIhMek1L1oFTzrdukjG1crLwl+94sfU2g7fN9GVmZyUKa2o6f+Z6cvUg8OfFm1sULYF/+1qus2UU7UVDoIav3OhNocvaYBKcA1guN7QUdJ8TCVGa5hxxVWz59i3VnR3/3nRNaAedD3OJUCUP6Gm/HxJlokmdFtDp5lnBysh06tH+qs6zPfGp91u5PmbhZ+YS X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0855; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0855; 20:WzqYI7zha5mjfFlNtRWITCWyhTAO9xvaDhCnTkV8DUBvEtjTjsFFzv8OOLM0RYO3r4vNlwtvC1GN0T0+J5WrAHHXbVxD31Mzx6C1R6dlsETM2GGF65TM8HzRKV8sRPfI2E4x45yTVCBzSRfBEGWhrO1DfXB2Q29bbCgj0pRWtMnF7/WIkU0/JJgWHhQlF2SDWSOKWHZUdID5MsxAbWFNja/sdhtxHstrw8NoS9kHF1n5znNBROUo9ZE+1yHsPjdnUmngWG6e1r1mO0lYD1TvvXiM2tWt9JrCwbHt8JVVM1+ZVupxeja+nBz7NF5dDeXbFCmXzRJGI2MRl+3ccWB5JZLknZByxgLuO5eNhbhW54CrZXD256IItV/64XL8x8qyu2IES4PbJ4+TtZvuthulO41z1ETJ9YLLqFMTn/olqoaWnKjh+S4R6tQ3ujT/QuXvEn0366DG8H6hWF1teCvq6/tp/p5mglt3YvUJIqirEulMBxwAa/FEoz75F8U/MjNW X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(13017025)(13018025)(13015025)(13024025)(8121501046)(13023025)(10201501046)(3002001); SRVR:CY1PR12MB0855; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0855; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0855; 4:N0SN2nxtXZNYzWxVNJsG4po4g7E1eA1GEhKM06cxf/JEmBLdLGYJNBF/T4AcDqyIt8+PMY2orD+/KRrqfIbIC8X0lX9chFKVQZ2xn9kTmezByVkjQyUFQgLlZzGxYEolSN1thQa9/Itobxoxg0JzBSLNUN62BbrLwSEdImAulWazmj24pUJkoVhh/lXgnqJEv+FoggrfHUcpRGrWDObye7PeCh3NN+gsRfcDC9O6GIYG1jbUOJafxcTu6oSEgopJyIVmb6Vm1uaahvHgOAsKRSXLgqgJ63q3qMdxghLKlsxGS2nT4HvE+tU1MCtuFz1jo7r+vqG5jwDSgoa4MXO4oq6iOv/su5kfi6BvIAb8gMi+io/H12V2bbyK08/75827aggAFbLrF95VbR01DNpYeXjU4oqkC+TIFy+3+2AVsyOa0SLqdhAMu1J2zTd1JUpvMaUZZbaapnaasEgVdHuW2LpXefFiYMOcEcu5HNnoM9ryay9R34eBskrMNYiJskBp X-Forefront-PRVS: 08497C3D99 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0855; 23:wzKeq6eQ4u4aYmGUUwktX7+/aqr0/QEep/96dA7wM?= =?us-ascii?Q?3yNZ0fOnHBzlrJ6Ob5xI85j6mOSxNVpkcCQ0L9plshSlD2oazcfFSaVs5x4t?= =?us-ascii?Q?kgY9TQhR2DLCH3g9nPYvrjC5X7djiwa1f/Ohtrwue9Xga/bd2GmJDQkkg6oI?= =?us-ascii?Q?qmtypvsucgNfTqRHL9/o+WowNFK2abiAMp2IywVovRcdyAHRirhpJfXxmByZ?= =?us-ascii?Q?M81zUqOBqUJow1uGtwloXwSWSQnMTL6b8xg5Hi3jLwJjqvELsYpJWNNUn+n2?= =?us-ascii?Q?T+hOVlTF4CStNUfCRScsrHwwXIERgJ8WriRMX8CuHWTTq88fRWOswLklA5X5?= =?us-ascii?Q?rTsmLU1z5vdw21BfPjDdBKmjwHBkNMfg9/OcT2n2rFQfIesM0f5ygPGgpQGI?= =?us-ascii?Q?fZ5G8rBwLIcK3RZ3W2H4U41gRJehjHCpN2TPZuDjIhWDRIRKQyQeCfkNme4B?= =?us-ascii?Q?U/HX7t2lC/JkVjr5t3wKXXB4+Bck38d3ZnCfwkj4pdEMBl6mIBdPjSOleYgy?= =?us-ascii?Q?reX0E2sQesqJ8glcgMD0XvDZvcTmg2yvGSpkb8KXRy/80GFhks2L1hfgv8vn?= =?us-ascii?Q?yVMMM+jcWbylmUjXkDZvA4d3Xl/HjEU8k92EYSaUn2BmyCtIUpl5Ab16OKNg?= =?us-ascii?Q?CW1VCofUPws/N7OAvP42qjjBJedQ/gI8pj4/2xDK14P4qH70iv5y3k5tWF6x?= =?us-ascii?Q?M/bKClk2Xx0QTUpQf4MQjupppOhBpDaSTTwsmAcGl1PCgYRU5zeGv5djoxHa?= =?us-ascii?Q?awwjI2pif3S1xvwyzLztapaLg3YpZO6A/cQXAyz7GY647I3BhN2ppZ+uNFaw?= =?us-ascii?Q?tg5qAVb83IQMvEGCkSVMwYGWYLzpo2XsmkMF6gOp6Uvt3/Xq04/2sN0Bl7TS?= =?us-ascii?Q?g0JgYN/+Z40epyQwEU2afaZkFipTB64gSvVhQiMlQpULfGuJ/BYmCnHx1SzV?= =?us-ascii?Q?/8c/jnOfJURhXnKr6CA9tvWhMzaftDg3SF7j92jGbs2KA+DrMClnZHyn+kR4?= =?us-ascii?Q?Ls=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0855; 5:SUHURwbQvBc0Tfez9xxt+qFeSYk5d4ufGhougB7KRSo+D78UyBqFl4qrjwMJj0b8wqzOkW9AeVAyLv0vMTRe9aEhkEshr6qBHphQYoeJy7yAdAe2FhX/zXIf9TqHg8qMP3zqKYJEGNZeimhE6onE+g==; 24:RRAM4OWIDT9PxzCQ4BxXtYt3rlNUGwOEDB9sfbEX7WwkzZB49Sfsb03Cn6ewlSXO9sQ8HjM/n8QD4b+531QfbWKH35vufoLEJxV+EoJSc/c=; 20:M8B4CLGJkl0rNW+iBShUyIpvFueTZ9GKAi/ZtbLTGz8FLhX11sISPL0nAnQudM8r/JKwH5WFLuGrrwJg/J10PDoU9k3MwBM1mQK5puFuryZrGqg5LhqEMVZxI2AgNMoQpLP9m/PyIvVwOYR6Uw+0t4JxNEYbV7qA2g78pTumS1dkaO34y7a0wPLpVYzL48B6qwlOf7Dx9vLtfBQFEc9YGFbJ0LEMNZCicLv5fUa1NHZlpaQbZ7qoinQDL7Gj18Vq SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2016 17:21:06.3561 (UTC) 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.222]; Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0855 Cc: Andrey Grodzovsky X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.4 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andrey Grodzovsky Signed-off-by: Andrey Grodzovsky Acked-by: Jordan Lazare Reviewed-by: Harry Wentland --- .../drm/amd/dal/dc/dce100/dce100_hw_sequencer.c | 28 ---------------------- .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 3 ++- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/dce100/dce100_hw_sequencer.c b/drivers/gpu/drm/amd/dal/dc/dce100/dce100_hw_sequencer.c index 82c5e155d91a..a1dbac487366 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce100/dce100_hw_sequencer.c +++ b/drivers/gpu/drm/amd/dal/dc/dce100/dce100_hw_sequencer.c @@ -335,33 +335,6 @@ static void dal_dc_clock_gating_dce100_power_up(struct dc_context *ctx, bool ena } } -/** - * Call display_engine_clock_dce80 to perform the Dclk programming. - */ -static void set_display_clock(struct validate_context *context) -{ - /* Program the display engine clock. - * Check DFS bypass mode support or not. DFSbypass feature is only when - * BIOS GPU info table reports support. */ - - if (/*dal_adapter_service_is_dfs_bypass_enabled()*/ false) { - /*TODO: set_display_clock_dfs_bypass( - hws, - path_set, - context->res_ctx.pool.display_clock, - context->res_ctx.min_clocks.min_dclk_khz);*/ - } else - dal_display_clock_set_clock(context->res_ctx.pool.display_clock, - 681000); - - /* TODO: When changing display engine clock, DMCU WaitLoop must be - * reconfigured in order to maintain the same delays within DMCU - * programming sequences. */ - - /* TODO: Start GTC counter */ -} - - static void set_displaymarks( const struct dc *dc, struct validate_context *context) { @@ -381,7 +354,6 @@ bool dce100_hw_sequencer_construct(struct dc *dc) dc->hwss.enable_fe_clock = dce100_enable_fe_clock; dc->hwss.pipe_control_lock = dce100_pipe_control_lock; dc->hwss.set_blender_mode = dce100_set_blender_mode; - dc->hwss.set_display_clock = set_display_clock; dc->hwss.set_displaymarks = set_displaymarks; return true; } diff --git a/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c index e67ba81f1c85..783d47eba325 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +++ b/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c @@ -773,7 +773,8 @@ enum dc_status dce100_validate_bandwidth( const struct dc *dc, struct validate_context *context) { - /* TODO implement when needed */ + /* TODO implement when needed but for now hardcode max value*/ + context->bw_results.dispclk_khz = 681000; return DC_OK; }