From d2327f354da78f95a72c782f2df67b500d94920b Mon Sep 17 00:00:00 2001
From: Dongjin Kim <tobetter@gmail.com>
Date: Wed, 27 Feb 2019 13:36:05 +0900
Subject: [PATCH] Revert "Revert "canvas: get canvas w/h for frame check
 [2/2]""

This reverts commit f9e4d0b2e660740bb47ac8c9b809d9ff1a544542.

Change-Id: I9652945625684ca880215858621651c324b8ef63
(cherry picked from commit dd2a580802222ced106aae8e5351c0de945d5da2)
---
 drivers/amlogic/media/common/canvas/canvas.c | 21 ++++++++++++++++++++
 include/linux/amlogic/media/canvas/canvas.h  |  4 ++++
 2 files changed, 25 insertions(+)

diff --git a/drivers/amlogic/media/common/canvas/canvas.c b/drivers/amlogic/media/common/canvas/canvas.c
index 8e4b1f19a1fd..45caef23dde0 100644
--- a/drivers/amlogic/media/common/canvas/canvas.c
+++ b/drivers/amlogic/media/common/canvas/canvas.c
@@ -334,6 +334,27 @@ unsigned int canvas_get_addr(u32 index)
 }
 EXPORT_SYMBOL(canvas_get_addr);
 
+unsigned int canvas_get_width(u32 index)
+{
+	struct canvas_device_info *info = &canvas_info;
+
+	if (!CANVAS_VALID(index))
+		return 0;
+
+	return info->canvasPool[index].width;
+}
+EXPORT_SYMBOL(canvas_get_width);
+
+unsigned int canvas_get_height(u32 index)
+{
+	struct canvas_device_info *info = &canvas_info;
+
+	if (!CANVAS_VALID(index))
+		return 0;
+
+	return info->canvasPool[index].height;
+}
+EXPORT_SYMBOL(canvas_get_height);
 /*********************************************************/
 #define to_canvas(kobj) container_of(kobj, struct canvas_s, kobj)
 static ssize_t addr_show(struct canvas_s *canvas, char *buf)
diff --git a/include/linux/amlogic/media/canvas/canvas.h b/include/linux/amlogic/media/canvas/canvas.h
index b5ad4714a57b..98de6f315a8f 100644
--- a/include/linux/amlogic/media/canvas/canvas.h
+++ b/include/linux/amlogic/media/canvas/canvas.h
@@ -86,4 +86,8 @@ extern void canvas_update_addr(u32 index, u32 addr);
 
 extern unsigned int canvas_get_addr(u32 index);
 
+extern unsigned int canvas_get_width(u32 index);
+
+extern unsigned int canvas_get_height(u32 index);
+
 #endif /* CANVAS_H */