From patchwork Fri Sep 14 07:35:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Hellstrom X-Patchwork-Id: 10600495 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 4DA276CB for ; Fri, 14 Sep 2018 09:12:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A84D2B124 for ; Fri, 14 Sep 2018 09:12:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E7062B130; Fri, 14 Sep 2018 09:12:32 +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=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 CC9832B124 for ; Fri, 14 Sep 2018 09:12:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18BCB6E757; Fri, 14 Sep 2018 09:10:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0080.outbound.protection.outlook.com [104.47.40.80]) by gabe.freedesktop.org (Postfix) with ESMTPS id 642366E008 for ; Fri, 14 Sep 2018 07:36:38 +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; Fri, 14 Sep 2018 07:36:34 +0000 From: Thomas Hellstrom To: linux-graphics-maintainer@vmware.com Subject: [PATCH -fixes] drm/vmwgfx: Fix buffer object eviction Date: Fri, 14 Sep 2018 09:35:39 +0200 Message-Id: <20180914073539.3824-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: DM5PR06CA0093.namprd06.prod.outlook.com (2603:10b6:4:3a::34) To SN6PR05MB4589.namprd05.prod.outlook.com (2603:10b6:805:38::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3b11237-0144-418e-41c0-08d61a14ccda X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:SN6PR05MB4589; X-Microsoft-Exchange-Diagnostics: 1; SN6PR05MB4589; 3:qKuCcoDjq8ASnos/5pXvtgy9KTGZKZjglsxMuMOkVWRZh7VzrtWEyJhUOJE9vj6f0TmykCv5twWDlAtq+EKYxoBUQNaXywxXsQez3bLMpMPnXHzFhnICREot9OkUuwlFX/DhP+WcnC2PAfBTkjwT/SZ/wrnuYORwJt/JTVOGNfHaWKGF1HdPKuTnL7hWCnMY1dpxmllqHS7SNf9Go+iznfccNLk8SIZKzAI4Y+o+gXF1IRrE6k3BMXcsPRunhw5Q; 25:M43ilcBGGGOPeAjJk4IaJwA/us6UGrtzEEL0Qr6YuBAOouZFn6FanD9dueZAihtQ9CS1zTDZg/kK5YrNy81jYEhliSs5wEsl40Cn9rksCSaiUZpkHmDuwLkLoh/GPXDD/HJF0d9eQu+DM3UJqT5EtmlACf4+ILSaaUaR3EASwOyOczdtWxS/hZt707uoNFG26IZdfsWzguEBeOJRIYRko/TG6fOji2WivvSYJxHI6fQkYuXHVNGMsad/d26QC+oJKqS9DfC11qs+PFqUyLYf1r2JmVB6WzdnAXfknIWUnJVHdkcAb8ZH0Um04783xOhn3kx1Rjtn/wOK1fZDJUYaxg==; 31:f4A8BBvZrZhkQ67hHccO3xbHywWvtMvXEL3jhmDXYsKuS0mT100V75g/G/Ey/3S8FYTMQCDrgi9dv8kF9OnuS3g9GdStGWsZi5K/T7lREzwJk2xcE1D5cmE/TMakmZ5NwtNi5tqGf5zVxgI0mkU5g9Xl+Kst1AY7jx/yMXWPjALAdL317lE76+IpMu9O3qcF5BPe0xmovf5NqNwiFUMd5qmmvOyE5Il35CYnm9+93JQ= X-MS-TrafficTypeDiagnostic: SN6PR05MB4589: X-LD-Processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr BCL: 0 X-Microsoft-Exchange-Diagnostics: 1; SN6PR05MB4589; 20:tm3evscQOHh5i33g39Vnsn5BvJHm+2LrlEOPx9DC88lxKnEBKlL36YBUXJ7euR7lCjzVrpl+05NOrmuAJgmNwTVu82PrtTjqZaFhl1Zdx5k3P7bpCMSZnkoSC2PiZI14uGG+nYkiBrxLPrstMHjNm35jh67HwhgWqJQQyfocW8i0NDM7wyuc5gi755J535cZ1Ym5O48t/WRGIaIsjd/r16uZFEQNf2qO/6wPEWntfeC8guvSyVrVMU6ZppPhWl9saY3oNuMtPDtLYZnyRM7H0w9hB/hW5f7F99ih6rftkkj2+ru/by6W2ttX9vtZr/9lG/1uw55nUVVxyYL93zIbEi7DtE/rFYnDe23232fQVcWxaYXRZcD5vvOc1sDQ6vORZdUsyp8jIM7eT6fTuwfPKmPEbEFVHSAZF/pBYHq5fWobJcpNsCNakfHkKrcOHVSq0RNXNijq9MzLhqv0ZffyjfGH7LZX1eTYIM+IzU8A6/guBqqpNRAX8jrm8TD1fezHbuGXeW46v1t3eQiIZ3YewqDuGqPM4f1553fhrWGQQv4iwWtjbNYcU42clHaqBo9GSA14HrvarE5FsG1qqCL6cPuWf2E5LR++e0F7GgLDOsU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(61668805478150)(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(3231311)(944501410)(52105095)(93006095)(93001095)(10201501046)(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-Microsoft-Exchange-Diagnostics: 1; SN6PR05MB4589; 4:ZI4nHIYCiCblbHjUU+AreZN11aYcIEyOKQX5WcCZDvQO7Eka38KhzG9YfkmrxFF3bbcjPzQWTA+XbsDEFq2cerA2KIvOOtV1HS+G9ur+7tgEFCcFFZEMfzMLcZY84OqvJhVo0dY44QadyMEfuoJ6oihnXmWhZc0mNy/cnFAOn3AKsRmzgkOSAlFt5DjYIXGIL8l9lFcYtCaEmsLidTBFUZH3y0RFC2NdpH4PKFyKvfIBhDtVZCa0QYMRDqQABIzEVcT5OQ7q/psVsTgWyTbitbkqgH6Rq3Gl8tRU7xtZuG2JXCCNeP/z3pE0D2iyipw1eY+xmpNDSdPehdQad74tDvMKtChw/khscxsA8hlGiTk= X-Forefront-PRVS: 07954CC105 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(366004)(136003)(396003)(376002)(189003)(199004)(8936002)(66066001)(6486002)(68736007)(2616005)(316002)(478600001)(7736002)(54906003)(2351001)(25786009)(37006003)(2361001)(6116002)(3846002)(50226002)(4326008)(14444005)(305945005)(1076002)(86362001)(47776003)(575784001)(53936002)(956004)(26005)(2870700001)(5660300001)(81156014)(2906002)(386003)(52116002)(6512007)(105586002)(106356001)(6506007)(6636002)(23676004)(34206002)(50466002)(476003)(8676002)(81166006)(16526019)(97736004)(486006)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR05MB4589; H:fedoratest.localdomain; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: vmware.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BSN6PR05MB4589=3B23=3AIYeKcTh?= =?utf-8?q?5xFXcUA+fpAcpLKKOP/SglC5BOuxq1NyC1zdknuCQmqHLs9tVHcBQEPPQrCzYqUw4?= =?utf-8?q?Q1EVt/wC6HBg8lfsYo/en5HQovJBd5aoZ8RXcL8MhgpgQzknhVvHF/SCLeWV6llh+?= =?utf-8?q?gb4FF6thi0xFHakbUMqDDxzcjUQLHsyBoDVBULsImLSUUAnkDlH/G7FPTdk2osZF8?= =?utf-8?q?+sGhwLW+WfCZIQorfigdfX7eiu71RQ3gsxJFQqQBvrKao+mxn6k9g2B4/NItEuegS?= =?utf-8?q?JBJfo6CVnjpDHfjmERAuQBxNyplOSk7qe4LAaHP2wiOg8ClWvFrenunJA5EHhMVxB?= =?utf-8?q?MDdCZI7HENL/+++rDukXDN1dGurUHmrbgDGee+GzgvqId8A1RRAvXvR5dEhEBMJKH?= =?utf-8?q?wu2vaP9A2eTeRJbV0Qzs4uhcuYXHGJ3hppvg7HdQHVyFjyuo7BZOOcXnLhLWXLvC2?= =?utf-8?q?cP1OOKaOlu2M0vRGH97tMqHB77a/qj0Y7rCwXf0dGjiO6x0kqY4elHuJkxv32Qykd?= =?utf-8?q?H5r7xuJZm9E3PslQEcrRRLlV2TipR+EKWhuz/wLt1oasQaxjLOP6meOHnYlLC3Kvi?= =?utf-8?q?mjaHNs+FtpDePl2/R8Xbqzuyvxq1cR/o0fihwYxUSOJvp1Uxe8MEVpiHLI3cjaGWH?= =?utf-8?q?0wp8N+55MtyEF8NgftcW5ID9ljN4yFQjQQP1kk5HkZSTK8MxbXyP5mPJ9yIM8+MG4?= =?utf-8?q?8oM7bi6tGe87HvzhJKyHLT1oVDnVG3NZfigyrgzpBRr8LNq9ACq7ID5ccKSZqI9XW?= =?utf-8?q?MVfMHEsVghqAOZKoJYSMkBx8+n5iCYebTVsw4jHF3eMdvddlrHD4Toil99k4hGkzz?= =?utf-8?q?DpyTqCBwAEBAI0TkxXTseosrSg+hH+BSpi3+hTMrD/BN28VRo+9aF/I0ZIZv9R44L?= =?utf-8?q?f4aBZNwP1QLvJJKUKm0WoRi0+6/lNJrm1IfZIaMtUZHAfjQj2/+2cp05U75weeEko?= =?utf-8?q?kXT0x4r89MaL5WcCzq5VHTTf1IlXUWL2r8ojTt9bJJ/tsOJ4i9HXWhm5a//rmKDW5?= =?utf-8?q?8ezFrV7xzpYoXyptxd2mOzAPumV5QChdQO6a1bw7SAc304DKe1QXLHUWAIXErsMdR?= =?utf-8?q?kkpqYa8DVgLNUsnvb52YKcBWB0LkCuNiRy8JbkozGTLib+kduHDEwxp2+mPHNuj3d?= =?utf-8?q?TaRcqbwQs630W/QcJTXv8EvIZbii/nsNkx6z1wxON9m6WWFzN9ZIedrMlshuw=3D?= =?utf-8?q?=3D?= X-Microsoft-Antispam-Message-Info: TCLL4zSDw/5fonwBSpH8yJ7GJ1kdx57ad/qkE8OvvX9onPjnfq4v0FiJKthttaQZ4SKY3Y5s2nPjZ5P9X3EGUJ+O/kYYC7PWvwz7a9pi8Bhv6TOoealoTqqRwQke6nbyDgmTi/jy8O/5sn0TuQKLlXncPd2kj4qvSFM4EofhkLNeyq1JTnwU4FoKrckmRZn932uRQULJioQCEoByTWbSwdJJjR7RJL1wnhCNv+21kkbm79PjwB+J7xftSoNSzoVeWF2ikiJvyKGPlHAqvEcVEXIw8yJPMKGhlE78e9aLoMAn2xx5omSPs+jtDtV4SPbi2qAOpTgtDY7ReoWXpZXm43znf7Fcablc8ngKHQLlEZM= X-Microsoft-Exchange-Diagnostics: 1; SN6PR05MB4589; 6:7uvr7Kx3C3IX+N4ntcP/eup8YSddyE6eVmF4p45rk7XZReA9l9g8a1t4MZCsaQdsJqv/tAu938EO5TNQUuIXK1p0gElqjJV99BV+aVogDTc1LInWqgyUGy2fSI5NTLUONdJrXzVehVmDCF3QED82/O2suxnxA+QN5cPSVq+638KL/ctYhmKTTxUY47puCjvSyxzTyn/vL9C5JffPJ7m6MmfcQeZKR/PxDwsdqkBZeDNwB7WXDVrDuWMxvExoTEjKe272s1kBMFB7t7A98G5s0WGhwWVg+WIJ5PHNw8ZVpYp7JLimNhd+CPUNMkjUBg24zoyOkaIAmFjoRNpS47gtWlfb95RUpRyCSR74AmCCVp9RAkaL1OzBiqUrieZjpeBOEL1I9VMgImCLub4XuPqRysdDnZgjJ4asyHjDqrfhKRsS6AekmK/6YIuJ2sETf92aO+Ez4wdAZ2iUFISyr3qpOQ==; 5:2hQ6acqrJrXvYp4/Bj2f3D1lxqIjAqN4GWq1FfZ0daz+EKrS2LZzpXGDvhZTlUaPM7VfrJiAO8ZgviAh3I2t8MTic0LgbliHnhaOgI7KwFKv/cDFuoy61zcjsfmbeYlOvzoBo0efk9LU3KkWJ4xsTkXa5rXzeIR4Nq9Dpekfcjw=; 7:ZayvPXMrt3ymW388eVfdSrGGiuI7Nde76eCVZ0YC0OJlGHgiGxFALCbI8erA9A5HYMDKU27BF5xAmnZ1IfLobAEF3pUBXVzFxhsRmVu9v5K29SwxfYjUNsPv8zCLsXs4rBiWqcyQnavfNOYjMR0pyWEfwAHTQl4/+TNs1Q8zLbyUR+Dn8QygIzDFC0l1vA9RpmqDC2yfBjr0v1dnaJOjjhJZ48CHajSFPGnwrrookaa6ciNTgyR+9Z8wUWxlyIZD SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN6PR05MB4589; 20:48qVpIx7O5eWOKP5P3cVYUOJTd98qYiA8pTyWJulm4fZdOevAO/5KhbGagACU3wrxwXagXCPp331Q8xse+P8fkpQ36MPhr/ZVFzW6r4Lot6DqnagrWwoKNkLcl5A+eoLXMgmuvbVAP2CRkbTbUASfiVftDZW9yHb2j5pzfsHrsk= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2018 07:36:34.6799 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3b11237-0144-418e-41c0-08d61a14ccda 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 , =?utf-8?q?Christian_K=C3=B6nig?= , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit 19be55701071 ("drm/ttm: add operation ctx to ttm_bo_validate v2") introduced a regression where the vmwgfx driver refused to evict a buffer that was still busy instead of waiting for it to become idle. Fix this. Cc: Christian König Signed-off-by: Thomas Hellstrom --- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index 1f134570b759..f0ab6b2313bb 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c @@ -3729,7 +3729,7 @@ int vmw_validate_single_buffer(struct vmw_private *dev_priv, { struct vmw_buffer_object *vbo = container_of(bo, struct vmw_buffer_object, base); - struct ttm_operation_ctx ctx = { interruptible, true }; + struct ttm_operation_ctx ctx = { interruptible, false }; int ret; if (vbo->pin_count > 0)