From patchwork Mon Jun 17 11:34:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 10998831 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 166DA14DB for ; Mon, 17 Jun 2019 11:34:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 071DA28517 for ; Mon, 17 Jun 2019 11:34:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFB9F288DA; Mon, 17 Jun 2019 11:34:37 +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,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable 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 A892A285E8 for ; Mon, 17 Jun 2019 11:34:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D881891C4; Mon, 17 Jun 2019 11:34:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id E3A9089187; Mon, 17 Jun 2019 11:34:18 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id 207so8877710wma.1; Mon, 17 Jun 2019 04:34:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p9wRG1vgieI5Tw7lzVfOuELR6Jdrkf3meS0vFGCuHyY=; b=E/+wf6qkoP+KeDy2WcuhyJ4qKEyKBIAlGVcAlsnbJ/pM1CcVEx2y6B/2pG32k79oIG tsVjBlnSpxcFYad6N3EvvuCkJ3+Hi+X7FzTKvu5ceTS3QBmtS+8z9P+iPYmBz25UPKU+ PnZJ6ThYYmFro3UQWj3AW46JwnUZJSEdULxVloKsXR7Xuqccah92Dr9ppJoOlobSZziN 9s18wzo1MtCVBU5VhVMCQT2M5HvNBYfl+ri8grTCWjO4YYQM7sJGpj+MFLMWO3CTrkIx PIfUE1+7zqv9Tkatk8WOGSElqwT6csuwzQikHzJXtYhVqfcpe2BdYSJA/Nt0PhnD3271 IQgA== X-Gm-Message-State: APjAAAUkcL/lQUNqagiEpScJPT+Pcvmnm8mHWF4MFN70gpLNvmbNJK2w z6QFUHeGxgXAjqqGUzFhRbrfI08d X-Google-Smtp-Source: APXvYqxsXhHMPgRwrs4rpRPK5XHcoymdZ1csfQY/RYz+83xNMIKi/A/UKF6TMCJYarPwODvtZNKeRQ== X-Received: by 2002:a1c:f515:: with SMTP id t21mr19524409wmh.39.1560771257479; Mon, 17 Jun 2019 04:34:17 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:ad86:6268:1a78:d4c]) by smtp.gmail.com with ESMTPSA id s188sm12062110wmf.40.2019.06.17.04.34.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 04:34:17 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH 4/6] drm/amdgpu: use allowed_domains for exported DMA-bufs Date: Mon, 17 Jun 2019 13:34:11 +0200 Message-Id: <20190617113413.1869-4-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190617113413.1869-1-christian.koenig@amd.com> References: <20190617113413.1869-1-christian.koenig@amd.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=p9wRG1vgieI5Tw7lzVfOuELR6Jdrkf3meS0vFGCuHyY=; b=oNiUEkrrV9YlMEhpbW5P79n6wtNM+jJlv9k/3TzAAX7UJ27q8K2D43pECXalzjWL7U lGgzYRdhyBa4+VjEr988meUJhqJTOQgac+fFv5m2xxEUQ4lnf4ohWYCPbvNVOYJz+eMn dbEX9gHrSTpVWgovEbjbI4VmtXZzb0mTvhBfix3XGh+hzYe5icQM76S5xUq/e7dCsHSj Jib7oocQLBqmQILbcwrgOYPbGWwIekWBvexSmWU63rjtikg26kz/yXZQwJbMcWQPKHNM hDVT1RSDIkJdoym+5qJrI63E7mRoUobbgnxG2Dx7kzH9ew48A5oNQp4zY4ZSExQVq1IG ftjg== 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Avoid that we ping/pong the buffers when we stop to pin DMA-buf exports by using the allowed domains for exported buffers. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 3e2da24cd17a..a59780654335 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -26,6 +26,7 @@ */ #include #include +#include #include #include #include @@ -412,7 +413,9 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p, /* Don't move this buffer if we have depleted our allowance * to move it. Don't move anything if the threshold is zero. */ - if (p->bytes_moved < p->bytes_moved_threshold) { + if (p->bytes_moved < p->bytes_moved_threshold && + (!bo->gem_base.dma_buf || + list_empty(&bo->gem_base.dma_buf->attachments))) { if (!amdgpu_gmc_vram_full_visible(&adev->gmc) && (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED)) { /* And don't move a CPU_ACCESS_REQUIRED BO to limited