From patchwork Fri Jul 31 22:22:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 6920851 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A1143C05AE for ; Fri, 31 Jul 2015 22:23:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BBD6B20687 for ; Fri, 31 Jul 2015 22:23:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E1B2120684 for ; Fri, 31 Jul 2015 22:23:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DE937A1F4; Fri, 31 Jul 2015 15:23:11 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f172.google.com (mail-yk0-f172.google.com [209.85.160.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id 069DE6EDF0 for ; Fri, 31 Jul 2015 15:22:59 -0700 (PDT) Received: by ykay190 with SMTP id y190so70351863yka.3 for ; Fri, 31 Jul 2015 15:22:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2oXFmRCVZ0k96brdcRBzCEU3ogSmXMAZ+9zYNpJgqk4=; b=wzcMmSMF/MDd9+rX6dRlIXA0893Y2t1V+MRK/DYRGCQf/SYTkJi9p7v5xxWhOKHftE bXuhY+pNZ72tlFROG9hBddvNcPClVxyAzGSNsglS5ERE9tVMm0Hld6I2lCecDk1Bu243 QbiXE5S9p0/Ubpjv8mxmH9XKeqHphFmcBhpb0Khm6MhtNe78PyhZGBd4XWWgHW963Ouu YdNlDBvSMnhUxT3of+FuM/f/iyYh2ACcjMjVEMClNF7P3oS6EnWN9u+fZgT0fVjT9ERa 8WpTR6hWfxAaF4aWuArzVfKQ/OIlbO16F/tLlmLEFeJalOTCnkXCtyXXSSH5vX/SPO9u JTjg== X-Received: by 10.170.36.197 with SMTP id 188mr6187599yke.10.1438381378266; Fri, 31 Jul 2015 15:22:58 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id u78sm5438990ywu.13.2015.07.31.15.22.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 15:22:57 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 06/31] drm/amdgpu: add bo list copy Date: Fri, 31 Jul 2015 18:22:22 -0400 Message-Id: <1438381367-24980-7-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1438381367-24980-1-git-send-email-alexander.deucher@amd.com> References: <1438381367-24980-1-git-send-email-alexander.deucher@amd.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chunming Zhou Signed-off-by: Chunming Zhou Acked-by: Christian K?nig Reviewed-by: Jammy Zhou --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 50 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index dd05335..da924ed 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -1061,6 +1061,9 @@ struct amdgpu_bo_list { struct amdgpu_bo_list * amdgpu_bo_list_get(struct amdgpu_fpriv *fpriv, int id); void amdgpu_bo_list_put(struct amdgpu_bo_list *list); +void amdgpu_bo_list_copy(struct amdgpu_device *adev, + struct amdgpu_bo_list *dst, + struct amdgpu_bo_list *src); void amdgpu_bo_list_free(struct amdgpu_bo_list *list); /* diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c index f82a2dd..4d27fa1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c @@ -166,6 +166,56 @@ void amdgpu_bo_list_put(struct amdgpu_bo_list *list) mutex_unlock(&list->lock); } +void amdgpu_bo_list_copy(struct amdgpu_device *adev, + struct amdgpu_bo_list *dst, + struct amdgpu_bo_list *src) +{ + struct amdgpu_bo_list_entry *array; + struct amdgpu_bo *gds_obj = adev->gds.gds_gfx_bo; + struct amdgpu_bo *gws_obj = adev->gds.gws_gfx_bo; + struct amdgpu_bo *oa_obj = adev->gds.oa_gfx_bo; + + bool has_userptr = false; + unsigned i; + + array = drm_calloc_large(src->num_entries, sizeof(struct amdgpu_bo_list_entry)); + if (!array) + return; + memset(array, 0, src->num_entries * sizeof(struct amdgpu_bo_list_entry)); + + for (i = 0; i < src->num_entries; ++i) { + memcpy(array, src->array, + src->num_entries * sizeof(struct amdgpu_bo_list_entry)); + array[i].robj = amdgpu_bo_ref(src->array[i].robj); + if (amdgpu_ttm_tt_has_userptr(array[i].robj->tbo.ttm)) { + has_userptr = true; + array[i].prefered_domains = AMDGPU_GEM_DOMAIN_GTT; + array[i].allowed_domains = AMDGPU_GEM_DOMAIN_GTT; + } + array[i].tv.bo = &array[i].robj->tbo; + array[i].tv.shared = true; + + if (array[i].prefered_domains == AMDGPU_GEM_DOMAIN_GDS) + gds_obj = array[i].robj; + if (array[i].prefered_domains == AMDGPU_GEM_DOMAIN_GWS) + gws_obj = array[i].robj; + if (array[i].prefered_domains == AMDGPU_GEM_DOMAIN_OA) + oa_obj = array[i].robj; + } + + for (i = 0; i < dst->num_entries; ++i) + amdgpu_bo_unref(&dst->array[i].robj); + + drm_free_large(dst->array); + + dst->gds_obj = gds_obj; + dst->gws_obj = gws_obj; + dst->oa_obj = oa_obj; + dst->has_userptr = has_userptr; + dst->array = array; + dst->num_entries = src->num_entries; +} + void amdgpu_bo_list_free(struct amdgpu_bo_list *list) { unsigned i;