linux-next: build failure after merge of the drm-tegra tree

linux-next: build failure after merge of the drm-tegra tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

Hi all,

After merging the drm-tegra tree, today's linux-next build (arm64
randconfig) failed like this:

ERROR: modpost: "sync_file_create" [drivers/gpu/host1x/host1x.ko] undefined!

Caused by commit

  ad0529424def ("gpu: host1x: Add DMA fence implementation")

This build has

# CONFIG_SYNC_FILE is not set
CONFIG_TEGRA_HOST1X=m

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PATCH] gpu: host1x: Remove unused functions

[Mikko Perttunen]

Remove the host1x_fence_create_fd and host1x_fence_extract
functions that are not used anywhere. host1x_fence_create_fd
is additionally using sync_file_create without there being
a Kconfig dependency to SYNC_FILE, causing builds to fail.

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
---
 drivers/gpu/host1x/fence.c | 43 --------------------------------------
 include/linux/host1x.h     |  1 -
 2 files changed, 44 deletions(-)

diff --git a/drivers/gpu/host1x/fence.c b/drivers/gpu/host1x/fence.c
index 06c6b86237bd..5de4affcb918 100644
--- a/drivers/gpu/host1x/fence.c
+++ b/drivers/gpu/host1x/fence.c
@@ -164,46 +164,3 @@ struct dma_fence *host1x_fence_create(struct host1x_syncpt *sp, u32 threshold)
 	return &fence->base;
 }
 EXPORT_SYMBOL(host1x_fence_create);
-
-int host1x_fence_create_fd(struct host1x_syncpt *sp, u32 threshold)
-{
-	struct sync_file *file;
-	struct dma_fence *f;
-	int fd;
-
-	f = host1x_fence_create(sp, threshold);
-	if (IS_ERR(f))
-		return PTR_ERR(f);
-
-	fd = get_unused_fd_flags(O_CLOEXEC);
-	if (fd < 0) {
-		dma_fence_put(f);
-		return fd;
-	}
-
-	file = sync_file_create(f);
-	dma_fence_put(f);
-	if (!file)
-		return -ENOMEM;
-
-	fd_install(fd, file->file);
-
-	return fd;
-}
-EXPORT_SYMBOL(host1x_fence_create_fd);
-
-int host1x_fence_extract(struct dma_fence *fence, u32 *id, u32 *threshold)
-{
-	struct host1x_syncpt_fence *f;
-
-	if (fence->ops != &host1x_syncpt_fence_ops)
-		return -EINVAL;
-
-	f = container_of(fence, struct host1x_syncpt_fence, base);
-
-	*id = f->sp->id;
-	*threshold = f->threshold;
-
-	return 0;
-}
-EXPORT_SYMBOL(host1x_fence_extract);
diff --git a/include/linux/host1x.h b/include/linux/host1x.h
index 9b6784708f2e..2127762fc63d 100644
--- a/include/linux/host1x.h
+++ b/include/linux/host1x.h
@@ -171,7 +171,6 @@ void host1x_syncpt_release_vblank_reservation(struct host1x_client *client,
 					      u32 syncpt_id);
 
 struct dma_fence *host1x_fence_create(struct host1x_syncpt *sp, u32 threshold);
-int host1x_fence_extract(struct dma_fence *fence, u32 *id, u32 *threshold);
 
 /*
  * host1x channel
-- 
2.30.1