From 2109c973badf1bdec9b78a6f954628c34397a190 Mon Sep 17 00:00:00 2001 From: Piotr Zierhoffer Date: Fri, 19 Apr 2013 16:29:28 +0200 Subject: video: tegra: nvmap: export symbols to build tegra_v4l2_camera module --- drivers/video/tegra/host/Makefile | 2 ++ drivers/video/tegra/host/bus_client.c | 3 +++ drivers/video/tegra/host/nvhost_acm.c | 2 ++ drivers/video/tegra/host/nvhost_syncpt.c | 3 +++ drivers/video/tegra/nvmap/nvmap.c | 6 ++++++ drivers/video/tegra/nvmap/nvmap_dev.c | 3 +++ 6 files changed, 19 insertions(+) (limited to 'drivers/video/tegra') diff --git a/drivers/video/tegra/host/Makefile b/drivers/video/tegra/host/Makefile index 0448a4da1f9b..89a10faefaba 100644 --- a/drivers/video/tegra/host/Makefile +++ b/drivers/video/tegra/host/Makefile @@ -23,8 +23,10 @@ obj-$(CONFIG_TEGRA_GRHOST) += t30/ obj-$(CONFIG_TEGRA_GRHOST) += gr2d/ obj-$(CONFIG_TEGRA_GRHOST) += isp/ ifneq ($(CONFIG_VIDEO_TEGRA),y) +ifneq ($(CONFIG_VIDEO_TEGRA),m) obj-$(CONFIG_TEGRA_GRHOST) += vi/ endif +endif obj-$(CONFIG_TEGRA_GRHOST) += nvhost.o obj-$(CONFIG_TEGRA_GRHOST_USE_NVMAP) += nvmap.o diff --git a/drivers/video/tegra/host/bus_client.c b/drivers/video/tegra/host/bus_client.c index 4614689ec37c..2b92a62cc0bc 100644 --- a/drivers/video/tegra/host/bus_client.c +++ b/drivers/video/tegra/host/bus_client.c @@ -611,6 +611,7 @@ fail: nvhost_free_channel(ch); return err; } +EXPORT_SYMBOL(nvhost_client_device_init); int nvhost_client_device_suspend(struct nvhost_device *dev) { @@ -658,6 +659,7 @@ fail: return -ENXIO; } +EXPORT_SYMBOL(nvhost_client_device_get_resources); void nvhost_client_device_put_resources(struct nvhost_device *dev) { @@ -670,3 +672,4 @@ void nvhost_client_device_put_resources(struct nvhost_device *dev) release_mem_region(r->start, resource_size(r)); } +EXPORT_SYMBOL(nvhost_client_device_put_resources); diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c index 5bde55ad2ff5..f22c91ac03f1 100644 --- a/drivers/video/tegra/host/nvhost_acm.c +++ b/drivers/video/tegra/host/nvhost_acm.c @@ -639,8 +639,10 @@ void nvhost_module_busy_ext(struct nvhost_device *dev) { nvhost_module_busy(dev); } +EXPORT_SYMBOL(nvhost_module_busy_ext); void nvhost_module_idle_ext(struct nvhost_device *dev) { nvhost_module_idle(dev); } +EXPORT_SYMBOL(nvhost_module_idle_ext); diff --git a/drivers/video/tegra/host/nvhost_syncpt.c b/drivers/video/tegra/host/nvhost_syncpt.c index 38c28ca116e7..de3e04f65cdd 100644 --- a/drivers/video/tegra/host/nvhost_syncpt.c +++ b/drivers/video/tegra/host/nvhost_syncpt.c @@ -493,12 +493,14 @@ void nvhost_syncpt_cpu_incr_ext(struct nvhost_device *dev, u32 id) struct nvhost_syncpt *sp = &(nvhost_get_host(dev)->syncpt); nvhost_syncpt_cpu_incr(sp, id); } +EXPORT_SYMBOL(nvhost_syncpt_cpu_incr_ext); u32 nvhost_syncpt_read_ext(struct nvhost_device *dev, u32 id) { struct nvhost_syncpt *sp = &(nvhost_get_host(dev)->syncpt); return nvhost_syncpt_read(sp, id); } +EXPORT_SYMBOL(nvhost_syncpt_read_ext); int nvhost_syncpt_wait_timeout_ext(struct nvhost_device *dev, u32 id, u32 thresh, u32 timeout, u32 *value) @@ -506,3 +508,4 @@ int nvhost_syncpt_wait_timeout_ext(struct nvhost_device *dev, u32 id, u32 thresh struct nvhost_syncpt *sp = &(nvhost_get_host(dev)->syncpt); return nvhost_syncpt_wait_timeout(sp, id, thresh, timeout, value); } +EXPORT_SYMBOL(nvhost_syncpt_wait_timeout_ext); diff --git a/drivers/video/tegra/nvmap/nvmap.c b/drivers/video/tegra/nvmap/nvmap.c index 19b821d41284..e66ca982f2f3 100644 --- a/drivers/video/tegra/nvmap/nvmap.c +++ b/drivers/video/tegra/nvmap/nvmap.c @@ -387,6 +387,7 @@ phys_addr_t nvmap_pin(struct nvmap_client *client, return ret ?: phys; } +EXPORT_SYMBOL(nvmap_pin); phys_addr_t nvmap_handle_address(struct nvmap_client *c, unsigned long id) { @@ -413,6 +414,7 @@ void nvmap_unpin(struct nvmap_client *client, struct nvmap_handle_ref *ref) if (handle_unpin(client, ref->handle, false)) wake_up(&client->share->pin_wait); } +EXPORT_SYMBOL(nvmap_unpin); void nvmap_unpin_handles(struct nvmap_client *client, struct nvmap_handle **h, int nr) @@ -501,6 +503,7 @@ void *nvmap_mmap(struct nvmap_handle_ref *ref) * nvmap_handle_put will be called by unmapping this address */ return p; } +EXPORT_SYMBOL(nvmap_mmap); void nvmap_munmap(struct nvmap_handle_ref *ref, void *addr) { @@ -523,6 +526,7 @@ void nvmap_munmap(struct nvmap_handle_ref *ref, void *addr) } nvmap_handle_put(h); } +EXPORT_SYMBOL(nvmap_munmap); struct nvmap_handle_ref *nvmap_alloc(struct nvmap_client *client, size_t size, size_t align, unsigned int flags, @@ -550,6 +554,7 @@ struct nvmap_handle_ref *nvmap_alloc(struct nvmap_client *client, size_t size, return r; } +EXPORT_SYMBOL(nvmap_alloc); /* allocates memory with specifed iovm_start address. */ struct nvmap_handle_ref *nvmap_alloc_iovm(struct nvmap_client *client, @@ -605,6 +610,7 @@ void nvmap_free(struct nvmap_client *client, struct nvmap_handle_ref *r) nvmap_free_handle_id(client, nvmap_ref_to_id(r)); } +EXPORT_SYMBOL(nvmap_free); int nvmap_mark_global(struct nvmap_client *client, struct nvmap_handle_ref *r) { diff --git a/drivers/video/tegra/nvmap/nvmap_dev.c b/drivers/video/tegra/nvmap/nvmap_dev.c index 0c12348db88e..6a3330562b7b 100644 --- a/drivers/video/tegra/nvmap/nvmap_dev.c +++ b/drivers/video/tegra/nvmap/nvmap_dev.c @@ -87,6 +87,7 @@ struct nvmap_device { }; struct nvmap_device *nvmap_dev; +EXPORT_SYMBOL(nvmap_dev); static struct backing_dev_info nvmap_bdi = { .ra_pages = 0, @@ -662,6 +663,7 @@ struct nvmap_client *nvmap_create_client(struct nvmap_device *dev, spin_unlock(&dev->clients_lock); return client; } +EXPORT_SYMBOL(nvmap_create_client); static void destroy_client(struct nvmap_client *client) { @@ -748,6 +750,7 @@ void nvmap_client_put(struct nvmap_client *client) if (!atomic_dec_return(&client->count)) destroy_client(client); } +EXPORT_SYMBOL(nvmap_client_put); static int nvmap_open(struct inode *inode, struct file *filp) { -- cgit v1.2.3