From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.20 056/304] drm/amd/display: calculate stream->phy_pix_clk before clock mapping Date: Mon, 28 Jan 2019 10:39:33 -0500 Message-ID: <20190128154341.47195-56-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190128154341.47195-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Yogesh Mohan Marimuthu , Alex Deucher , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Sasha Levin RnJvbTogWW9nZXNoIE1vaGFuIE1hcmltdXRodSA8eW9nZXNoLm1vaGFubWFyaW11dGh1QGFtZC5j b20+CgpbIFVwc3RyZWFtIGNvbW1pdCAwOGUxYzI4ZGQ1MjFjN2IwOGQxYjBhZjBiYWU5ZmIyMmNj YzAxMmE0IF0KClt3aHldCnBoeV9waXhfY2xrIGlzIG9uZSBvZiB0aGUgdmFyaWFibGUgdXNlZCB0 byBjaGVjayBpZiBvbmUgUExMIGNhbiBiZSBzaGFyZWQKd2l0aCBkaXNwbGF5cyBoYXZpbmcgY29t bW9uIG1vZGUgc2V0IGNvbmZpZ3VyYXRpb24uIEFzIG9mIG5vdwpwaHlfcGl4X2Nsb2NrIHZhcmlh bGJlIGlzIGNhbGN1bGF0ZWQgaW4gZnVuY3Rpb24gZGNfdmFsaWRhdGVfc3RyZWFtKCkuCmRjX3Zh bGlkYXRlX3N0cmVhbSgpIGZ1bmN0aW9uIGlzIGNhbGxlZCBhZnRlciBjbG9ja3MgYXJlIGFzc2ln bmVkIGZvciB0aGUKbmV3IGRpc3BsYXkuIER1ZSB0byB0aGlzIGR1cmluZyBob3RwbHVnLCB3aGVu IFBMTCBzaGFyaW5nIGNvbmRpdGlvbnMgYXJlCmNoZWNrZWQgZm9yIG5ldyBkaXNwbGF5IHBoeV9w aXhfY2xrIHZhcmlhYmxlIHdpbGwgYmUgMCBhbmQgZm9yIGRpc3BsYXlzCnRoYXQgYXJlIGFscmVh ZHkgZW5hYmxlZCBwaHlfcGl4X2NsayB3aWxsIGhhdmUgc29tZSB2YWx1ZS4gSGVuY2UgUExMIHdp bGwKbm90IGJlIHNoYXJlZCBhbmQgaWYgdGhlIGRpc3BsYXkgaGFyZHdhcmUgZG9lc24ndCBoYXZl IGFueSBtb3JlIFBMTCB0bwphc3NpZ24sIG1vZGUgc2V0IHdpbGwgZmFpbCBkdWUgdG8gcmVzb3Vy Y2UgdW5hdmFpbGFiaWxpdHkuCgpbaG93XQpJbnN0ZWFkIG9mIG9ubHkgY2FsY3VsYXRpbmcgdGhl IHBoeV9waXhfY2xrIHZhcmlhYmxlIGFmdGVyIHRoZSBQTEwgaXMKYXNzaWduZWQgZm9yIG5ldyBk aXNwbGF5LCB0aGlzIHBhdGNoIGNhbGN1bGF0ZXMgcGh5X3BpeF9jbGsgYWxzbyBkdXJpbmcKdGhl IGJlZm9yZSBhc3NpZ25pbmcgdGhlIFBMTCBmb3IgbmV3IGRpc3BsYXkuCgpTaWduZWQtb2ZmLWJ5 OiBZb2dlc2ggTW9oYW4gTWFyaW11dGh1IDx5b2dlc2gubW9oYW5tYXJpbXV0aHVAYW1kLmNvbT4K UmV2aWV3ZWQtYnk6IEhhcnJ5IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29tPgpBY2tl ZC1ieTogQmhhd2FucHJlZXQgTGFraGEgPEJoYXdhbnByZWV0Lkxha2hhQGFtZC5jb20+ClNpZ25l ZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KU2lnbmVk LW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMgfCAyICsrCiAxIGZpbGUgY2hh bmdlZCwgMiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2NvcmUvZGNfcmVzb3VyY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9jb3JlL2RjX3Jlc291cmNlLmMKaW5kZXggYjZmZTI5YjlmYjY1Li44YmQ4ZjM0Yjk3OWMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291 cmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVzb3Vy Y2UuYwpAQCAtMjAwMiw2ICsyMDAyLDggQEAgZW51bSBkY19zdGF0dXMgcmVzb3VyY2VfbWFwX3Bv b2xfcmVzb3VyY2VzKAogCQl9CiAJKi8KIAorCWNhbGN1bGF0ZV9waHlfcGl4X2Nsa3Moc3RyZWFt KTsKKwogCS8qIGFjcXVpcmUgbmV3IHJlc291cmNlcyAqLwogCXBpcGVfaWR4ID0gYWNxdWlyZV9m aXJzdF9mcmVlX3BpcGUoJmNvbnRleHQtPnJlc19jdHgsIHBvb2wsIHN0cmVhbSk7CiAKLS0gCjIu MTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1k LWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg== 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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82845C282C8 for ; Mon, 28 Jan 2019 15:45:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4956F2175B for ; Mon, 28 Jan 2019 15:45:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690344; bh=W8tcpiDPkLw1Y6TcS9TQUa3cX/RYD3g2gB7DXexROUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qEHBixrUloXeEGIrUDS6Rd8XvNEtBly84RWwwBY5JSzucg7pQa5mTiwH2vvhyn5RO /kjUYno+YLYCHLZEAlT7tpaA1lXC2Hp9D+7HQ/JAQ/PSOfRhnj3WY3ZjE9QQ47o41f J+MwjiAg/6QI+T+MdgT1D4MRiDBeKA4wem0VGmcg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727839AbfA1Ppm (ORCPT ); Mon, 28 Jan 2019 10:45:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:59026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727797AbfA1Ppj (ORCPT ); Mon, 28 Jan 2019 10:45:39 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E05420880; Mon, 28 Jan 2019 15:45:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690338; bh=W8tcpiDPkLw1Y6TcS9TQUa3cX/RYD3g2gB7DXexROUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xMHV5RzqNIue0CrylLVSjOUYJ0vYX457Wec9i2xmdpzioPAdJYChdwCyu7wq0L9ll 9YJZS/qsaxrtqSJ3tyTBvI7ALbGUFrZtY7FRanG44DBit4qmnX4n1SciUHnhMfQVZY IPnmaTfyVV2NgyNeCc2koblbWUJCwosedTUw/xfQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yogesh Mohan Marimuthu , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.20 056/304] drm/amd/display: calculate stream->phy_pix_clk before clock mapping Date: Mon, 28 Jan 2019 10:39:33 -0500 Message-Id: <20190128154341.47195-56-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yogesh Mohan Marimuthu [ Upstream commit 08e1c28dd521c7b08d1b0af0bae9fb22ccc012a4 ] [why] phy_pix_clk is one of the variable used to check if one PLL can be shared with displays having common mode set configuration. As of now phy_pix_clock varialbe is calculated in function dc_validate_stream(). dc_validate_stream() function is called after clocks are assigned for the new display. Due to this during hotplug, when PLL sharing conditions are checked for new display phy_pix_clk variable will be 0 and for displays that are already enabled phy_pix_clk will have some value. Hence PLL will not be shared and if the display hardware doesn't have any more PLL to assign, mode set will fail due to resource unavailability. [how] Instead of only calculating the phy_pix_clk variable after the PLL is assigned for new display, this patch calculates phy_pix_clk also during the before assigning the PLL for new display. Signed-off-by: Yogesh Mohan Marimuthu Reviewed-by: Harry Wentland Acked-by: Bhawanpreet Lakha Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 ++ 1 file changed, 2 insertions(+) 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 b6fe29b9fb65..8bd8f34b979c 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -2002,6 +2002,8 @@ enum dc_status resource_map_pool_resources( } */ + calculate_phy_pix_clks(stream); + /* acquire new resources */ pipe_idx = acquire_first_free_pipe(&context->res_ctx, pool, stream); -- 2.19.1