From: Tan Xiaojun <tanxiaojun@huawei.com>
To: <seanpaul@chromium.org>, <christian.koenig@amd.com>,
<airlied@linux.ie>, <michel.daenzer@amd.com>,
<alexander.deucher@amd.com>, <nicolai.haehnle@amd.com>,
<thomas.lendacky@amd.com>, <yamada.masahiro@socionext.com>,
<msrb@suse.com>, <Felix.Kuehling@amd.com>, <dave.jiang@intel.com>,
<gregkh@linuxfoundation.org>, <michael.thayer@oracle.com>,
<hdegoede@redhat.com>
Cc: <daniel.vetter@intel.com>, <jani.nikula@linux.intel.com>,
<dri-devel@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 12/12] drm/ttm: unexport ttm_bo_default_io_mem_pfn and make it static
Date: Sun, 24 Dec 2017 14:14:28 +0800 [thread overview]
Message-ID: <1514096068-80414-13-git-send-email-tanxiaojun@huawei.com> (raw)
In-Reply-To: <1514096068-80414-1-git-send-email-tanxiaojun@huawei.com>
No one will use this function except in ttm_bo_vm.c now. So unexport it
and make it static.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
drivers/gpu/drm/ttm/ttm_bo_vm.c | 23 +++++++++++++++--------
include/drm/ttm/ttm_bo_api.h | 11 -----------
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index e25a99b..ff70fc96 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -92,6 +92,21 @@ static int ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo,
return ret;
}
+/**
+ * ttm_bo_default_iomem_pfn - get a pfn for a page offset
+ *
+ * @bo: the BO we need to look up the pfn for
+ * @page_offset: offset inside the BO to look up.
+ *
+ * Calculate the PFN for iomem based mappings during page fault
+ */
+static unsigned long ttm_bo_default_io_mem_pfn(struct ttm_buffer_object *bo,
+ unsigned long page_offset)
+{
+ return ((bo->mem.bus.base + bo->mem.bus.offset) >> PAGE_SHIFT)
+ + page_offset;
+}
+
static int ttm_bo_vm_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
@@ -407,14 +422,6 @@ static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *bdev,
return bo;
}
-unsigned long ttm_bo_default_io_mem_pfn(struct ttm_buffer_object *bo,
- unsigned long page_offset)
-{
- return ((bo->mem.bus.base + bo->mem.bus.offset) >> PAGE_SHIFT)
- + page_offset;
-}
-EXPORT_SYMBOL(ttm_bo_default_io_mem_pfn);
-
int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
struct ttm_bo_device *bdev)
{
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index fa07be1..0b1ce05 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -711,17 +711,6 @@ extern int ttm_fbdev_mmap(struct vm_area_struct *vma,
struct ttm_buffer_object *bo);
/**
- * ttm_bo_default_iomem_pfn - get a pfn for a page offset
- *
- * @bo: the BO we need to look up the pfn for
- * @page_offset: offset inside the BO to look up.
- *
- * Calculate the PFN for iomem based mappings during page fault
- */
-unsigned long ttm_bo_default_io_mem_pfn(struct ttm_buffer_object *bo,
- unsigned long page_offset);
-
-/**
* ttm_bo_mmap - mmap out of the ttm device address space.
*
* @filp: filp as input from the mmap method.
--
2.7.4
prev parent reply other threads:[~2017-12-24 5:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-24 6:14 [PATCH 00/12] drm: add check if io_mem_pfn is NULL and cleanup Tan Xiaojun
2017-12-24 6:14 ` [PATCH 01/12] drm/ttm: Use ttm_bo_default_io_mem_pfn if io_mem_pfn is NULL Tan Xiaojun
2017-12-24 9:27 ` Christian König
2017-12-25 1:24 ` Tan Xiaojun
2017-12-24 6:14 ` [PATCH 02/12] drm/ast: remove the default io_mem_pfn set Tan Xiaojun
2017-12-24 6:14 ` [PATCH 03/12] drm/bochs: " Tan Xiaojun
2017-12-24 6:14 ` [PATCH 04/12] drm/cirrus: " Tan Xiaojun
2017-12-24 6:14 ` [PATCH 05/12] drm/mgag200: " Tan Xiaojun
2017-12-24 6:14 ` [PATCH 06/12] drm/nouveau: " Tan Xiaojun
2017-12-24 6:14 ` [PATCH 07/12] drm/qxl: " Tan Xiaojun
2017-12-24 6:14 ` [PATCH 08/12] drm/radeon: " Tan Xiaojun
2017-12-24 6:14 ` [PATCH 09/12] drm/virtio: " Tan Xiaojun
2017-12-24 6:14 ` [PATCH 10/12] drm/vmwgfx: " Tan Xiaojun
2017-12-24 6:14 ` [PATCH 11/12] staging: " Tan Xiaojun
2017-12-24 6:14 ` Tan Xiaojun [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=1514096068-80414-13-git-send-email-tanxiaojun@huawei.com \
--to=tanxiaojun@huawei.com \
--cc=Felix.Kuehling@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@intel.com \
--cc=dave.jiang@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.thayer@oracle.com \
--cc=michel.daenzer@amd.com \
--cc=msrb@suse.com \
--cc=nicolai.haehnle@amd.com \
--cc=seanpaul@chromium.org \
--cc=thomas.lendacky@amd.com \
--cc=yamada.masahiro@socionext.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
all inboxes | Powered by JetHome®