From patchwork Mon Apr 16 16:02:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10344497 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 5DF586039A for ; Tue, 17 Apr 2018 07:42:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5284F286A8 for ; Tue, 17 Apr 2018 07:42:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4735C286BE; Tue, 17 Apr 2018 07:42:52 +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 DCACA286A8 for ; Tue, 17 Apr 2018 07:42:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ACC2A6E441; Tue, 17 Apr 2018 07:42:03 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 266906E0E9 for ; Mon, 16 Apr 2018 16:00:43 +0000 (UTC) Received: by mail-pf0-x242.google.com with SMTP id z9so3923908pfe.6 for ; Mon, 16 Apr 2018 09:00:43 -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=pv/ImETXjfHjrqlFHODebFZcfGWthRO64/3ZbfILTaE=; b=DCoioIsC8WgWE010lDE/mQwi7qJc9+SfjAeQ6K+gXJosEkQc/GZAoRRS1uUYSjjQH3 DWDP0Q5Oxzx7KcaFQlUsVsVzA5bBhVgLYftUtCQUZDq9gpeNbVVQ3jWmSXPlHpVJT1vf WaX9uiDRaYDh9j8MOJoyjeotRvoT2jhN2PfKgU4tw7H9pUH22uxB8FrBjKI3GAjsYkZw Rx356GoR/mlab//5ieHz4JUJ7P9wnHYaPy8y5CjbfqrOejKika2QZYs55bLly12Kjp9f 1WdyorgsNHBwWVkGD4mzE1KI6SrDN8JRxwIJTINGFm9Ne2dUbb+wRBMU38J6oqSOrUXY pKIw== 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=pv/ImETXjfHjrqlFHODebFZcfGWthRO64/3ZbfILTaE=; b=RR3NTlrsn/nqK0y0AWQKh/ZDb6nFTuVhaMRIVULeLMPnfFCZmBhPqI8uDQPMwgu5AX 6KcjUn4NbeHFX7f4/9/XVt5qKo/NDPuD5hlet31oYeGJQJIB7EEMPxh1L4BPjtNwq6x1 B/11plMMV4jmJsc6xrHiP+F2Bn2aFOvlSHG47QwzeE/GgvwexXUdVcGDC/d6ysAWDkXo ZYIprInkjaOrLbmlP3IHr+SYFgWJalEx+oH7KRSzCNzaoim5HOaNi44kZ0zkN0/oCrbv /uQAiNzYH0qbZgNQYQoIMJsdhgLYk1OtvXFSjMBLPZApaGntrpy/WNvJS1Nq20rTZnJF oFMQ== X-Gm-Message-State: ALQs6tDfQyfzE1Z5cEwmiPEW6UqtcNQtiTIJOGVqCmed3ilaG0oTQSZ9 MWjQ3Oby6inDNDsGiPD4H0odhQ== X-Google-Smtp-Source: AIpwx4/AtTKGbLof9+MoKWIxMkx35EcM9BxRv/qGgrtJSVeaB3+V9lo8DmzxT7lLzuuc4VyOmE78ZA== X-Received: by 10.167.130.151 with SMTP id s23mr22238766pfm.106.1523894441948; Mon, 16 Apr 2018 09:00:41 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([49.205.217.195]) by smtp.gmail.com with ESMTPSA id t11sm21675548pgn.94.2018.04.16.09.00.38 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Apr 2018 09:00:40 -0700 (PDT) Date: Mon, 16 Apr 2018 21:32:33 +0530 From: Souptick Joarder To: linux@armlinux.org.uk, airlied@linux.ie Subject: [PATCH] gpu: drm: armada: Adding new typedef vm_fault_t Message-ID: <20180416160233.GA27043@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:47 +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: 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 in struct vm_operations_struct. For now, this is just documenting that the function returns a VM_ FAULT value rather than an errno. Once all inst ances are converted, vm_fault_t will become a di stinct type. Signed-off-by: Souptick Joarder Reviewed-by: Matthew Wilcox --- drivers/gpu/drm/armada/armada_gem.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) -- 1.9.1 diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index a97f509..81a55b7 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -13,25 +13,14 @@ #include #include "armada_ioctlP.h" -static int armada_gem_vm_fault(struct vm_fault *vmf) +static vm_fault_t armada_gem_vm_fault(struct vm_fault *vmf) { struct drm_gem_object *gobj = vmf->vma->vm_private_data; struct armada_gem_object *obj = drm_to_armada_gem(gobj); unsigned long pfn = obj->phys_addr >> PAGE_SHIFT; - int ret; pfn += (vmf->address - vmf->vma->vm_start) >> PAGE_SHIFT; - ret = vm_insert_pfn(vmf->vma, vmf->address, pfn); - - switch (ret) { - case 0: - case -EBUSY: - return VM_FAULT_NOPAGE; - case -ENOMEM: - return VM_FAULT_OOM; - default: - return VM_FAULT_SIGBUS; - } + return vmf_insert_pfn(vmf->vma, vmf->address, pfn); } const struct vm_operations_struct armada_gem_vm_ops = {