From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932248AbeE2G73 (ORCPT ); Tue, 29 May 2018 02:59:29 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35661 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932182AbeE2G7Z (ORCPT ); Tue, 29 May 2018 02:59:25 -0400 X-Google-Smtp-Source: AB8JxZogGKvlFwETR7oaB0azeCvh4NBcLigxR919mZoy5VbMyY+gudum+3up+8pUfUZBaN1VF11imw== Date: Tue, 29 May 2018 08:59:21 +0200 From: Daniel Vetter To: Souptick Joarder Cc: daniel.vetter@intel.com, Gustavo Padovan , Sean Paul , airlied@linux.ie, Matthew Wilcox , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH] gpu: drm: drm_vm: Adding new typedef vm_fault_t Message-ID: <20180529065921.GV3438@phenom.ffwll.local> Mail-Followup-To: Souptick Joarder , daniel.vetter@intel.com, Gustavo Padovan , Sean Paul , airlied@linux.ie, Matthew Wilcox , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org References: <20180510134203.GA25166@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 4.15.0-3-amd64 User-Agent: Mutt/1.9.5 (2018-04-13) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, May 25, 2018 at 02:00:33AM +0530, Souptick Joarder wrote: > On Wed, May 16, 2018 at 10:09 AM, Souptick Joarder wrote: > > On Thu, May 10, 2018 at 7:12 PM, Souptick Joarder wrote: > >> 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. > >> > >> commit 1c8f422059ae ("mm: change return type to vm_fault_t") > >> > >> Signed-off-by: Souptick Joarder > >> Reviewed-by: Matthew Wilcox > >> --- > >> drivers/gpu/drm/drm_vm.c | 10 +++++----- > >> 1 file changed, 5 insertions(+), 5 deletions(-) > >> > >> diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c > >> index 2660543..c330104 100644 > >> --- a/drivers/gpu/drm/drm_vm.c > >> +++ b/drivers/gpu/drm/drm_vm.c > >> @@ -100,7 +100,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma) > >> * map, get the page, increment the use count and return it. > >> */ > >> #if IS_ENABLED(CONFIG_AGP) > >> -static int drm_vm_fault(struct vm_fault *vmf) > >> +static vm_fault_t drm_vm_fault(struct vm_fault *vmf) > >> { > >> struct vm_area_struct *vma = vmf->vma; > >> struct drm_file *priv = vma->vm_file->private_data; > >> @@ -173,7 +173,7 @@ static int drm_vm_fault(struct vm_fault *vmf) > >> return VM_FAULT_SIGBUS; /* Disallow mremap */ > >> } > >> #else > >> -static int drm_vm_fault(struct vm_fault *vmf) > >> +static vm_fault_t drm_vm_fault(struct vm_fault *vmf) > >> { > >> return VM_FAULT_SIGBUS; > >> } > >> @@ -189,7 +189,7 @@ static int drm_vm_fault(struct vm_fault *vmf) > >> * Get the mapping, find the real physical page to map, get the page, and > >> * return it. > >> */ > >> -static int drm_vm_shm_fault(struct vm_fault *vmf) > >> +static vm_fault_t drm_vm_shm_fault(struct vm_fault *vmf) > >> { > >> struct vm_area_struct *vma = vmf->vma; > >> struct drm_local_map *map = vma->vm_private_data; > >> @@ -291,7 +291,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) > >> * > >> * Determine the page number from the page offset and get it from drm_device_dma::pagelist. > >> */ > >> -static int drm_vm_dma_fault(struct vm_fault *vmf) > >> +static vm_fault_t drm_vm_dma_fault(struct vm_fault *vmf) > >> { > >> struct vm_area_struct *vma = vmf->vma; > >> struct drm_file *priv = vma->vm_file->private_data; > >> @@ -326,7 +326,7 @@ static int drm_vm_dma_fault(struct vm_fault *vmf) > >> * > >> * Determine the map offset from the page offset and get it from drm_sg_mem::pagelist. > >> */ > >> -static int drm_vm_sg_fault(struct vm_fault *vmf) > >> +static vm_fault_t drm_vm_sg_fault(struct vm_fault *vmf) > >> { > >> struct vm_area_struct *vma = vmf->vma; > >> struct drm_local_map *map = vma->vm_private_data; > >> -- > >> 1.9.1 > >> > > > > Daniel, if no further comment, we would like to get this patch > > in queue for 4.18. > > We would like to get this in queue for 4.18. Ok this dri1 legacy horrors, so I'm the fallback maintainer once more :-) Merged, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch