Skip to contentSkip to conversation

i-g-t: Adding rotation to plane scaling test

PATCH In review Chandra Konduru 2 participants 3 messages Apr 15, 2015 – May 11, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i-g-t: Adding rotation to plane scaling test

From: chandra konduru <[email protected]>

Adding rotation to kms_plane_scaling test.

---
 tests/kms_plane_scaling.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
tests/kms_plane_scaling.c +11 -9
index 00db5cb..8d22ba4 100644
@@ -101,11 +101,11 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
 	data->fb_id1 = igt_create_fb(data->drm_fd,
 			mode->hdisplay, mode->vdisplay,
 			DRM_FORMAT_XRGB8888,
-			LOCAL_I915_FORMAT_MOD_X_TILED, /* tiled */
+			LOCAL_I915_FORMAT_MOD_Y_TILED, /* tiled */
 			&data->fb1);
 	igt_assert(data->fb_id1);
 
-	paint_color(data, &data->fb1, mode->hdisplay, mode->vdisplay);
+	paint_color(data, &data->fb1, data->fb1.width, data->fb1.height);
 
 	/*
 	 * We always set the primary plane to actually enable the pipe as
@@ -209,7 +209,7 @@ static void test_plane_scaling(data_t *d)
 	cairo_surface_t *image;
 	enum pipe pipe;
 	int valid_tests = 0;
-	int primary_plane_scaling = 0; /* For now */
+	int primary_plane_scaling = 1;
 
 	igt_require(d->display.has_universal_planes);
 	igt_require(d->num_scalers);
@@ -250,18 +250,20 @@ static void test_plane_scaling(data_t *d)
 		prepare_crtc(d, output, pipe, d->plane1, mode, COMMIT_UNIVERSAL);
 
 		if (primary_plane_scaling) {
-			/* Primary plane upscaling */
+			/* Primary plane upscaling with rotation */
 			igt_fb_set_position(&d->fb1, d->plane1, 100, 100);
 			igt_fb_set_size(&d->fb1, d->plane1, 500, 500);
 			igt_plane_set_position(d->plane1, 0, 0);
 			igt_plane_set_size(d->plane1, mode->hdisplay, mode->vdisplay);
+			igt_plane_set_rotation(d->plane1, IGT_ROTATION_90);
 			igt_display_commit2(display, COMMIT_UNIVERSAL);
 
-			/* Primary plane 1:1 no scaling */
+			/* Primary plane 1:1 no scaling & no rotation */
 			igt_fb_set_position(&d->fb1, d->plane1, 0, 0);
 			igt_fb_set_size(&d->fb1, d->plane1, d->fb1.width, d->fb1.height);
 			igt_plane_set_position(d->plane1, 0, 0);
 			igt_plane_set_size(d->plane1, mode->hdisplay, mode->vdisplay);
+			igt_plane_set_rotation(d->plane1, IGT_ROTATION_0);
 			igt_display_commit2(display, COMMIT_UNIVERSAL);
 		}
 
@@ -318,10 +320,10 @@ static void test_plane_scaling(data_t *d)
 		igt_plane_set_position(d->plane2, 100, 100);
 		igt_plane_set_size(d->plane2, d->fb2.width-200, d->fb2.height-200);
 
