From patchwork Sat Apr 14 16:04:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10342313 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 9C6F860542 for ; Mon, 16 Apr 2018 07:22:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8433B27F3E for ; Mon, 16 Apr 2018 07:22:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78CA1284E4; Mon, 16 Apr 2018 07:22:27 +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 0CC7C27F3E for ; Mon, 16 Apr 2018 07:22:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0A6656E061; Mon, 16 Apr 2018 07:22:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 75B286E01A for ; Sat, 14 Apr 2018 16:02:39 +0000 (UTC) Received: by mail-pl0-x242.google.com with SMTP id x4-v6so7703717pln.7 for ; Sat, 14 Apr 2018 09:02:39 -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=b4gI6CXZPh5h7iG5dGea15OBk3bdsYxyBMA/YPqablI=; b=BLhhYo/CzcuVoH5+Ts3I4Hhk8ikDaDQFGDTSYQpN9kX08odwTWtFmj/ETxkWamCYly Ka5i/p6NFvLGdYArFwdvK4TVqn8mVStvkWs56w0PRjhBO+LS4o5cCzrbt4pz/rErbpYC uB+W1MKujSUN2JC/xViq00oQb4qgb6iiWBhBM2EEdWc3u5c+e/qIiaSWNM8JpwemTpOF pkASkjF8ZwLTLELFOLkzB7/0n9R+d9CpsJXqsrNBEaL9Snyosn1XEMgqC3lGW6dhVom5 kPXpV2ADXjRayMlR2NPJKaMsSctCCXgRec/c6UWWnkIxVHGQ+PiWRvRf8OpGbeRqcZ9c oYtQ== 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=b4gI6CXZPh5h7iG5dGea15OBk3bdsYxyBMA/YPqablI=; b=Db8boGJigeYkiasoUpiNYT6uC6qwnoE2x7YsH6DF7Q8z0v5cIkLArB2/I1we04ByJ8 54EJ7CFyaV+C6F0DypzQjAOpikhjbzW09531rHn9WyK7jiKFzefN1hJRx0xlE6CDZvOJ FEcdmEGTy5/2EYDpx9YKfck7aIGQs3cTJ3xkxWaurZJ0etjNorreIaQv9prH2npHntg1 xDQPjum2t5QRQeVkJKnMia18svIej9GF+OWUnZ1Ku6B1WOl2i2IOZpopcZb/oD8pDyR5 SiiCwOV3gPEnd7Uc/RtkyvaoTFP2pAJSFSAgGl/fbWc2BKpC3uIk0bygEZ93JyJqDfPh lHhQ== X-Gm-Message-State: ALQs6tAbr4ldGGCxwFT78g4CaLER21kU99Ivlr7jVN8iWKi20sMKk30O HI6/lQnrieTEOO4jJrqwMEKSwQ== X-Google-Smtp-Source: AIpwx4+teD+dDr7VRwUgX5Rbsxfk7farFlN+u8EXxTiGQrlj5Q+G7LgQF85eY+wo0V91pIEpRwyuwg== X-Received: by 2002:a17:902:9a9:: with SMTP id 38-v6mr9358540pln.40.1523721758018; Sat, 14 Apr 2018 09:02:38 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([183.82.16.203]) by smtp.gmail.com with ESMTPSA id a81sm21965947pfc.168.2018.04.14.09.02.36 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 14 Apr 2018 09:02:36 -0700 (PDT) Date: Sat, 14 Apr 2018 21:34:29 +0530 From: Souptick Joarder To: inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com Subject: [PATCH] gpu: drm: exynos: Change return type to vm_fault_t Message-ID: <20180414160429.GA18113@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: Mon, 16 Apr 2018 07:22:08 +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: dri-devel@lists.freedesktop.org, willy@infradead.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. Signed-off-by: Souptick Joarder Reviewed-by: Matthew Wilcox --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 21 ++++----------------- drivers/gpu/drm/exynos/exynos_drm_gem.h | 3 ++- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 11cc01b..6e1494f 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -431,37 +431,24 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv, return 0; } -int exynos_drm_gem_fault(struct vm_fault *vmf) +vm_fault_t exynos_drm_gem_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_gem_object *obj = vma->vm_private_data; struct exynos_drm_gem *exynos_gem = to_exynos_gem(obj); unsigned long pfn; pgoff_t page_offset; - int ret; page_offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT; if (page_offset >= (exynos_gem->size >> PAGE_SHIFT)) { DRM_ERROR("invalid page offset\n"); - ret = -EINVAL; - goto out; + return VM_FAULT_SIGBUS; } pfn = page_to_pfn(exynos_gem->pages[page_offset]); - ret = vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV)); - -out: - switch (ret) { - case 0: - case -ERESTARTSYS: - case -EINTR: - return VM_FAULT_NOPAGE; - case -ENOMEM: - return VM_FAULT_OOM; - default: - return VM_FAULT_SIGBUS; - } + return vmf_insert_mixed(vma, vmf->address, + __pfn_to_pfn_t(pfn, PFN_DEV)); } static int exynos_drm_gem_mmap_obj(struct drm_gem_object *obj, diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.h b/drivers/gpu/drm/exynos/exynos_drm_gem.h index 5a4c7de..9057d7f 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.h +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.h @@ -13,6 +13,7 @@ #define _EXYNOS_DRM_GEM_H_ #include +#include #define to_exynos_gem(x) container_of(x, struct exynos_drm_gem, base) @@ -111,7 +112,7 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv, struct drm_mode_create_dumb *args); /* page fault handler and mmap fault address(virtual) to physical memory. */ -int exynos_drm_gem_fault(struct vm_fault *vmf); +vm_fault_t exynos_drm_gem_fault(struct vm_fault *vmf); /* set vm_flags and we can change the vm attribute to other one at here. */ int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);