From patchwork Tue Apr 17 13:47:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10347447 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 87D146031B for ; Wed, 18 Apr 2018 07:25:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72A3F2000A for ; Wed, 18 Apr 2018 07:25:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66CC921327; Wed, 18 Apr 2018 07:25:50 +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.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED, T_DKIM_INVALID 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 1FAD82000A for ; Wed, 18 Apr 2018 07:25:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B33116E46A; Wed, 18 Apr 2018 07:25:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 68A3F6E198 for ; Tue, 17 Apr 2018 13:46:02 +0000 (UTC) Received: by mail-pf0-x243.google.com with SMTP id o16so12168653pfk.9 for ; Tue, 17 Apr 2018 06:46:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=MbUojEWaxNKkcaHIVnv6jmdimj1LhdTN0W1ETwL8ySg=; b=XrPr8CFUVZHLPFndVDhuGYs5VTAAKFNrWsg5V6IFZTTQ73F1sfhtPeJF+aNgWC58ZC V5ZQdJFiIHVBnPqEe5lD67sWht6/TFbLIBqg+g1ai/m/JmBnrYOJUCu6AU2RCuspkc/s 1TzmEEvfAd4qt4WJd6QjnVboBWzdawcnZwLHBxuv1vFk392uYTSblnswVWsEO3YSJ2Im 2892d1MWBjtBEbkLx5JRYZKlxD4WXiuRszeN/q+/dEP5Hn+1AfTwkAKEayO1Pq+FTxaq /i58neXkUCntBlO6fk8xVt/wS+I7kCrC5zAyNnvIN0gPuq/Oa1bM9cSawePjizitdjWX FYxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=MbUojEWaxNKkcaHIVnv6jmdimj1LhdTN0W1ETwL8ySg=; b=hl/hAYjtCw7YpYqgGHN9RyUo/KevavdDE/Vay1Uw3cmQLsic9QCymvc7crhJSNcC7D 7qJLIwRR8eyoa5cS0O0pm2wWoq3uNRkazK7b3ktFwYQZXW//tCPfNtzdSAFEdzLGHaFq yDh0RIgUzchZBvLGIvxFniEQ9t5lEAXiNG+l+EeEgwWWUnUeL4LPG7lO7K+kXFheGQTy RaR1gQMAlBt5H+5+1TC13BLxN7eV5SVUuHvcUHg/mEYv9G28hGoywflQX+Dye0qokCpM +Rokl8KToDUxcxkqek3J38kQLKcrdvuQS+baJuZ7ym6E9b2vOxKjzxV4g+cAOgMePVc2 z/Tw== X-Gm-Message-State: ALQs6tD1n68pJmxlwPyhZSb5sKeM5GTYvqsFg6Cb5o8yEDOBUiSlt/gh LBFU100psL1UjSOBT+FlNxg= X-Google-Smtp-Source: AIpwx4+Hr+DVj1nPx6ygQoyGHS79ftWKYPbB3UHd7bmxt3BLwWOvR7c8laAppk8q8I6BY7+PqYA1yw== X-Received: by 10.101.100.13 with SMTP id a13mr1852749pgv.360.1523972761808; Tue, 17 Apr 2018 06:46:01 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([183.82.18.42]) by smtp.gmail.com with ESMTPSA id 86sm38505222pfh.93.2018.04.17.06.45.59 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Apr 2018 06:46:00 -0700 (PDT) Date: Tue, 17 Apr 2018 19:17:55 +0530 From: Souptick Joarder To: thierry.reding@gmail.com, airlied@linux.ie, jonathanh@nvidia.com Subject: [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t Message-ID: <20180417134755.GA30291@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Mailman-Approved-At: Wed, 18 Apr 2018 07:25:05 +0000 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: linux-tegra@vger.kernel.org, willy@infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use new return type vm_fault_t for fault handler. For now, this is just documenting that the function returns a VM_FAULT value rather than an errno. Once all instances are converted, vm_fault_t will become a distinct type. Reference id -> 1c8f422059ae ("mm: change return type to vm_fault_t") Previously vm_insert_page() returns err which driver mapped into VM_FAULT_* type. The new function vmf_insert_page() will replace this inefficiency by returning VM_FAULT_* type. Signed-off-by: Souptick Joarder --- drivers/gpu/drm/tegra/gem.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) -- 1.9.1 diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 49b9bf2..6121493 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -422,14 +422,13 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm, return 0; } -static int tegra_bo_fault(struct vm_fault *vmf) +static vm_fault_t tegra_bo_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_gem_object *gem = vma->vm_private_data; struct tegra_bo *bo = to_tegra_bo(gem); struct page *page; pgoff_t offset; - int err; if (!bo->pages) return VM_FAULT_SIGBUS; @@ -437,20 +436,7 @@ static int tegra_bo_fault(struct vm_fault *vmf) offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT; page = bo->pages[offset]; - err = vm_insert_page(vma, vmf->address, page); - switch (err) { - case -EAGAIN: - case 0: - case -ERESTARTSYS: - case -EINTR: - case -EBUSY: - return VM_FAULT_NOPAGE; - - case -ENOMEM: - return VM_FAULT_OOM; - } - - return VM_FAULT_SIGBUS; + return vmf_insert_page(vma, vmf->address, page); } const struct vm_operations_struct tegra_bo_vm_ops = {