From: Erik Gilling <konkers@android.com>
Date: Fri, 13 Aug 2010 00:28:12 +0000 (-0700)
Subject: video: tegra: unpin nvmap handles after flip
X-Git-Tag: firefly_0821_release~9834^2~705
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c9d9f5e92bf4d428cd0b6ebe9450d6225d9a032b;p=firefly-linux-kernel-4.4.55.git

video: tegra: unpin nvmap handles after flip

Signed-off-by: Erik Gilling <konkers@android.com>
---

diff --git a/arch/arm/mach-tegra/include/mach/dc.h b/arch/arm/mach-tegra/include/mach/dc.h
index ae0273ca057d..189f26896c81 100644
--- a/arch/arm/mach-tegra/include/mach/dc.h
+++ b/arch/arm/mach-tegra/include/mach/dc.h
@@ -98,6 +98,8 @@ struct tegra_dc_win {
 
 	int			dirty;
 	struct tegra_dc		*dc;
+
+	unsigned long		cur_handle;
 };
 
 #define TEGRA_WIN_FLAG_ENABLED		(1 << 0)
diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c
index 45d47e6c991a..87bae6fb1f69 100644
--- a/drivers/video/tegra/fb.c
+++ b/drivers/video/tegra/fb.c
@@ -212,6 +212,10 @@ static int tegra_fb_pan_display(struct fb_var_screeninfo *var,
 	tegra_dc_update_windows(&tegra_fb->win, 1);
 	tegra_dc_sync_windows(&tegra_fb->win, 1);
 
+	if (tegra_fb->win->cur_handle)
+		nvmap_unpin((struct nvmap_handle **) &tegra_fb->win->cur_handle, 1);
+	tegra_fb->win->cur_handle = args->buff_id;
+
 	return 0;
 }