From patchwork Thu Sep 13 11:58:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10599319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 97CED921 for ; Thu, 13 Sep 2018 11:59:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 874102A9F0 for ; Thu, 13 Sep 2018 11:59:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A2C52AA0A; Thu, 13 Sep 2018 11:59:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2569B2A9F0 for ; Thu, 13 Sep 2018 11:59:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 607FE6E66E; Thu, 13 Sep 2018 11:59:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680040.outbound.protection.outlook.com [40.107.68.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id A3B2B6E66E for ; Thu, 13 Sep 2018 11:59:17 +0000 (UTC) Received: from fedoratest.localdomain (155.4.205.56) by SN6PR05MB4589.namprd05.prod.outlook.com (2603:10b6:805:38::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.11; Thu, 13 Sep 2018 11:59:12 +0000 From: Thomas Hellstrom To: dri-devel@lists.freedesktop.org, linux-graphics-maintainer@vmware.com Subject: [PATCH -fixes 1/5] drm/vmwgfx: don't check for old_crtc_state enable status Date: Thu, 13 Sep 2018 13:58:33 +0200 Message-Id: <20180913115837.7746-1-thellstrom@vmware.com> X-Mailer: git-send-email 2.19.0.rc1 MIME-Version: 1.0 X-Originating-IP: [155.4.205.56] X-ClientProxiedBy: PR0P264CA0003.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100::15) To SN6PR05MB4589.namprd05.prod.outlook.com (2603:10b6:805:38::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8e12366-f416-4a4c-835d-08d6197052c8 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:SN6PR05MB4589; X-Microsoft-Exchange-Diagnostics: 1; SN6PR05MB4589; 3:rvP4XYUfEpuIoaMM8KwEsQDansk+Agn+nXvAijPT04ENOTcf/MAH5555o1zRpI1jPJzS6hkSfde6W2dqITjemA9HSD2aHsosItsJRiQdgtgWWNG8+ZKXfrNe8bpZE0CaOOM+ZJwLqbpJVNlaczQ5NILNIcPvktAhQUNSpbTJQEGMyyTYMaOWZ9K9Y1RH7SCjY/RuVnoTWBgIwB1XyucJmDgJFRWWmOm09XgRkI8oFC+0YdLw3601lsUgpV623ZmM; 25:jQ3FMawqO8fky8IULsXzFcB0gAUtvpNQP6lV6ofRp2NR5AVOe7vXxIbbBl6PorrxJ32AsqO6ivZNSEDBSQnfymHlv0lNS8gnL0YTuWoh8at9Pu5pqQY2QIR9OsCgHZD121ENbHPrm7FnutfXyJrvkFVvnDoU78RMbapWOgT8nO2nuIdwpjed+7Fi7S06lfw/3zKuT8/5T8qByl6x7xU4EfoAzDb4c5ErRxVd7ZgpVAk+DcPcHWyCg1q4AhcxDxjPGMb3eGQzshEGnhENDmcZRicOYWb+DdIgRtOH35qoIG3i2hrJEsUniHUha4LJxKBua64Fqg9qCjdhZkrhiGvFDw==; 31:38vOCG+ML6+AJRYbTRS1S641khuh5ImdG3B9yDhfbHhPg74NiFTjrYHDJ6QcN5YFLeIsuh5iVFMlADH3EMW7uw12QVDoRrCAjhJyM2fJXd86FOjVfADRHWqS8urc4TGdHR595o/x1Dq7/NrK8WZpPjCTc04uIr3Vda6+Txm0vF3Les2UGnJpsjoyRlTIH9Q/oM9XRj7DNXqkBiJgn3YqZSmTifHlJ77mib+V/PrGAC0= X-MS-TrafficTypeDiagnostic: SN6PR05MB4589: X-LD-Processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr BCL: 0 X-Microsoft-Exchange-Diagnostics: 1; SN6PR05MB4589; 20:tDfolyMPkNa4UG458uS6FcM4bv/FR8b++bHuAJThfgDijJG+4AMUrusaWdYDckxRsX1BbcadO7TNA9pj0IsGccZpnp021V4311QMUu7+lxLgMqMa0p8Br62TeFLgun+UrFaW42BFxvAmRBNe1RT/1PP0SYgptooksSLb1OiNN1HC9U9sXFeyHQC8OjaJ9ZYGIw567t95byMu/2PvBvkbDPLDJN7WKP25ISQTRe6HuS6l7x1hI7Ur0RePM0X6tLykB4WTmRhw8nnpZg6qkjIK/2QoBzSnJrOz4fvTtMq/ZXJZqdvEe+gCm3Wzp6leV687bufb6HOE6twJw9Uz0ZpV/hU0ZI4GLwTI6Fe1pVjtNlZSQkYW+0k9a+8cG4M61b6yd+CXjOZ04SY6LQIwCGKfSdFIldQSRQxnWYTwGHdqxLqDZoWgaxja6GX4iqE5Cz8l9L86T7E4Iio67zG3OxCMoGoi4SCtE3LsDCH0a/gfr8GOX8NO39h35AJHrMxTaXFVcRNB5u8QJIcaQq/+5GVLTe8qYpF/fKk9CIl6UEZmehXdULOulWBk4i1WFuCt2cAciUn/wo3IGx5q5tZk9q6cPaAwXKB121HKHWHwChY+r5c=; 4:JWzNpoMbk7VkPSrZvJIbJHSEaT0esil9KtUvO8fmDIavQq6NEuwPWPgz990H0mNyL6TW03cGqCtdcc2KxiL+Y4wOx7AkygNC6/X28O2Y/GuK19Xubya3yrPjlMoqwHQNmWSyv0OK62UXdSJEfAZDN3qTbqwuRuuLo2lJ28IYwv+shGJplis23sGo4bncG0o50bNqFpvOXEqq8ph6q1DGKgP7ZhieUoHBhB0GKSeLzqZdBh2nmz7lJvSqC+qm3n+moBYz3PphTHxl9WQl9RjC13/W+qR7fboCX4hujh9rCelP6rEY22olfNlq0RhYz90E X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(61668805478150); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201708071742011)(7699050); SRVR:SN6PR05MB4589; BCL:0; PCL:0; RULEID:; SRVR:SN6PR05MB4589; X-Forefront-PRVS: 07943272E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(39860400002)(136003)(366004)(346002)(199004)(189003)(2906002)(6512007)(81156014)(5660300001)(386003)(106356001)(105586002)(6506007)(53936002)(2870700001)(26005)(6666003)(107886003)(6636002)(97736004)(36756003)(16526019)(51416003)(186003)(486006)(50466002)(81166006)(52116002)(956004)(8676002)(476003)(6486002)(48376002)(478600001)(316002)(2616005)(68736007)(66066001)(305945005)(4326008)(14444005)(1076002)(50226002)(47776003)(8936002)(86362001)(6116002)(7736002)(54906003)(3846002)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR05MB4589; H:fedoratest.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR05MB4589; 23:PvZYFbpVpFwArXVFJIf4PXTyiv5LQ/oDOWvHvB7wg?= 3p04dOywFROE4k/fhkUgbhcNgHI5hw+C3jgpXxgssP0W9HGj+4CZlQQjMTp7UTDFLkAQP4RbZPZYdq3cUTGUoEdeDrJz9Feqf3+v9t6XAcrlx16CxpgBJ3/6ruD7l1rgXLJELZLCGg7zSCuc5g3JNXz5Q9nCDAlU1YYKgKK7bnUaYcWXr7iFZBu2DO8bxTFSZ7HNSucYtnejLqK1vBj7xCwelmDoh3Da17FjEJDf+IWMEi3BMia+Pi+LkkhF3D28iHJRjXnuKghScdRluy3u5oLIBHr8WfaQKKZeNd1FmYjuIR6Mi6Dg3GFFYMKPrsyA1hQwi+0DbV8A+3XBAHwxfoqibKFHcfSGPpN45WlA0muNvfCQI/e/WeMeELm746h0zC0FHy8QdqJDUXr9visyLY77cqkqehfFpTx28e/CBYMRNCc5H7okJ4HiLpQGp7zl0XSDrV8ZPIrYuw2+rjY/Yms+C48ddfzBsNCgaVSkjr61T9ftwa/Su+je9Scj99iyvIU92Jly5mighvN89uTP70CSsZ2w8bGJxqIxOJhYrzrKsxVB69P/UBF5lizBOzEiq7U+wvyZnUjkrLt2CVhl5y+6MUdh6zDS5fjv1EVCnVc5ItSGxNxLYBLjZhiZ8zvi2fz6+DpkJ2M/hfriNSGUdhgSVggcXSToIh9EBJ+GuAUh5F/+iO2HmF81O4+m3BKVgTl0tPYkrvy2mAq6C7w+V4jYa3frPpX4ximv49+oINbqzSdN1Y+jP9lCWsqh69wloOeFjlHPFzwXd8DSi9K4RhMFiZOCHg3IO/6JLyvJJA/Pbs8q97uNkiYnzZva/v1P+FrtMveticYQ1gz0faXFXPmV0S4RqMUZLhwp/K+r63kTtoIIn+3hRlyz8BL/X1jtr3x+nUzjKRNJekdonjTcvwHsvT6lBDTplc8Q//LoNWGhm64/GyKtTIkGtmjiqk8zDwnqe2cdzclmdRRpzHe6k3PzSL5vQU3A3jxvkjMwo1giXrxvuy5CdNgCVexOGCyHwfR/YNqQsGE4mxEx9waeRRdL3QtoXYI/ioeV/BnO3E1t9BkDKCAp5gpva76cU8oAbxlDQ5VyLOjjr8MnjT027d+uFzcC67ALIrvliV4BSvMOMi4sVeWjVjeH3KldMPjtTLZNTlOh5q4VKdVtnpZe5fS X-Microsoft-Antispam-Message-Info: oyTRcIn+WOuKfKui5iOS8/F6Zq8Phulp6EbTm9iOASWidxQpFIDlVcKJzNDOn1tfvGDD2QkaYuUWzaxllTeCd7Tu9g67Vj3JDc5XilvSVesHU57dswXgcoZrGN5PoxU/3ecRv9NLT3nOHeNMezsVLYIxDZMzr1O+7/pqwmFLMvesmOGpvwxMpwmg0Y7yjFlEay8Q4wNfusmc9ePQv4TvF1pwJoyN8CuxkEw4RdOpTjTmULezfS6CAYdn9P2KCWQ941JDrJwCRM/AbLCi5ebNNmkeSULsFrmHuPDJBD+i2whm4Wq8XVWPVMkWOavoP2hQSP5/G0g05D6/fg0uwZC/2i/e7xuL0csY1uhX6zr3S1M= X-Microsoft-Exchange-Diagnostics: 1; SN6PR05MB4589; 6:OchNCvUOKKHGuIo0fkMFOv1/KcD+OOieHBW4cvNKi1bqsZQwhuAxOXvKYWM6LL6q3jBoX1fyjsNZc9L94VaE49KUy97ptZMUmeiTjLBCbFS0xq8zgXVkowuY5HaUH6QtKgeRuYKg4WsEj5EZJA2qbkK+08lwxmhUM0EmYUnRHQN9fFehDTPlk4RWTvSk2Ll2Ou3YxJ3l7iub8PCSIgBvVI/Id5vGeSfFwGHZEMWW+gDwHVzbQVHVCUwm+kJCYDKSF9vyxSj37shXWiAJjEjQ3jTGcdgWVXBHfQx+WgXQPK/vmDGbNf9G1qZZhPOYKHQTzGcn56vVUlpAPC7S1fQBg2sIY1c7EygwIMw+pCzs5KLIUGqvofbpzsEHIO81ecaYoRBf1bkV5LL4zznj4TtLVlPPBOQ0p7oQrsBnC6QoRLDhMmoEY/XCXGlywII2ppeudSxREiaIyHpdvzRgx6CrbQ==; 5:91fFytb4693t0qzwGapL8gcb+u3K9Z9K5njiezNb4px/WVyuCDW+Y74oawVeRSOrW1Y5ipVx98EGIgKGWeJcrBdm+pu+Y0c2RfMV87I8LnqeSXPBDcZnUfHTRhcEH2llddnA9Hq4T1WA9+tpPADS5Uznwtm/whwmpx791o+wils=; 7:Xb0UlW/XQlwZL6Ovxp+qKeXy+qYcuT5bPpTZ25729kW4+l6SxEY6e/SAW6tDg19O8HtILtERRRaWDcmLrj6jcjrOnOUy65ak26XxSfmiQa8a2nkEyUPlGRtT0H5VxNhhkG9z9hjorHkw2ggevR7VODf64qE/mi4RF71T7Xru33KuSEL4zvmaU+Y4rrOVNMm/Ttc+PgWlOuAUZKDdyUZK5DKcrO/GSQN6ypnCuUM4c9OS+13lYpUlBdTqo50Tx+MH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN6PR05MB4589; 20:CitmVV0e9QohZCqajysToD0zG2aVr98FhBzscthBlMAY/bgG7pS5DTKaMuSdcq9yZHgvPbNNZoDkG/D848+BM5FFIpxMzwzxXKVDJLPLJBpAGth/bdu/adbOW//seUr1qfDnROZT6oK8549d3YO6pOyRg7AZhSgemW+48Kjv7FI= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2018 11:59:12.5020 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b8e12366-f416-4a4c-835d-08d6197052c8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR05MB4589 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: pv-drivers@vmware.com, Thomas Hellstrom , Deepak Rawat Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Deepak Rawat During atomic check to prepare the new topology no need to check if old_crtc_state was enabled or not. This will cause atomic_check to fail because due to connector routing a crtc can be in atomic_state even if there was no change to enable status. Detected this issue with igt run. Signed-off-by: Deepak Rawat Reviewed-by: Sinclair Yeh Signed-off-by: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 23beff5d8e3c..636b962849c8 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -1615,7 +1615,7 @@ static int vmw_kms_check_topology(struct drm_device *dev, struct drm_connector_state *conn_state; struct vmw_connector_state *vmw_conn_state; - if (!new_crtc_state->enable && old_crtc_state->enable) { + if (!new_crtc_state->enable) { rects[i].x1 = 0; rects[i].y1 = 0; rects[i].x2 = 0;