geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exynos: replace G2D_DOUBLE_TO_FIXED macro with function 

This also avoids the floating point conversion steps and just
uses pure integer arithmetic.
Since the G2D hardware scaling approach is a bit unintuitive,
document it in the function as well.

v2: Explicitly mention the normalization constant.
v3: Use common commenting style as pointed out by
    Emil Velikov <emil.l.velikov@gmail.com>.

Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Joonyoung Shim <jy0922.shim@samsung.com>
main
Tobias Jakobi 2015-02-24 15:20:40 +01:00 committed by Emil Velikov
parent 0ca03a4087
commit 1d7e78d787
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
exynos/exynos_fimg2d.c
View File

@ -41,6 +41,18 @@
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
static unsigned int g2d_get_scaling(unsigned int src, unsigned int dst)
{
/*
* The G2D hw scaling factor is a normalized inverse of the scaling factor.
* For example: When source width is 100 and destination width is 200
* (scaling of 2x), then the hw factor is NC * 100 / 200.
* The normalization factor (NC) is 2^16 = 0x10000.
*/
return ((src << 16) / dst);
}
static unsigned int g2d_get_blend_op(enum e_g2d_op op) static unsigned int g2d_get_blend_op(enum e_g2d_op op)
{ {
union g2d_blend_func_val val; union g2d_blend_func_val val;
@ -428,7 +440,7 @@ g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src,
union g2d_rop4_val rop4; union g2d_rop4_val rop4;
union g2d_point_val pt; union g2d_point_val pt;
unsigned int scale; unsigned int scale;
double scale_x = 0.0f, scale_y = 0.0f; unsigned int scale_x, scale_y;
g2d_add_cmd(ctx, DST_SELECT_REG, G2D_SELECT_MODE_BGCOLOR); g2d_add_cmd(ctx, DST_SELECT_REG, G2D_SELECT_MODE_BGCOLOR);
g2d_add_cmd(ctx, DST_COLOR_MODE_REG, dst->color_mode); g2d_add_cmd(ctx, DST_COLOR_MODE_REG, dst->color_mode);
@ -454,8 +466,8 @@ g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src,
scale = 0; scale = 0;
else { else {
scale = 1; scale = 1;
scale_x = (double)src_w / (double)dst_w; scale_x = g2d_get_scaling(src_w, dst_w);
scale_y = (double)src_h / (double)dst_h; scale_y = g2d_get_scaling(src_h, dst_h);
} }
if (src_x + src_w > src->width) if (src_x + src_w > src->width)
@ -487,8 +499,8 @@ g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src,
if (scale) { if (scale) {
g2d_add_cmd(ctx, SRC_SCALE_CTRL_REG, G2D_SCALE_MODE_BILINEAR); g2d_add_cmd(ctx, SRC_SCALE_CTRL_REG, G2D_SCALE_MODE_BILINEAR);
g2d_add_cmd(ctx, SRC_XSCALE_REG, G2D_DOUBLE_TO_FIXED(scale_x)); g2d_add_cmd(ctx, SRC_XSCALE_REG, scale_x);
g2d_add_cmd(ctx, SRC_YSCALE_REG, G2D_DOUBLE_TO_FIXED(scale_y)); g2d_add_cmd(ctx, SRC_YSCALE_REG, scale_y);
} }
pt.val = 0; pt.val = 0;

2
exynos/fimg2d.h
View File

@ -25,8 +25,6 @@
#define G2D_MAX_CMD_LIST_NR 64 #define G2D_MAX_CMD_LIST_NR 64
#define G2D_PLANE_MAX_NR 2 #define G2D_PLANE_MAX_NR 2
#define G2D_DOUBLE_TO_FIXED(d) ((unsigned int)((d) * 65536.0))
enum e_g2d_color_mode { enum e_g2d_color_mode {
/* COLOR FORMAT */ /* COLOR FORMAT */
G2D_COLOR_FMT_XRGB8888, G2D_COLOR_FMT_XRGB8888,