[v2,08/13] exynos: fimg2d: add g2d_set_direction
diff mbox

Message ID 1448218123-21292-9-git-send-email-tjakobi@math.uni-bielefeld.de
State New
Headers show

Commit Message

Tobias Jakobi Nov. 22, 2015, 6:48 p.m. UTC
This allows setting the two direction registers, which specify how
the engine blits pixels. This can be used for overlapping blits,
which happen e.g. when 'moving' a rectangular region inside a
fixed buffer.

Reviewed-by: Hyungwon Hwang <human.hwang@samsung.com>
Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
---
 exynos/exynos_fimg2d.c | 13 +++++++++++++
 exynos/exynos_fimg2d.h | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

Comments

Emil Velikov Nov. 26, 2015, 4:22 p.m. UTC | #1
On 22 November 2015 at 18:48, Tobias Jakobi
<tjakobi@math.uni-bielefeld.de> wrote:
> This allows setting the two direction registers, which specify how
> the engine blits pixels. This can be used for overlapping blits,
> which happen e.g. when 'moving' a rectangular region inside a
> fixed buffer.
>
> Reviewed-by: Hyungwon Hwang <human.hwang@samsung.com>
> Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
> ---
>  exynos/exynos_fimg2d.c | 13 +++++++++++++
>  exynos/exynos_fimg2d.h | 38 ++++++++++++++++++++++++++++++++++++++
>  2 files changed, 51 insertions(+)
>
> diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
> index e997d4b..4d5419c 100644
> --- a/exynos/exynos_fimg2d.c
> +++ b/exynos/exynos_fimg2d.c
> @@ -242,6 +242,19 @@ static void g2d_add_base_addr(struct g2d_context *ctx, struct g2d_image *img,
>  }
>
>  /*
> + * g2d_set_direction - setup direction register (useful for overlapping blits).
> + *
> + * @ctx: a pointer to g2d_context structure.
> + * @dir: a pointer to the g2d_direction_val structure.
> + */
> +static void g2d_set_direction(struct g2d_context *ctx,
> +                       const union g2d_direction_val *dir)
> +{
> +       g2d_add_cmd(ctx, SRC_MASK_DIRECT_REG, dir->val[0]);
> +       g2d_add_cmd(ctx, DST_PAT_DIRECT_REG, dir->val[1]);
> +}
> +
> +/*
>   * g2d_reset - reset fimg2d hardware.
>   *
>   * @ctx: a pointer to g2d_context structure.
> diff --git a/exynos/exynos_fimg2d.h b/exynos/exynos_fimg2d.h
> index c6b58ac..9eee7c0 100644
> --- a/exynos/exynos_fimg2d.h
> +++ b/exynos/exynos_fimg2d.h
> @@ -189,6 +189,11 @@ enum e_g2d_exec_flag {
>         G2D_EXEC_FLAG_ASYNC = (1 << 0)
>  };
>
> +enum e_g2d_dir_mode {
> +       G2D_DIR_MODE_POSITIVE = 0,
> +       G2D_DIR_MODE_NEGATIVE = 1
> +};
> +
>  union g2d_point_val {
>         unsigned int val;
>         struct {
> @@ -269,6 +274,39 @@ union g2d_blend_func_val {
>         } data;
>  };
>
> +union g2d_direction_val {
> +       unsigned int val[2];
> +       struct {
> +               /* SRC_MSK_DIRECT_REG [0:1] (source) */
> +               enum e_g2d_dir_mode             src_x_direction:1;
> +               enum e_g2d_dir_mode             src_y_direction:1;
> +
> +               /* SRC_MSK_DIRECT_REG [2:3] */
> +               unsigned int                    reversed1:2;
> +
> +               /* SRC_MSK_DIRECT_REG [4:5] (mask) */
> +               enum e_g2d_dir_mode             mask_x_direction:1;
> +               enum e_g2d_dir_mode             mask_y_direction:1;
> +
> +               /* SRC_MSK_DIRECT_REG [6:31] */
> +               unsigned int                    padding1:26;
> +
> +               /* DST_PAT_DIRECT_REG [0:1] (destination) */
> +               enum e_g2d_dir_mode             dst_x_direction:1;
> +               enum e_g2d_dir_mode             dst_y_direction:1;
> +
> +               /* DST_PAT_DIRECT_REG [2:3] */
> +               unsigned int                    reversed2:2;
> +
> +               /* DST_PAT_DIRECT_REG [4:5] (pattern) */
> +               enum e_g2d_dir_mode             pat_x_direction:1;
> +               enum e_g2d_dir_mode             pat_y_direction:1;
> +
> +               /* DST_PAT_DIRECT_REG [6:31] */
> +               unsigned int                    padding2:26;
> +       } data;
> +};
> +
You don't really want all this in the public header. At the moment
you're using it only internally so might as well not make it part of
the API.