-		igt_fb_set_position(&d->fb3, d->plane3, 100, 100);
-		igt_fb_set_size(&d->fb3, d->plane3, d->fb3.width-400, d->fb3.height-400);
-		igt_plane_set_position(d->plane3, 10, 10);
-		igt_plane_set_size(d->plane3, mode->hdisplay-300, mode->vdisplay-300);
+		igt_fb_set_position(&d->fb3, d->plane3, 0, 0);
+		igt_fb_set_size(&d->fb3, d->plane3, d->fb3.width, d->fb3.height);
+		igt_plane_set_position(d->plane3, 500, 500);
+		igt_plane_set_size(d->plane3, d->fb3.width * 2/3, d->fb3.height * 2/3);
 		igt_display_commit2(display, COMMIT_UNIVERSAL);
 
 		if (primary_plane_scaling) {
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

"kms_plane_scaling" would be a better tag for this commit. You can still make sure that "i-g-t" appears in the subject line by using the --subject-prefix="PATCH i-g-t" option when using git send-email.

Quoted 14 lines · Chandra Konduru

From: chandra konduru <[email protected]>

Adding rotation to kms_plane_scaling test.

---
 tests/kms_plane_scaling.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
tests/kms_plane_scaling.c +0 -0
index 00db5cb..8d22ba4 100644

tests/kms_plane_scaling.c static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe, · line 108

Quoted 10 lines
tests/kms_plane_scaling.c +2 -2
@@ -101,11 +101,11 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
        data->fb_id1 = igt_create_fb(data->drm_fd,
                        mode->hdisplay, mode->vdisplay,
                        DRM_FORMAT_XRGB8888,
-                       LOCAL_I915_FORMAT_MOD_X_TILED, /* tiled */
+                       LOCAL_I915_FORMAT_MOD_Y_TILED, /* tiled */
                        &data->fb1);
        igt_assert(data->fb_id1);
 
-       paint_color(data, &data->fb1, mode->hdisplay, mode->vdisplay);
+       paint_color(data, &data->fb1, data->fb1.width, data->fb1.height);

This looks like an unrelated change.

tests/kms_plane_scaling.c static void test_plane_scaling(data_t *d) · line 212

Quoted 9 lines
tests/kms_plane_scaling.c +1 -1
        /*
         * We always set the primary plane to actually enable the pipe as
@@ -209,7 +209,7 @@ static void test_plane_scaling(data_t *d)
        cairo_surface_t *image;
        enum pipe pipe;
        int valid_tests = 0;
-       int primary_plane_scaling = 0; /* For now */
+       int primary_plane_scaling = 1;

Since this is now enabled and not set elsewhere, could it and the if statements that use it now be removed? Since it doesn't just affect the new rotation tests, it could be removed in a separate patch.

tests/kms_plane_scaling.c static void test_plane_scaling(data_t *d) · line 253

Quoted 9 lines
tests/kms_plane_scaling.c +1 -1
        igt_require(d->display.has_universal_planes);
        igt_require(d->num_scalers);
@@ -250,18 +250,20 @@ static void test_plane_scaling(data_t *d)
                prepare_crtc(d, output, pipe, d->plane1, mode, COMMIT_UNIVERSAL);
 
                if (primary_plane_scaling) {
-                       /* Primary plane upscaling */
+                       /* Primary plane upscaling with rotation */

Isn't this now testing two things at once? Would it be better to test them separately?

Quoted 19 lines
tests/kms_plane_scaling.c +3 -1
                        igt_fb_set_position(&d->fb1, d->plane1, 100, 100);
                        igt_fb_set_size(&d->fb1, d->plane1, 500, 500);
                        igt_plane_set_position(d->plane1, 0, 0);
                        igt_plane_set_size(d->plane1, mode->hdisplay, mode->vdisplay);
+                       igt_plane_set_rotation(d->plane1, IGT_ROTATION_90);
                        igt_display_commit2(display, COMMIT_UNIVERSAL);
 
-                       /* Primary plane 1:1 no scaling */
+                       /* Primary plane 1:1 no scaling & no rotation */
                        igt_fb_set_position(&d->fb1, d->plane1, 0, 0);
                        igt_fb_set_size(&d->fb1, d->plane1, d->fb1.width, d->fb1.height);
                        igt_plane_set_position(d->plane1, 0, 0);
                        igt_plane_set_size(d->plane1, mode->hdisplay, mode->vdisplay);
+                       igt_plane_set_rotation(d->plane1, IGT_ROTATION_0);
                        igt_display_commit2(display, COMMIT_UNIVERSAL);
                }
 
@@ -318,10 +320,10 @@ static void test_plane_scaling(data_t *d)
                igt_plane_set_position(d->plane2, 100, 100);

tests/kms_plane_scaling.c static void test_plane_scaling(data_t *d) · line 326

Quoted 10 lines
tests/kms_plane_scaling.c +4 -4
                igt_plane_set_size(d->plane2, d->fb2.width-200, d->fb2.height-200);
 
-               igt_fb_set_position(&d->fb3, d->plane3, 100, 100);
-               igt_fb_set_size(&d->fb3, d->plane3, d->fb3.width-400, d->fb3.height-400);
-               igt_plane_set_position(d->plane3, 10, 10);
-               igt_plane_set_size(d->plane3, mode->hdisplay-300, mode->vdisplay-300);
+               igt_fb_set_position(&d->fb3, d->plane3, 0, 0);
+               igt_fb_set_size(&d->fb3, d->plane3, d->fb3.width, d->fb3.height);
+               igt_plane_set_position(d->plane3, 500, 500);
+               igt_plane_set_size(d->plane3, d->fb3.width * 2/3, d->fb3.height * 2/3);

As above, these changes also look unrelated to rotation and should be in a separate patch.

Quoted 10 lines
tests/kms_plane_scaling.c +0 -1
                igt_display_commit2(display, COMMIT_UNIVERSAL);
 
                if (primary_plane_scaling) {
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 9 lines

-----Original Message-----
From: Thomas Wood [mailto:[email protected]]
Sent: Wednesday, April 22, 2015 9:58 AM
To: Konduru, Chandra
Cc: Intel Graphics Development
Subject: Re: [Intel-gfx] [PATCH] i-g-t: Adding rotation to plane scaling test

Quoted 3 lines

"kms_plane_scaling" would be a better tag for this commit. You can still make sure that "i-g-t" appears in the subject line by using the --subject-prefix="PATCH i-g-t" option when using git send-email.

Submitted updated patch "[PREFIX i-g-t] Improvements to kms_plane_scaling" to address your feedback. Also resolved an issue Tvrtko reported.

Quoted 97 lines

tests/kms_plane_scaling.c static void prepare_crtc(data_t *data, igt_output_t

Quoted 14 lines · Chandra Konduru

From: chandra konduru <[email protected]>

Adding rotation to kms_plane_scaling test.

---
 tests/kms_plane_scaling.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
tests/kms_plane_scaling.c +0 -0
index 00db5cb..8d22ba4 100644
@@ -101,11 +101,11 @@ static void prepare_crtc(data_t *data, igt_output_t

*output, enum pipe pipe,

tests/kms_plane_scaling.c static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,

Quoted 11 lines
tests/kms_plane_scaling.c +3 -2
        data->fb_id1 = igt_create_fb(data->drm_fd,
                        mode->hdisplay, mode->vdisplay,
                        DRM_FORMAT_XRGB8888,
-                       LOCAL_I915_FORMAT_MOD_X_TILED, /* tiled */
+                       LOCAL_I915_FORMAT_MOD_Y_TILED, /* tiled */
                        &data->fb1);
        igt_assert(data->fb_id1);
 
-       paint_color(data, &data->fb1, mode->hdisplay, mode->vdisplay);
+       paint_color(data, &data->fb1, data->fb1.width,
+ data->fb1.height);

This looks like an unrelated change.

tests/kms_plane_scaling.c static void test_plane_scaling(data_t *d) · line 212

Quoted 9 lines
tests/kms_plane_scaling.c +0 -0
        /*
         * We always set the primary plane to actually enable the pipe

as @@ -209,7 +209,7 @@ static void test_plane_scaling(data_t *d)

        cairo_surface_t *image;
        enum pipe pipe;
        int valid_tests = 0;
tests/kms_plane_scaling.c +1 -1
-       int primary_plane_scaling = 0; /* For now */
+       int primary_plane_scaling = 1;

Since this is now enabled and not set elsewhere, could it and the if statements that use it now be removed? Since it doesn't just affect the new rotation tests, it could be removed in a separate patch.

tests/kms_plane_scaling.c static void test_plane_scaling(data_t *d) · line 254

Quoted 10 lines
        igt_require(d->display.has_universal_planes);
        igt_require(d->num_scalers);
tests/kms_plane_scaling.c +1 -1
@@ -250,18 +250,20 @@ static void test_plane_scaling(data_t *d)
                prepare_crtc(d, output, pipe, d->plane1, mode,
 COMMIT_UNIVERSAL);
 
                if (primary_plane_scaling) {
-                       /* Primary plane upscaling */
+                       /* Primary plane upscaling with rotation */

Isn't this now testing two things at once? Would it be better to test them separately?

Quoted 24 lines
tests/kms_plane_scaling.c +4 -1
                        igt_fb_set_position(&d->fb1, d->plane1, 100, 100);
                        igt_fb_set_size(&d->fb1, d->plane1, 500, 500);
                        igt_plane_set_position(d->plane1, 0, 0);
                        igt_plane_set_size(d->plane1, mode->hdisplay,
 mode->vdisplay);
+                       igt_plane_set_rotation(d->plane1,
+ IGT_ROTATION_90);
                        igt_display_commit2(display,
 COMMIT_UNIVERSAL);
 
-                       /* Primary plane 1:1 no scaling */
+                       /* Primary plane 1:1 no scaling & no rotation
+ */
                        igt_fb_set_position(&d->fb1, d->plane1, 0, 0);
                        igt_fb_set_size(&d->fb1, d->plane1, d->fb1.width, d->fb1.height);
                        igt_plane_set_position(d->plane1, 0, 0);
                        igt_plane_set_size(d->plane1, mode->hdisplay,

mode->vdisplay);

tests/kms_plane_scaling.c +2 -0
+                       igt_plane_set_rotation(d->plane1,
+ IGT_ROTATION_0);
                        igt_display_commit2(display, COMMIT_UNIVERSAL);
                }

tests/kms_plane_scaling.c static void test_plane_scaling(data_t *d) · line 323

Quoted 6 lines
tests/kms_plane_scaling.c +0 -2
@@ -318,10 +320,10 @@ static void test_plane_scaling(data_t *d)
                igt_plane_set_position(d->plane2, 100, 100);
                igt_plane_set_size(d->plane2, d->fb2.width-200,
 d->fb2.height-200);
 
-               igt_fb_set_position(&d->fb3, d->plane3, 100, 100);
-               igt_fb_set_size(&d->fb3, d->plane3, d->fb3.width-400, d->fb3.height-

400);

tests/kms_plane_scaling.c static void test_plane_scaling(data_t *d) · line 325

Quoted 2 lines
tests/kms_plane_scaling.c +0 -2
-               igt_plane_set_position(d->plane3, 10, 10);
-               igt_plane_set_size(d->plane3, mode->hdisplay-300, mode->vdisplay-

300);

Quoted 20 lines

tests/kms_plane_scaling.c static void test_plane_scaling(data_t *d)

Quoted 5 lines
tests/kms_plane_scaling.c +5 -0
+               igt_fb_set_position(&d->fb3, d->plane3, 0, 0);
+               igt_fb_set_size(&d->fb3, d->plane3, d->fb3.width, d->fb3.height);
+               igt_plane_set_position(d->plane3, 500, 500);
+               igt_plane_set_size(d->plane3, d->fb3.width * 2/3,
+ d->fb3.height * 2/3);

As above, these changes also look unrelated to rotation and should be in a separate patch.

Quoted 10 lines
tests/kms_plane_scaling.c +0 -1
                igt_display_commit2(display, COMMIT_UNIVERSAL);
 
                if (primary_plane_scaling) {
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx