From: Sean Paul <seanpaul@chromium.org>
To: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: linux-kernel@vger.kernel.org,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
Jani Nikula <jani.nikula@linux.intel.com>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v2] drm: remove unnecessary fault wrappers
Date: Tue, 31 Jan 2017 09:43:37 -0500 [thread overview]
Message-ID: <20170131144337.GV20076@art_vandelay> (raw)
In-Reply-To: <1485814179-28308-1-git-send-email-ross.zwisler@linux.intel.com>
On Mon, Jan 30, 2017 at 03:09:39PM -0700, Ross Zwisler wrote:
> The fault wrappers drm_vm_fault(), drm_vm_shm_fault(), drm_vm_dma_fault()
> and drm_vm_sg_fault() used to provide extra logic beyond what was in the
> "drm_do_*" versions of these functions, but as of this commit:
>
> commit ca0b07d9a969 ("drm: convert drm from nopage to fault.")
>
> They are just unnecessary wrappers that do nothing. Remove them, and
> rename the the drm_do_* fault handlers to remove the "do_" since they no
> longer have corresponding wrappers.
>
Thanks for humoring my nit :-)
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
> ---
>
> This patch applies cleanly to mmots/master, which is currently at
> v4.10-rc5-mmots-2017-01-26-15-49.
>
> ---
> drivers/gpu/drm/drm_vm.c | 30 +++++-------------------------
> 1 file changed, 5 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
> index 0cd993a..039a1e0 100644
> --- a/drivers/gpu/drm/drm_vm.c
> +++ b/drivers/gpu/drm/drm_vm.c
> @@ -95,7 +95,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_do_vm_fault(struct vm_fault *vmf)
> +static int drm_vm_fault(struct vm_fault *vmf)
> {
> struct vm_area_struct *vma = vmf->vma;
> struct drm_file *priv = vma->vm_file->private_data;
> @@ -168,7 +168,7 @@ static int drm_do_vm_fault(struct vm_fault *vmf)
> return VM_FAULT_SIGBUS; /* Disallow mremap */
> }
> #else
> -static int drm_do_vm_fault(struct vm_fault *vmf)
> +static int drm_vm_fault(struct vm_fault *vmf)
> {
> return VM_FAULT_SIGBUS;
> }
> @@ -183,7 +183,7 @@ static int drm_do_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_do_vm_shm_fault(struct vm_fault *vmf)
> +static int drm_vm_shm_fault(struct vm_fault *vmf)
> {
> struct vm_area_struct *vma = vmf->vma;
> struct drm_local_map *map = vma->vm_private_data;
> @@ -285,7 +285,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_do_vm_dma_fault(struct vm_fault *vmf)
> +static int drm_vm_dma_fault(struct vm_fault *vmf)
> {
> struct vm_area_struct *vma = vmf->vma;
> struct drm_file *priv = vma->vm_file->private_data;
> @@ -320,7 +320,7 @@ static int drm_do_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_do_vm_sg_fault(struct vm_fault *vmf)
> +static int drm_vm_sg_fault(struct vm_fault *vmf)
> {
> struct vm_area_struct *vma = vmf->vma;
> struct drm_local_map *map = vma->vm_private_data;
> @@ -347,26 +347,6 @@ static int drm_do_vm_sg_fault(struct vm_fault *vmf)
> return 0;
> }
>
> -static int drm_vm_fault(struct vm_fault *vmf)
> -{
> - return drm_do_vm_fault(vmf);
> -}
> -
> -static int drm_vm_shm_fault(struct vm_fault *vmf)
> -{
> - return drm_do_vm_shm_fault(vmf);
> -}
> -
> -static int drm_vm_dma_fault(struct vm_fault *vmf)
> -{
> - return drm_do_vm_dma_fault(vmf);
> -}
> -
> -static int drm_vm_sg_fault(struct vm_fault *vmf)
> -{
> - return drm_do_vm_sg_fault(vmf);
> -}
> -
> /** AGP virtual memory operations */
> static const struct vm_operations_struct drm_vm_ops = {
> .fault = drm_vm_fault,
> --
> 2.7.4
--
Sean Paul, Software Engineer, Google / Chromium OS
prev parent reply other threads:[~2017-01-31 14:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 19:20 [PATCH] drm: remove unnecessary fault wrappers Ross Zwisler
2017-01-30 20:30 ` Sean Paul
2017-01-30 22:09 ` [PATCH v2] " Ross Zwisler
2017-01-30 22:14 ` Ross Zwisler
2017-01-31 8:40 ` Daniel Vetter
2017-01-31 14:43 ` Sean Paul [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170131144337.GV20076@art_vandelay \
--to=seanpaul@chromium.org \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ross.zwisler@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).