From patchwork Thu Jun 21 13:21:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 10479915 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6F5F56023A for ; Thu, 21 Jun 2018 13:28:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F4972922D for ; Thu, 21 Jun 2018 13:28:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5417429235; Thu, 21 Jun 2018 13:28:15 +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 119F82922D for ; Thu, 21 Jun 2018 13:28:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 727656E8B1; Thu, 21 Jun 2018 13:28:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 306 seconds by postgrey-1.36 at gabe; Thu, 21 Jun 2018 13:28:08 UTC Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id A0A086E8AD for ; Thu, 21 Jun 2018 13:28:08 +0000 (UTC) Received: from localhost.localdomain ([88.130.55.78]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LkhPw-1g69BM1tJM-00aWjW; Thu, 21 Jun 2018 15:22:56 +0200 From: Thomas Zimmermann To: christian.koenig@amd.com, Hongbo.He@amd.com Subject: [PATCH 2/3] drm/ttm: Replace ttm_bo_reference() with ttm_bo_get() Date: Thu, 21 Jun 2018 15:21:36 +0200 Message-Id: <20180621132137.27067-3-contact@tzimmermann.org> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180621132137.27067-1-contact@tzimmermann.org> References: <20180621132137.27067-1-contact@tzimmermann.org> X-Provags-ID: V03:K1:yl3mADCXTvY8wDclVTczGDKKfX3fmBOlW5z73JCLtUI2as6M/zH pTTb8r8NrAKUjgCYgAoVCpH1tsQs+p00yXt41bD1dZYRRTYMxYqnU/DQ96LKi4vRhQRuiB0 ZIgRrhFS/XMRMrLt36iPMGsePDC32lHeYc2hNrsZ7ZWkOY/FNB3XD+2ErF2wOYogtlYJl2U VdTuU3oAwpbnWKWhhCFJQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Uf8/RpDvLRQ=:q7hs/ywAUaU4P6sKqjbyeA Kt8535WZIL/TYvnSHVQQfLyG8ZZPU24MiLbTE5A0++kpPmtGN9+gneYBSPFlUpX8fWRVlg+Rf ZxZib5fz8rb7FVztHLVi14KfEjdSrhhAoJ1iXeLL5tquZEbXGCWIdRQXyVuT/gBVR3P85he9c IZPtJJrsA9BllEdLl3injNpT5WZHCo6pPJElcFxLSePx79cVCmxyGSVfSYCp/nwlN0AHMngfH 65O6JkFS+Uytn5t0WMAUNi3ovcA8XsNGMUBMTli/QDZ19Jg1NiL0UFo6gstv9BqT9oGkGLZnC sTflVnWZsnOEP4FiapSxgtL7ufCe1Cp5B3PshIiqsMrKE3LOWxwDsCNxcoy9ZcQ4S6BVXpnwy QFb7uH8Xhbz5A4ty/jX8E6SlRa5hF/Vp0xQXvZFscHHDMOY4BlNDHcl3PUssi5Gp8HLrfRK0A MlK5SXh4glqV7OfAF10YtPCIvaFP74pN4FEOmIXrt3e4hW2jiqvaWVh4a6ZYTFBV8A78fNI9k ixig+lCAS1El/vxqYeBRHIWdmfxqVw0/t3WeC6HGGSxgzCT/9LM85KIH3U0atnsXkmKL9Ga/C DjpmNhjSIQzC7T8ukP1B1GU38gPBvxshfq6EbpunDLO5jxjckn7ZEVDoKKImIWwpTC0qB+KDX 65Txx0s0DGN2dIpezYyBeorNw69RwpTKSQ48nMC0CywOhD1UKiukbrTkhZz9H2jGtdro= 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: airlied@linux.ie, Thomas Zimmermann , dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/ttm/ttm_bo_util.c | 3 ++- drivers/gpu/drm/ttm/ttm_bo_vm.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index f2c167702eef..897c799832f6 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -492,8 +492,9 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, if (!fbo) return -ENOMEM; + ttm_bo_get(bo); fbo->base = *bo; - fbo->bo = ttm_bo_reference(bo); + fbo->bo = bo; /** * Fix up members that we shouldn't copy directly: diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index c7ece7613a6a..4a4c0cb34433 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -67,7 +67,7 @@ static int ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo, if (vmf->flags & FAULT_FLAG_RETRY_NOWAIT) goto out_unlock; - ttm_bo_reference(bo); + ttm_bo_get(bo); up_read(&vmf->vma->vm_mm->mmap_sem); (void) dma_fence_wait(bo->moving, true); ttm_bo_unreserve(bo); @@ -136,7 +136,7 @@ static int ttm_bo_vm_fault(struct vm_fault *vmf) if (vmf->flags & FAULT_FLAG_ALLOW_RETRY) { if (!(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) { - ttm_bo_reference(bo); + ttm_bo_get(bo); up_read(&vmf->vma->vm_mm->mmap_sem); (void) ttm_bo_wait_unreserved(bo); ttm_bo_unref(&bo); @@ -303,7 +303,7 @@ static void ttm_bo_vm_open(struct vm_area_struct *vma) WARN_ON(bo->bdev->dev_mapping != vma->vm_file->f_mapping); - (void)ttm_bo_reference(bo); + ttm_bo_get(bo); } static void ttm_bo_vm_close(struct vm_area_struct *vma) @@ -472,8 +472,10 @@ int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo) if (vma->vm_pgoff != 0) return -EACCES; + ttm_bo_get(bo); + vma->vm_ops = &ttm_bo_vm_ops; - vma->vm_private_data = ttm_bo_reference(bo); + vma->vm_private_data = bo; vma->vm_flags |= VM_MIXEDMAP; vma->vm_flags |= VM_IO | VM_DONTEXPAND; return 0;