From patchwork Wed May 29 12:26:55 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: 10966951 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 9919E76 for ; Wed, 29 May 2019 12:27:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AB6327CEE for ; Wed, 29 May 2019 12:27:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7ED0A28739; Wed, 29 May 2019 12:27:19 +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=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 4020B27CEE for ; Wed, 29 May 2019 12:27:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 220706E2EF; Wed, 29 May 2019 12:27:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id D685A6E0FD; Wed, 29 May 2019 12:27:06 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id l17so1619699wrm.10; Wed, 29 May 2019 05:27:06 -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=H1DBpie83K6hVXAyMME3hPzCU6uC+f31L+bIwmOxc8A=; b=eQIkGCWTDmrnDxGdm8k+QKSd8Di1CihqUhNv+57U2tzBckyWu6+UAnxO7W8PgCCH/l SjYGI+M6inIAaDIqC2sGU4b3ABppW1n9rGGv5GNCARAfAM6e33gnfFZ3zpGJAAyzX24d m0EK4jKL5axVc6PXFC5gMwJwaSNepr2NTxw2MUum3btQgAsUcPfBnYJ0v0Oa835Ldl5p 33vmdZWhzvBgMdE1o+PBfWueocq3jDAMueLtrC1lg7pVaNAO0L6lwce292KZPsGMuXO6 VVRJNbg5OAZmw0+BIoJedb++VUC9zUvqf/u98haUHK5b157yhUysJ5gqnra3+JHrRnhP 7epw== X-Gm-Message-State: APjAAAWTptTXAbuwImdXP0RifKiZZUgbw2dtlTg8anfrOub6bVgEJuAj cGJuMZs+bljlwrlUqB9lVkucvrUs X-Google-Smtp-Source: APXvYqyVUGjJ11XsXU2Wurtz0SAuGngrtxDTchFFCqMOCetXFEeCOl0rKfQENip+3cVZr0rsIdan1Q== X-Received: by 2002:adf:e903:: with SMTP id f3mr2128884wrm.133.1559132825391; Wed, 29 May 2019 05:27:05 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:1ea:e785:ab1c:e514]) by smtp.gmail.com with ESMTPSA id z25sm6211343wmi.5.2019.05.29.05.27.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 May 2019 05:27:04 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH 03/10] drm/ttm: remove manual placement preference Date: Wed, 29 May 2019 14:26:55 +0200 Message-Id: <20190529122702.13035-3-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190529122702.13035-1-christian.koenig@amd.com> References: <20190529122702.13035-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=H1DBpie83K6hVXAyMME3hPzCU6uC+f31L+bIwmOxc8A=; b=usSCJd8EzxcTdX+r+ShkBrPvCZ0nFL4dgwSWzD3O1ljeWHQnX/VVePsCA8Zk0HlvmO N1SI3HTgHihP4gRTyYcdeqqN9fCVZgoyQjDlXMBC5TSIDY2uOWFZ723kS3XN5TvpddUt BewvOzjJqCPvetCzBbrmwk2rjxXFoxk6aa8xDlYCNfKuwSmTCAkBPTUvHarT5AKwXX1h yye1/YNvQvksP2jeRt/SsvJ4U7uLPtZTzBJUF0F+bZDMWypejJEWG1dJsIusTPXWSMF1 7FGm6QsVKGgmJuSrbkKKg/6UB1zwRElopwNSo0UcvD62LKF6E35uCL5+mgX9IKQGVHg5 fvwg== 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 If drivers don't prefer a system memory placement they should not but it into the placement list first. Signed-off-by: Christian König --- drivers/gpu/drm/ttm/ttm_bo.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 7b59e5ecde7f..702cd89adbf9 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1012,8 +1012,12 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, ttm_flag_masked(&cur_flags, place->flags, ~TTM_PL_MASK_MEMTYPE); - if (mem_type == TTM_PL_SYSTEM) - break; + if (mem_type == TTM_PL_SYSTEM) { + mem->mem_type = mem_type; + mem->placement = cur_flags; + mem->mm_node = NULL; + return 0; + } ret = (*man->func->get_node)(man, bo, place, mem); if (unlikely(ret)) @@ -1025,16 +1029,12 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, (*man->func->put_node)(man, mem); return ret; } - break; + mem->mem_type = mem_type; + mem->placement = cur_flags; + return 0; } } - if ((type_ok && (mem_type == TTM_PL_SYSTEM)) || mem->mm_node) { - mem->mem_type = mem_type; - mem->placement = cur_flags; - return 0; - } - for (i = 0; i < placement->num_busy_placement; ++i) { const struct ttm_place *place = &placement->busy_placement[i];