Thanks
Emil
Tobias Jakobi Nov. 26, 2015, 4:41 p.m. UTC | #2
Hello Emil,

my main system which I also used for development was stolen on Tuesday,
so I won't be working on this series anytime soon. If anyone wants to
pick it up, please go ahead.

- Tobias


Emil Velikov wrote:
> On 22 November 2015 at 18:48, Tobias Jakobi
> <tjakobi@math.uni-bielefeld.de> wrote:
>> This allows setting the two direction registers, which specify how
>> the engine blits pixels. This can be used for overlapping blits,
>> which happen e.g. when 'moving' a rectangular region inside a
>> fixed buffer.
>>
>> Reviewed-by: Hyungwon Hwang <human.hwang@samsung.com>
>> Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
>> ---
>>  exynos/exynos_fimg2d.c | 13 +++++++++++++
>>  exynos/exynos_fimg2d.h | 38 ++++++++++++++++++++++++++++++++++++++
>>  2 files changed, 51 insertions(+)
>>
>> diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
>> index e997d4b..4d5419c 100644
>> --- a/exynos/exynos_fimg2d.c
>> +++ b/exynos/exynos_fimg2d.c
>> @@ -242,6 +242,19 @@ static void g2d_add_base_addr(struct g2d_context *ctx, struct g2d_image *img,
>>  }
>>
>>  /*
>> + * g2d_set_direction - setup direction register (useful for overlapping blits).
>> + *
>> + * @ctx: a pointer to g2d_context structure.
>> + * @dir: a pointer to the g2d_direction_val structure.
>> + */
>> +static void g2d_set_direction(struct g2d_context *ctx,
>> +                       const union g2d_direction_val *dir)
>> +{
>> +       g2d_add_cmd(ctx, SRC_MASK_DIRECT_REG, dir->val[0]);
>> +       g2d_add_cmd(ctx, DST_PAT_DIRECT_REG, dir->val[1]);
>> +}
>> +
>> +/*
>>   * g2d_reset - reset fimg2d hardware.
>>   *
>>   * @ctx: a pointer to g2d_context structure.
>> diff --git a/exynos/exynos_fimg2d.h b/exynos/exynos_fimg2d.h
>> index c6b58ac..9eee7c0 100644
>> --- a/exynos/exynos_fimg2d.h
>> +++ b/exynos/exynos_fimg2d.h
>> @@ -189,6 +189,11 @@ enum e_g2d_exec_flag {
>>         G2D_EXEC_FLAG_ASYNC = (1 << 0)
>>  };
>>
>> +enum e_g2d_dir_mode {
>> +       G2D_DIR_MODE_POSITIVE = 0,
>> +       G2D_DIR_MODE_NEGATIVE = 1
>> +};
>> +
>>  union g2d_point_val {
>>         unsigned int val;
>>         struct {
>> @@ -269,6 +274,39 @@ union g2d_blend_func_val {
>>         } data;
>>  };
>>
>> +union g2d_direction_val {
>> +       unsigned int val[2];
>> +       struct {
>> +               /* SRC_MSK_DIRECT_REG [0:1] (source) */
>> +               enum e_g2d_dir_mode             src_x_direction:1;
>> +               enum e_g2d_dir_mode             src_y_direction:1;
>> +
>> +               /* SRC_MSK_DIRECT_REG [2:3] */
>> +               unsigned int                    reversed1:2;
>> +
>> +               /* SRC_MSK_DIRECT_REG [4:5] (mask) */
>> +               enum e_g2d_dir_mode             mask_x_direction:1;
>> +               enum e_g2d_dir_mode             mask_y_direction:1;
>> +
>> +               /* SRC_MSK_DIRECT_REG [6:31] */
>> +               unsigned int                    padding1:26;
>> +
>> +               /* DST_PAT_DIRECT_REG [0:1] (destination) */
>> +               enum e_g2d_dir_mode             dst_x_direction:1;
>> +               enum e_g2d_dir_mode             dst_y_direction:1;
>> +
>> +               /* DST_PAT_DIRECT_REG [2:3] */
>> +               unsigned int                    reversed2:2;
>> +
>> +               /* DST_PAT_DIRECT_REG [4:5] (pattern) */
>> +               enum e_g2d_dir_mode             pat_x_direction:1;
>> +               enum e_g2d_dir_mode             pat_y_direction:1;
>> +
>> +               /* DST_PAT_DIRECT_REG [6:31] */
>> +               unsigned int                    padding2:26;
>> +       } data;
>> +};
>> +
> You don't really want all this in the public header. At the moment
> you're using it only internally so might as well not make it part of
> the API.
>
> Thanks
> Emil
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Emil Velikov Nov. 26, 2015, 4:48 p.m. UTC | #3
On 26 November 2015 at 16:41, Tobias Jakobi <liquid.acid@gmx.net> wrote:
> Hello Emil,
>
> my main system which I also used for development was stolen on Tuesday,
> so I won't be working on this series anytime soon. If anyone wants to
> pick it up, please go ahead.
>
Sad to hear that x2. You've been doing some good work, despite that we
weren't always quick to review/pick it. Hope you had some insurance
and you manage to sort things out, relatively stress free.

