summaryrefslogtreecommitdiff
path: root/exynos
diff options
context:
space:
mode:
authorTobias Jakobi <tjakobi@math.uni-bielefeld.de>2015-09-08 17:22:34 +0200
committerEmil Velikov <emil.l.velikov@gmail.com>2015-09-21 17:43:14 +0100
commitdf21b293e9cf550ec8d6a3e49461350dbdf14260 (patch)
treedea79a95892fe72c6350be75a11027446a44f8ef /exynos
parentce4a4f6e21d4112f0b88c973283b586e1fccddd9 (diff)
exynos/fimg2d: remove g2d_context from public header
All functions from the public API only operation on struct g2d_context*, so this shouldn't break too much. Make the context private since we don't want the user to modify its content directly. Also remove the defines that were only used for fields of g2d_context. Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
Diffstat (limited to 'exynos')
-rw-r--r--exynos/exynos_fimg2d.c15
-rw-r--r--exynos/exynos_fimg2d.h14
2 files changed, 16 insertions, 13 deletions
diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
index 9746c213078e..e7341449a884 100644
--- a/exynos/exynos_fimg2d.c
+++ b/exynos/exynos_fimg2d.c
@@ -44,6 +44,21 @@
#define MSG_PREFIX "exynos/fimg2d: "
+#define G2D_MAX_CMD_NR 64
+#define G2D_MAX_GEM_CMD_NR 64
+#define G2D_MAX_CMD_LIST_NR 64
+
+struct g2d_context {
+ int fd;
+ unsigned int major;
+ unsigned int minor;
+ struct drm_exynos_g2d_cmd cmd[G2D_MAX_CMD_NR];
+ struct drm_exynos_g2d_cmd cmd_buf[G2D_MAX_GEM_CMD_NR];
+ unsigned int cmd_nr;
+ unsigned int cmd_buf_nr;
+ unsigned int cmdlist_nr;
+};
+
enum g2d_base_addr_reg {
g2d_dst = 0,
g2d_src
diff --git a/exynos/exynos_fimg2d.h b/exynos/exynos_fimg2d.h
index 9db0c88b122f..4aa156830ec4 100644
--- a/exynos/exynos_fimg2d.h
+++ b/exynos/exynos_fimg2d.h
@@ -13,9 +13,6 @@
#ifndef _FIMG2D_H_
#define _FIMG2D_H_
-#define G2D_MAX_CMD_NR 64
-#define G2D_MAX_GEM_CMD_NR 64
-#define G2D_MAX_CMD_LIST_NR 64
#define G2D_PLANE_MAX_NR 2
enum e_g2d_color_mode {
@@ -289,16 +286,7 @@ struct g2d_image {
void *mapped_ptr[G2D_PLANE_MAX_NR];
};
-struct g2d_context {
- int fd;
- unsigned int major;
- unsigned int minor;
- struct drm_exynos_g2d_cmd cmd[G2D_MAX_CMD_NR];
- struct drm_exynos_g2d_cmd cmd_buf[G2D_MAX_GEM_CMD_NR];
- unsigned int cmd_nr;
- unsigned int cmd_buf_nr;
- unsigned int cmdlist_nr;
-};
+struct g2d_context;
struct g2d_context *g2d_init(int fd);
void g2d_fini(struct g2d_context *ctx);