From patchwork Tue Jun 25 20:42:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11016383 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 A2ABF1580 for ; Tue, 25 Jun 2019 20:42:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9309C28471 for ; Tue, 25 Jun 2019 20:42:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8781D28498; Tue, 25 Jun 2019 20:42:33 +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 D321E28471 for ; Tue, 25 Jun 2019 20:42:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 84B0A6E22F; Tue, 25 Jun 2019 20:42:25 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 196986E22E for ; Tue, 25 Jun 2019 20:42:23 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id i11so29164354edq.0 for ; Tue, 25 Jun 2019 13:42:23 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pNePK7yt6YozF71CQyNI+aGRQy+Gg9BGLxajnYU/ZeY=; b=nQOG490DTEf+Zu4QVB2UO8UVHb0+vM3s2QvSM9obIqcxVHyFe3fENgPhI6MoVYqOy6 79IpwNt1k/l2HWsg5H2g2V0upQlwvJtrzNvZqZfTGXhDTvI9UY9+NLnVecl1ku2LrT09 b9NkLPMTLd8HemetFfPCnb6wekkS/Ie3oTw3rKG6sx/8pEEJGCVTmT4kRa79uRYTCwd9 ZfRazyysWm0IX5p4E/V5fUwymNcAYP8F91wODKZQ6rRfz9uiukNtOLGuTsGNPt2IhgN5 UHwkEEf+2Et1yAOzNmbtuiBriEXlBzdHSlHbzp7BemsvvJZSdvE1s6t5AzyxqHCmspvu FpJw== X-Gm-Message-State: APjAAAV/unqEEEwZ0GCAsHXSd25FbDy08kb1Z+YmVrtOuqYDlon4o+eh bPlhy3QD02ho4uv/atVUfF1Opbzkyuk= X-Google-Smtp-Source: APXvYqznaiBplpt5PugpuVGK7NwKmjp3puavpJB4WOhv8I+IsYUlgWCYddrGDrXGgZD85fKa8U7Y2g== X-Received: by 2002:a17:906:8386:: with SMTP id p6mr454910ejx.139.1561495341486; Tue, 25 Jun 2019 13:42:21 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id u9sm5187262edm.71.2019.06.25.13.42.19 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 25 Jun 2019 13:42:20 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 6/7] drm/amdgpu: Fill out gem_object->resv Date: Tue, 25 Jun 2019 22:42:07 +0200 Message-Id: <20190625204208.5614-7-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190625204208.5614-1-daniel.vetter@ffwll.ch> References: <20190625204208.5614-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pNePK7yt6YozF71CQyNI+aGRQy+Gg9BGLxajnYU/ZeY=; b=YTXNc/aDLgcxMrAr4XdKpEPk1qft1glVhEFDKjGChqCNdBTbnDpQPM8hDPyvrN6k3h 5o2RdyhDC2tHeaZRjJ7Bnl7/7smNG8KmVmIxE4wloiZgaZP0u3k7BpO9aI+ui/rcYR9y PicAdC5OaP6Wn3OjR+v7qXD0iuq9AIlNaJzuA= 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: Thomas Zimmermann , Amber Lin , Daniel Vetter , Felix Kuehling , =?utf-8?q?Michel_D=C3=A4nzer?= , Samuel Li , Sonny Jiang , Junwei Zhang , Huang Rui , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= , Alex Deucher , Daniel Vetter , Evan Quan , =?utf-8?q?Christian_K=C3=B6nig?= , Emil Velikov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP That way we can ditch our gem_prime_res_obj implementation. Since ttm absolutely needs the right reservation object all the boilerplate is already there and we just have to wire it up correctly. Note that gem/prime doesn't care when we do this, as long as we do it before the bo is registered and someone can call the handle2fd ioctl on it. Aside: ttm_buffer_object.ttm_resv could probably be ditched in favour of always passing a non-NULL resv to ttm_bo_init(). At least for gem drivers that would avoid having two of these, on in ttm_buffer_object and the other in drm_gem_object, one just there for confusion. Reviewed-by: Emil Velikov Signed-off-by: Daniel Vetter Cc: Alex Deucher Cc: "Christian König" Cc: Daniel Vetter Cc: "Michel Dänzer" Cc: Chris Wilson Cc: Huang Rui Cc: Felix Kuehling Cc: Andrey Grodzovsky Cc: Evan Quan Cc: Sonny Jiang Cc: Amber Lin Cc: "Michał Mirosław" Cc: Junwei Zhang Cc: Thomas Zimmermann Cc: Samuel Li --- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 17 +---------------- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 ++ 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c index 4809d4a5d72a..02cd845e77b3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c @@ -267,20 +267,6 @@ static void amdgpu_dma_buf_map_detach(struct dma_buf *dma_buf, drm_gem_map_detach(dma_buf, attach); } -/** - * amdgpu_gem_prime_res_obj - &drm_driver.gem_prime_res_obj implementation - * @obj: GEM BO - * - * Returns: - * The BO's reservation object. - */ -struct reservation_object *amdgpu_gem_prime_res_obj(struct drm_gem_object *obj) -{ - struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj); - - return bo->tbo.resv; -} - /** * amdgpu_dma_buf_begin_cpu_access - &dma_buf_ops.begin_cpu_access implementation * @dma_buf: Shared DMA buffer @@ -339,8 +325,7 @@ const struct dma_buf_ops amdgpu_dmabuf_ops = { * @gobj: GEM BO * @flags: Flags such as DRM_CLOEXEC and DRM_RDWR. * - * The main work is done by the &drm_gem_prime_export helper, which in turn - * uses &amdgpu_gem_prime_res_obj. + * The main work is done by the &drm_gem_prime_export helper. * * Returns: * Shared DMA buffer representing the GEM BO from the given device. diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h index 7f73a4f94204..5012e6ab58f1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h @@ -34,7 +34,6 @@ struct dma_buf *amdgpu_gem_prime_export(struct drm_gem_object *gobj, int flags); struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev, struct dma_buf *dma_buf); -struct reservation_object *amdgpu_gem_prime_res_obj(struct drm_gem_object *); void *amdgpu_gem_prime_vmap(struct drm_gem_object *obj); void amdgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); int amdgpu_gem_prime_mmap(struct drm_gem_object *obj, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 8e1b269351e8..3233c5abf5b6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1333,7 +1333,6 @@ static struct drm_driver kms_driver = { .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = amdgpu_gem_prime_export, .gem_prime_import = amdgpu_gem_prime_import, - .gem_prime_res_obj = amdgpu_gem_prime_res_obj, .gem_prime_get_sg_table = amdgpu_gem_prime_get_sg_table, .gem_prime_import_sg_table = amdgpu_gem_prime_import_sg_table, .gem_prime_vmap = amdgpu_gem_prime_vmap, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 16f96f2e3671..7b251fd26bd5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -505,6 +505,8 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, if (unlikely(r != 0)) return r; + bo->gem_base.resv = bo->tbo.resv; + if (!amdgpu_gmc_vram_full_visible(&adev->gmc) && bo->tbo.mem.mem_type == TTM_PL_VRAM && bo->tbo.mem.start < adev->gmc.visible_vram_size >> PAGE_SHIFT)