[6/9] tests/exynos: remove struct fimg2d_test_case

Commit Message

Tobias Jakobi June 10, 2015, 1:42 p.m. UTC

It doesn't make sense to keep this structure, since we
can just call all tests directly.

Signed-off-by: Tobias Jakobi <[e-mail]>
---
 tests/exynos/exynos_fimg2d_test.c | 42 +++++----------------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

Comments

Emil Velikov June 12, 2015, 4:06 p.m. UTC | #1

On 10 June 2015 at 14:42, Tobias Jakobi <[e-mail]> wrote:
> It doesn't make sense to keep this structure, since we
> can just call all tests directly.
>
Seems like it was designed in mind of having another test case.
Perhaps the exynos guys cannot really upstream it (licensing or other
issues) ?

-Emil

Tobias Jakobi June 12, 2015, 4:25 p.m. UTC | #2

Hello Emil,

Emil Velikov wrote:
> On 10 June 2015 at 14:42, Tobias Jakobi <[e-mail]> wrote:
>> It doesn't make sense to keep this structure, since we
>> can just call all tests directly.
>>
> Seems like it was designed in mind of having another test case.
> Perhaps the exynos guys cannot really upstream it (licensing or other
> issues) ?
might be. But why should we care about that anyway?

My personal guess: Big giant code bomb which noone bothered to check. ;)


With best wishes,
Tobias



> 
> -Emil
>

Emil Velikov June 12, 2015, 4:41 p.m. UTC | #3

On 12 June 2015 at 17:25, Tobias Jakobi <[e-mail]> wrote:
> Hello Emil,
>
> Emil Velikov wrote:
>> On 10 June 2015 at 14:42, Tobias Jakobi <[e-mail]> wrote:
>>> It doesn't make sense to keep this structure, since we
>>> can just call all tests directly.
>>>
>> Seems like it was designed in mind of having another test case.
>> Perhaps the exynos guys cannot really upstream it (licensing or other
>> issues) ?
> might be. But why should we care about that anyway?
>
Would be nice to avoid giving the guys the finger considering they
don't have much time to dedicate to libdrm_exynos. For all we know all
of the issues (if any) are resolved and they're dusting off the
patches, as we speak.

> My personal guess: Big giant code bomb which noone bothered to check. ;)
>
Perhaps somewhere around rev 4 (of 20) it was used, and after that
people just forgot about it :-P

Cheers,
Emil

Patch

diff --git a/tests/exynos/exynos_fimg2d_test.c b/tests/exynos/exynos_fimg2d_test.c
index 080d178..de6a2b7 100644
--- a/tests/exynos/exynos_fimg2d_test.c
+++ b/tests/exynos/exynos_fimg2d_test.c
@@ -37,30 +37,6 @@ 
 
 static unsigned int screen_width, screen_height;
 
-/*
- * A structure to test fimg2d hw.
- *
- * @solid_fill: fill given color data to source buffer.
- * @copy: copy source to destination buffer.
- * @copy_with_scale: copy source to destination buffer scaling up or
- *	down properly.
- * @blend: blend source to destination buffer.
- */
-struct fimg2d_test_case {
-	int (*solid_fill)(struct exynos_device *dev, struct exynos_bo *dst);
-	int (*copy)(struct exynos_device *dev, struct exynos_bo *src,
-			struct exynos_bo *dst, enum e_g2d_buf_type);
-	int (*copy_with_scale)(struct exynos_device *dev,
-				struct exynos_bo *src, struct exynos_bo *dst,
-				enum e_g2d_buf_type);
-	int (*blend)(struct exynos_device *dev,
-				struct exynos_bo *src, struct exynos_bo *dst,
-				enum e_g2d_buf_type);
-	int (*checkerboard)(struct exynos_device *dev,
-				struct exynos_bo *src, struct exynos_bo *dst,
-				enum e_g2d_buf_type);
-};
-
 struct connector {
 	uint32_t id;
 	char mode_str[64];
@@ -630,14 +606,6 @@  fail:
 	return ret;
 }
 
-static struct fimg2d_test_case test_case = {
-	.solid_fill = &g2d_solid_fill_test,
-	.copy = &g2d_copy_test,
-	.copy_with_scale = &g2d_copy_with_scale_test,
-	.blend = &g2d_blend_test,
-	.checkerboard = &g2d_checkerboard_test,
-};
-
 static void usage(char *name)
 {
 	fprintf(stderr, "usage: %s [-s]\n", name);
@@ -747,7 +715,7 @@  int main(int argc, char **argv)
 	if (ret < 0)
 		goto err_rm_fb;
 
-	ret = test_case.solid_fill(dev, bo);
+	ret = g2d_solid_fill_test(dev, bo);
 	if (ret < 0) {
 		fprintf(stderr, "failed to solid fill operation.\n");
 		goto err_rm_fb;
@@ -761,7 +729,7 @@  int main(int argc, char **argv)
 		goto err_rm_fb;
 	}
 
-	ret = test_case.copy(dev, src, bo, G2D_IMGBUF_GEM);
+	ret = g2d_copy_test(dev, src, bo, G2D_IMGBUF_GEM);
 	if (ret < 0) {
 		fprintf(stderr, "failed to test copy operation.\n");
 		goto err_free_src;
@@ -769,7 +737,7 @@  int main(int argc, char **argv)
 
 	wait_for_user_input(0);
 
-	ret = test_case.copy_with_scale(dev, src, bo, G2D_IMGBUF_GEM);
+	ret = g2d_copy_with_scale_test(dev, src, bo, G2D_IMGBUF_GEM);
 	if (ret < 0) {
 		fprintf(stderr, "failed to test copy and scale operation.\n");
 		goto err_free_src;
@@ -777,7 +745,7 @@  int main(int argc, char **argv)
 
 	wait_for_user_input(0);
 
-	ret = test_case.checkerboard(dev, src, bo, G2D_IMGBUF_GEM);
+	ret = g2d_checkerboard_test(dev, src, bo, G2D_IMGBUF_GEM);
 	if (ret < 0) {
 		fprintf(stderr, "failed to issue checkerboard test.\n");
 		goto err_free_src;
@@ -794,7 +762,7 @@  int main(int argc, char **argv)
 	 * Disable the test for now, until the kernel code has been sanitized.
 	 */
 #if 0
-	ret  = test_case.blend(dev, src, bo, G2D_IMGBUF_USERPTR);
+	ret  = g2d_blend_test(dev, src, bo, G2D_IMGBUF_USERPTR);
 	if (ret < 0)
 		fprintf(stderr, "failed to test blend operation.\n");