From patchwork Wed Aug 21 20:01:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Francis, David" X-Patchwork-Id: 11108087 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 A9FDB1395 for ; Wed, 21 Aug 2019 20:01:52 +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 2BD6D2332A for ; Wed, 21 Aug 2019 20:01:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2BD6D2332A 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 3C1E46E9D6; Wed, 21 Aug 2019 20:01:50 +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-eopbgr750070.outbound.protection.outlook.com [40.107.75.70]) by gabe.freedesktop.org (Postfix) with ESMTPS id 087F86E9C5; Wed, 21 Aug 2019 20:01:48 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RAH932ELuImIZFH1UCA408sn1gIH2EuIoPeyOlylUbgb4BlV1FjRgjcg9xttnhZ3welED3O/BTshjbEbrb0t3dl4ipl3uHEwKiQ0MDWNhUo+xt31VElNQ2GEGc2xuHXCK5/tvRcJ7/vXLgDeCWeq7huI71UMIdhVPXBMZIH0TQXsqnYlPjhDnkXavPp57YXDo2S3SiuBo1+bOwNomJ10iQXAb4kKHW6b0KNneKv9F9ApnB937ZWf5Fcq7dcd48SNIUixrODvnqbdbEFg42F2Ou6k+P7NUisD2gYVUkqI7OMUz2w1fh5awTIBkNYtlu/MGknv+TZ71z+V1fW8b4ja0Q== 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=ywSTmYSp/jtxrNMaLPn7VmtQiBN4urC7GQOHwO62wcM=; b=LhYBA9auydYxnyj/XcZ2EL9/OTXYzstnePgBgHWyw/lx9TM/T69AcTgw0AzQ8zeyjGQFkewtMJu74dnrIJNnoe7NTkk7vtcs5bWoHLMJXnWBA7OT58EjpfxGTTtZ5KQUfzqs1sPaDXrqWMt8gYHS8UN0P/gUrSccfU0TvJbKqlN2zbBuSpZozSct4DU/aSqTWPcCIvXC7UDLrc31js/sqt1N4lkqb20q9Gy4djNGIRPg6iDwOXrtnmsjbQaBOFtwKRK+ksLGlqEVlvgzu/qWFWwHHJlwMmp0bNivs8jFvFOES+1qInBs0gsdGB5fUaOfvaLLxxEaaRBuK4Xr78jnVg== 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 BN4PR12CA0006.namprd12.prod.outlook.com (2603:10b6:403:2::16) by CY4PR12MB1526.namprd12.prod.outlook.com (2603:10b6:910:4::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.18; Wed, 21 Aug 2019 20:01:46 +0000 Received: from CO1NAM03FT063.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::204) by BN4PR12CA0006.outlook.office365.com (2603:10b6:403:2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Wed, 21 Aug 2019 20:01:46 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by CO1NAM03FT063.mail.protection.outlook.com (10.152.81.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Wed, 21 Aug 2019 20:01:45 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Wed, 21 Aug 2019 15:01:36 -0500 From: David Francis To: , Subject: [PATCH v3 04/16] Revert "drm/amd/display: Fix underscan not using proper scaling" Date: Wed, 21 Aug 2019 16:01:17 -0400 Message-ID: <20190821200129.11575-5-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821200129.11575-1-David.Francis@amd.com> References: <20190821200129.11575-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)(346002)(136003)(376002)(2980300002)(428003)(189003)(199004)(49486002)(446003)(126002)(426003)(486006)(336012)(476003)(186003)(110136005)(51416003)(48376002)(14444005)(76176011)(305945005)(6666004)(36756003)(2906002)(2616005)(5660300002)(508600001)(356004)(86362001)(11346002)(50466002)(8676002)(16586007)(8936002)(81166006)(81156014)(26005)(47776003)(50226002)(53936002)(1076003)(450100002)(70586007)(70206006)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1526; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 854bd94e-4782-4dc6-7a56-08d7267264f8 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:CY4PR12MB1526; X-MS-TrafficTypeDiagnostic: CY4PR12MB1526: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:639; X-Forefront-PRVS: 0136C1DDA4 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: x/XuMzitMp5dTkhelsEzghP30CLNDp0xoAFMd186rp7kY8MaMPr0oUBM1f0NHyAOTWJTeE8gQAOvaGLxaokH6LjyBJwBkrT3+BAuzBHRgJQKV7DM3ru8w3EsAL2tMUPqYNx27xwwXgRucB8q4K7LmBu3Jfs2Z4aRWv9JzhjwMS8wtT+ycUExSGR9u/WPahzqRzJlbLrtKUkqGqEBNDi3kTleB92Tb4NgmJU8KBDbkWaoBwHA8xtASf9CkTiDrMwiVEHNdhVrp4tTGhMk5jtffzXV4wR3kvh2M8nuVVq2hTiJlFLlMcML9SjF42mCEsLlrqfp5tJLyfcxobIqfGCHL/sKjEJx0BRTTf21qb/ac7UfAFcq4eXa5tTZjpWfpRmo2O5gLmxaqjNCT7U1k66KUCbN9nwRng/GgpdmgPniHfk= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2019 20:01:45.6285 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 854bd94e-4782-4dc6-7a56-08d7267264f8 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1526 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=ywSTmYSp/jtxrNMaLPn7VmtQiBN4urC7GQOHwO62wcM=; b=KqBiTZRtbPTTB948Q+a2dbxwFiqkoL1XfxkIsoefl8/oYhpbFZKw4YYKrPR7pM+QtMizouxK4OjdPRwUEFENCjKG6+HG1YF6lLAlPBAEDYvAF0q8HCyae5GcXhFpZ5hmGaQYjlUPsa44e7zjYGkkSxS8jc1oLMvDVht8N2y2QwM= 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: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This reverts commit 80e80ec817f161560b4159608fb41bd289abede3. This commit fixed an issue with underscan commits not updating all needed timing values, but through various refactors it is no longer necessary. It causes corruption on odm combine by overwriting the halved h_active in the stream timing Signed-off-by: David Francis Reviewed-by: Roman Li Reviewed-by: Harry Wentland Reviewed-by: Nicholas Kazlauskas --- drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 77ac7f707ec5..1189e320062b 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -2127,7 +2127,7 @@ void dc_commit_updates_for_stream(struct dc *dc, enum surface_update_type update_type; struct dc_state *context; struct dc_context *dc_ctx = dc->ctx; - int i, j; + int i; stream_status = dc_stream_get_status(stream); context = dc->current_state; @@ -2165,16 +2165,6 @@ void dc_commit_updates_for_stream(struct dc *dc, copy_surface_update_to_plane(surface, &srf_updates[i]); - if (update_type >= UPDATE_TYPE_MED) { - for (j = 0; j < dc->res_pool->pipe_count; j++) { - struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j]; - - if (pipe_ctx->plane_state != surface) - continue; - - resource_build_scaling_params(pipe_ctx); - } - } } copy_stream_update_to_stream(dc, context, stream, stream_update);