Inki, Hyungwon, other Exynos devs,

Will you guys be able to pick any of this work ? Most of it can go in
with the small suggestion in this patch addressed.

Thanks
Emil
Hyungwon Hwang Nov. 27, 2015, 2:03 a.m. UTC | #4
Dear all,

Yes. I can pick it on behalf of Tobias, if there is no one who can do
that.

BRs,
Hyungwon Hwang

On Thu, 26 Nov 2015 16:48:10 +0000
Emil Velikov <emil.l.velikov@gmail.com> wrote:

> On 26 November 2015 at 16:41, Tobias Jakobi <liquid.acid@gmx.net>
> wrote:
> > Hello Emil,
> >
> > my main system which I also used for development was stolen on
> > Tuesday, so I won't be working on this series anytime soon. If
> > anyone wants to pick it up, please go ahead.
> >
> Sad to hear that x2. You've been doing some good work, despite that we
> weren't always quick to review/pick it. Hope you had some insurance
> and you manage to sort things out, relatively stress free.
> 
> Inki, Hyungwon, other Exynos devs,
> 
> Will you guys be able to pick any of this work ? Most of it can go in
> with the small suggestion in this patch addressed.
> 
> Thanks
> Emil
>

Patch
diff mbox

diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
index e997d4b..4d5419c 100644
--- a/exynos/exynos_fimg2d.c
+++ b/exynos/exynos_fimg2d.c
@@ -242,6 +242,19 @@  static void g2d_add_base_addr(struct g2d_context *ctx, struct g2d_image *img,
 }
 
 /*
+ * g2d_set_direction - setup direction register (useful for overlapping blits).
+ *
+ * @ctx: a pointer to g2d_context structure.
+ * @dir: a pointer to the g2d_direction_val structure.
+ */
+static void g2d_set_direction(struct g2d_context *ctx,
+			const union g2d_direction_val *dir)
+{
+	g2d_add_cmd(ctx, SRC_MASK_DIRECT_REG, dir->val[0]);
+	g2d_add_cmd(ctx, DST_PAT_DIRECT_REG, dir->val[1]);
+}
+
+/*
  * g2d_reset - reset fimg2d hardware.
  *
  * @ctx: a pointer to g2d_context structure.
diff --git a/exynos/exynos_fimg2d.h b/exynos/exynos_fimg2d.h
index c6b58ac..9eee7c0 100644
--- a/exynos/exynos_fimg2d.h
+++ b/exynos/exynos_fimg2d.h
@@ -189,6 +189,11 @@  enum e_g2d_exec_flag {
 	G2D_EXEC_FLAG_ASYNC = (1 << 0)
 };
 
+enum e_g2d_dir_mode {
+	G2D_DIR_MODE_POSITIVE = 0,
+	G2D_DIR_MODE_NEGATIVE = 1
+};
+
 union g2d_point_val {
 	unsigned int val;
 	struct {
@@ -269,6 +274,39 @@  union g2d_blend_func_val {
 	} data;
 };
 
+union g2d_direction_val {
+	unsigned int val[2];
+	struct {
+		/* SRC_MSK_DIRECT_REG [0:1] (source) */
+		enum e_g2d_dir_mode		src_x_direction:1;
+		enum e_g2d_dir_mode		src_y_direction:1;
+
+		/* SRC_MSK_DIRECT_REG [2:3] */
+		unsigned int			reversed1:2;
+
+		/* SRC_MSK_DIRECT_REG [4:5] (mask) */
+		enum e_g2d_dir_mode		mask_x_direction:1;
+		enum e_g2d_dir_mode		mask_y_direction:1;
+
+		/* SRC_MSK_DIRECT_REG [6:31] */
+		unsigned int			padding1:26;
+
+		/* DST_PAT_DIRECT_REG [0:1] (destination) */
+		enum e_g2d_dir_mode		dst_x_direction:1;
+		enum e_g2d_dir_mode		dst_y_direction:1;
+
+		/* DST_PAT_DIRECT_REG [2:3] */
+		unsigned int			reversed2:2;
+
+		/* DST_PAT_DIRECT_REG [4:5] (pattern) */
+		enum e_g2d_dir_mode		pat_x_direction:1;
+		enum e_g2d_dir_mode		pat_y_direction:1;
+
+		/* DST_PAT_DIRECT_REG [6:31] */
+		unsigned int			padding2:26;
+	} data;
+};
+
 struct g2d_image {
 	enum e_g2d_select_mode		select_mode;
 	enum e_g2d_color_mode		color_mode;