From patchwork Mon Apr 16 16:09:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10344489 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 4ED27601D7 for ; Tue, 17 Apr 2018 07:42:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42509287D0 for ; Tue, 17 Apr 2018 07:42:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3711828894; Tue, 17 Apr 2018 07:42:03 +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 E05F82887E for ; Tue, 17 Apr 2018 07:42:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6735F6E42F; Tue, 17 Apr 2018 07:41:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl0-x243.google.com (mail-pl0-x243.google.com [IPv6:2607:f8b0:400e:c01::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id B59C46E137 for ; Mon, 16 Apr 2018 16:07:25 +0000 (UTC) Received: by mail-pl0-x243.google.com with SMTP id f7-v6so3239984plr.4 for ; Mon, 16 Apr 2018 09:07:25 -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=qAbyYKOiR6qj8nxJBMmRfaA4gH3YDRSdBkYDH4e4TtM=; b=K0re3oKtpnCZEOAag76Jra40G2kKPzSJfieUG3SCj15q8TU+0kDRnp5AqHEaFOj8PC N0Lzl8Qit29aQbNWQ5m6JfQ/WNKmA2maudul7O0rph4Y9+w3HFWBY2SuGDLFYY1Fa5XR t1c41qsL9ITNR8Bp7Emfg5Ru75bQ61FIV0qqxAvFVqp70CLLCN+VimwZD8cH+RDH6Oz7 XMabrNDEjLdMMsTfFa+39bbdHVG47ReUU3eZAqruntcfprw8+aVGduklmNZH2B+PMuwD ixdO3Y71VJX82vpjq7/3iRE//UynhLbJCm3oSVSoDCQgkmDV4EYx6ZBqloFB7+XLY6Hi vG3w== 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=qAbyYKOiR6qj8nxJBMmRfaA4gH3YDRSdBkYDH4e4TtM=; b=nDuCK+NXkOSKUZMkLHkgRhW2LtrBGPqQreK0FmMgIRFd0J7aOm8VcyFvh6gJED/2Ll F4ycLyLVDRtK8dCdXPmyH39hBbe2NCqD9tj0pXOh6yQrEYjlaMKTGRogmSQgrAsVGXoE DsM1Kav4gDpYp61b0Wl3tFzYc0LsKFqer9KRXi/j+ZKBP8SFFjL29GIDDUAEigSJLjqE A90QA1sCzipMv6k0D+ENgOrX4odoV14oJH8XqfxQF6OrMFviJ45pewu5O+uoOAo5GiGg Z6Tys7x3bRnQ/MtYr3jZS2cwk5y+4a8XdOwrqGYPmDYUyql79hhvEhIhzCT8OfLhuv7O Gw9A== X-Gm-Message-State: ALQs6tCNwr9oY7X1NMUgmyIahZkqn0PE2zQsQjsz5XscvphUfaCP5VFZ OMBUgz/BPTbC7dDquCrDRRo= X-Google-Smtp-Source: AIpwx4/rCUVy62uwXUQxGHceseAa70mDUXTOKzVkjF31tT7hydatA2ryTWNhJk/LthxE3NlVbarYaA== X-Received: by 2002:a17:902:28aa:: with SMTP id f39-v6mr4636586plb.250.1523894845203; Mon, 16 Apr 2018 09:07:25 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([49.205.217.195]) by smtp.gmail.com with ESMTPSA id k66sm7381990pgk.24.2018.04.16.09.07.23 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Apr 2018 09:07:23 -0700 (PDT) Date: Mon, 16 Apr 2018 21:39:18 +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: <20180416160918.GA27080@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: Tue, 17 Apr 2018 07:41:46 +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, 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 in vm_operations_struct. 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 = {