@@ -184,7 +184,7 @@ static void g2d_reset(struct g2d_context *ctx)
static int g2d_flush(struct g2d_context *ctx)
{
int ret;
- struct drm_exynos_g2d_set_cmdlist cmdlist;
+ struct drm_exynos_g2d_set_cmdlist cmdlist = {0};
if (ctx->cmd_nr == 0 && ctx->cmd_buf_nr == 0)
return FALSE;
@@ -194,8 +194,6 @@ static int g2d_flush(struct g2d_context *ctx)
return -EINVAL;
}
- memset(&cmdlist, 0, sizeof(struct drm_exynos_g2d_set_cmdlist));
-
cmdlist.cmd = (uint64_t)(uintptr_t)&ctx->cmd[0];
cmdlist.cmd_buf = (uint64_t)(uintptr_t)&ctx->cmd_buf[0];
cmdlist.cmd_nr = ctx->cmd_nr;
@@ -253,7 +253,7 @@ static void exynos_destroy_buffer(struct exynos_bo *bo)
static int g2d_solid_fill_test(struct exynos_device *dev, struct exynos_bo *dst)
{
struct g2d_context *ctx;
- struct g2d_image img;
+ struct g2d_image img = {0};
unsigned int count, img_w, img_h;
int ret = 0;
@@ -261,7 +261,6 @@ static int g2d_solid_fill_test(struct exynos_device *dev, struct exynos_bo *dst)
if (!ctx)
return -EFAULT;
- memset(&img, 0, sizeof(struct g2d_image));
img.bo[0] = dst->handle;
printf("solid fill test.\n");
@@ -304,7 +303,7 @@ static int g2d_copy_test(struct exynos_device *dev, struct exynos_bo *src,
enum e_g2d_buf_type type)
{
struct g2d_context *ctx;
- struct g2d_image src_img, dst_img;
+ struct g2d_image src_img = {0}, dst_img = {0};
unsigned int count;
unsigned int src_x, src_y, dst_x, dst_y, img_w, img_h;
unsigned long userptr, size;
@@ -314,8 +313,6 @@ static int g2d_copy_test(struct exynos_device *dev, struct exynos_bo *src,
if (!ctx)
return -EFAULT;
- memset(&src_img, 0, sizeof(struct g2d_image));
- memset(&dst_img, 0, sizeof(struct g2d_image));
dst_img.bo[0] = dst->handle;
src_x = 0;
@@ -388,7 +385,7 @@ static int g2d_copy_with_scale_test(struct exynos_device *dev,
enum e_g2d_buf_type type)
{
struct g2d_context *ctx;
- struct g2d_image src_img, dst_img;
+ struct g2d_image src_img = {0}, dst_img = {0};
unsigned int count;
unsigned int src_x, src_y, dst_x, dst_y, img_w, img_h;
unsigned long userptr, size;
@@ -398,8 +395,6 @@ static int g2d_copy_with_scale_test(struct exynos_device *dev,
if (!ctx)
return -EFAULT;
- memset(&src_img, 0, sizeof(struct g2d_image));
- memset(&dst_img, 0, sizeof(struct g2d_image));
dst_img.bo[0] = dst->handle;
src_x = 0;
@@ -477,7 +472,7 @@ static int g2d_blend_test(struct exynos_device *dev,
enum e_g2d_buf_type type)
{
struct g2d_context *ctx;
- struct g2d_image src_img, dst_img;
+ struct g2d_image src_img = {0}, dst_img = {0};
unsigned int count;
unsigned int src_x, src_y, dst_x, dst_y, img_w, img_h;
unsigned long userptr, size;
@@ -487,8 +482,6 @@ static int g2d_blend_test(struct exynos_device *dev,
if (!ctx)
return -EFAULT;
- memset(&src_img, 0, sizeof(struct g2d_image));
- memset(&dst_img, 0, sizeof(struct g2d_image));
dst_img.bo[0] = dst->handle;
src_x = 0;
Keeps the code cleaner, since the structs have to be initialized once anyway. Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> --- exynos/exynos_fimg2d.c | 4 +--- tests/exynos/exynos_fimg2d_test.c | 15 ++++----------- 2 files changed, 5 insertions(+), 14 deletions(-)