From: Rebecca Schultz Zavin Date: Tue, 19 Oct 2010 22:57:40 +0000 (-0700) Subject: video: tegra: nvmap: Remove warning from nvmap_pin X-Git-Tag: firefly_0821_release~9833^2~147^2~9 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=424e17f5a2312184ae5c41e6fbbd674a82073b2d;p=firefly-linux-kernel-4.4.55.git video: tegra: nvmap: Remove warning from nvmap_pin The framebuffer driver needs to be able to arbitrarily pin whatever gets handed to it. Regardless of the interface used, functions need to unpin as soon as they finish using the gart anyway. Change-Id: Ida8aea2fb6eaca8bcbf3ae72f8dfa849dc198542 Signed-off-by: Rebecca Schultz Zavin --- diff --git a/drivers/video/tegra/nvmap/nvmap.c b/drivers/video/tegra/nvmap/nvmap.c index 865681f2e221..3cf3935e53fb 100644 --- a/drivers/video/tegra/nvmap/nvmap.c +++ b/drivers/video/tegra/nvmap/nvmap.c @@ -543,14 +543,6 @@ unsigned long nvmap_pin(struct nvmap_client *client, atomic_inc(&ref->pin); -#ifdef CONFIG_NVMAP_RECLAIM_UNPINNED_VM - /* if IOVMM reclaiming is enabled, IOVMM-backed allocations should - * only be pinned through the nvmap_pin_array mechanism, since that - * interface guarantees that handles are unpinned when the pinning - * command buffers have completed. */ - WARN_ON(h->heap_pgalloc && !h->pgalloc.contig); -#endif - if (WARN_ON(mutex_lock_interruptible(&client->share->pin_lock))) { ret = -EINTR; } else {