[PATCH i-g-t v6 0/7] Improve kms_panel_fitting.

[PATCH i-g-t v6 0/7] Improve kms_panel_fitting.

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Changes since v1:
- Squash patches
- Based patch on https://lists.freedesktop.org/archives/intel-gfx/2016-March/090617.html

Changes since v2:
- Added reviewed-by tomeu to patch 1-5.
- kms_panel_fitting.c: Replaced connector type checking with "scaling mode" property check.

Changes since v3:
- kms_panel_fitting.c: Pass NULL arguments instead
- Added bugzilla link: https://bugs.freedesktop.org/show_bug.cgi?id=93012

Changes since v4:
- Added reviewed-by danvet to patch 6, all patches are now reviewed.

Changes since v5:
- Inlcude patch by Jani Nikula: "tests: don't skip kms_panel_fitting when"
  https://lists.freedesktop.org/archives/intel-gfx/2016-March/090617.html

Robert Foss (7):
  kms_panel_fitting: skips if there's a non-eDP display connected. Fix
    it.
  kms_panel_fitting: Remove un-read variable.
  kms_panel_fitting: Remove un-read variable pipe_crc.
  kms_panel_fitting: Remove un-used variable.
  kms_panel_fitting: Switched DRM format to a hardware agnostic
    alternative.
  kms_panel_fitting: Enabled test on non-Intel hardware.
  kms_panel_fitting: Enable connectors with "scaling mode" property set.

 tests/kms_panel_fitting.c | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v6 1/7] kms_panel_fitting: skips if there's a non-eDP display connected. Fix it.

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93012
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 tests/kms_panel_fitting.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c
index 829d9cd..1f9412f 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -150,8 +150,9 @@ static void test_panel_fitting(data_t *d)
 	for_each_connected_output(display, output) {
 		drmModeModeInfo *mode, native_mode;
 
-		igt_require(output->config.connector->connector_type ==
-			DRM_MODE_CONNECTOR_eDP);
+		if (output->config.connector->connector_type !=
+		    DRM_MODE_CONNECTOR_eDP)
+			continue;
 
 		pipe = output->config.pipe;
 		igt_output_set_pipe(output, pipe);
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v6 2/7] kms_panel_fitting: Remove un-read variable.

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Remove devid from data_t since it is never read.
Also remove one assignment to devid.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 tests/kms_panel_fitting.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c
index 1f9412f..43ad770 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -29,7 +29,6 @@
 IGT_TEST_DESCRIPTION("Test display panel fitting");
 
 typedef struct {
-	uint32_t devid;
 	int drm_fd;
 	igt_display_t display;
 	igt_crc_t ref_crc;
@@ -225,7 +224,6 @@ igt_simple_main
 	data.drm_fd = drm_open_driver(DRIVER_INTEL);
 	igt_require_pipe_crc();
 	igt_display_init(&data.display, data.drm_fd);
-	data.devid = intel_get_drm_devid(data.drm_fd);
 
 	test_panel_fitting(&data);
 
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v6 3/7] kms_panel_fitting: Remove un-read variable pipe_crc.

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

pipe_crc in data_t is assigned an allocated memory space and
then later free'd. But it is never used for any comparisons.
It should therefore be safe to remove pipe_crc and the crc
requirement.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 tests/kms_panel_fitting.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c
index 43ad770..7bfd980 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -32,7 +32,6 @@ typedef struct {
 	int drm_fd;
 	igt_display_t display;
 	igt_crc_t ref_crc;
-	igt_pipe_crc_t *pipe_crc;
 
 	int image_w;
 	int image_h;
@@ -59,10 +58,6 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
 
 	igt_output_set_pipe(output, pipe);
 
-	/* create the pipe_crc object for this pipe */
-	igt_pipe_crc_free(data->pipe_crc);
-	data->pipe_crc = igt_pipe_crc_new(pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
-
 	/* before allocating, free if any older fb */
 	if (data->fb_id1) {
 		igt_remove_fb(data->drm_fd, &data->fb1);
@@ -109,9 +104,6 @@ static void cleanup_crtc(data_t *data, igt_output_t *output, igt_plane_t *plane)
 {
 	igt_display_t *display = &data->display;
 
-	igt_pipe_crc_free(data->pipe_crc);
-	data->pipe_crc = NULL;
-
 	if (data->fb_id1) {
 		igt_remove_fb(data->drm_fd, &data->fb1);
 		data->fb_id1 = 0;
@@ -222,7 +214,6 @@ igt_simple_main
 	igt_skip_on_simulation();
 
 	data.drm_fd = drm_open_driver(DRIVER_INTEL);
-	igt_require_pipe_crc();
 	igt_display_init(&data.display, data.drm_fd);
 
 	test_panel_fitting(&data);
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v6 4/7] kms_panel_fitting: Remove un-used variable.

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

ref_crc is never assigned or read, and can be safely
removed.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 tests/kms_panel_fitting.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c
index 7bfd980..099816b 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -31,7 +31,6 @@ IGT_TEST_DESCRIPTION("Test display panel fitting");
 typedef struct {
 	int drm_fd;
 	igt_display_t display;
-	igt_crc_t ref_crc;
 
 	int image_w;
 	int image_h;
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v6 5/7] kms_panel_fitting: Switched DRM format to a hardware agnostic alternative.

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Changed the DRM format to LOCAL_DRM_FORMAT_MOD_NONE since it
is hardware agnostic.

Also fixed formatting/tabs.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 tests/kms_panel_fitting.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c
index 099816b..427bfc6 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -65,10 +65,10 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
 
 	/* allocate fb for plane 1 */
 	data->fb_id1 = igt_create_pattern_fb(data->drm_fd,
-					     mode->hdisplay, mode->vdisplay,
-					     DRM_FORMAT_XRGB8888,
-					     LOCAL_I915_FORMAT_MOD_X_TILED, /* tiled */
-					     &data->fb1);
+						mode->hdisplay, mode->vdisplay,
+						DRM_FORMAT_XRGB8888,
+						LOCAL_DRM_FORMAT_MOD_NONE,
+						&data->fb1);
 	igt_assert(data->fb_id1);
 
 	/*
@@ -159,7 +159,7 @@ static void test_panel_fitting(data_t *d)
 
 		d->fb_id2 = igt_create_image_fb(d->drm_fd, 0, 0,
 						DRM_FORMAT_XRGB8888,
-						LOCAL_I915_FORMAT_MOD_X_TILED, /* tiled */
+						LOCAL_DRM_FORMAT_MOD_NONE,
 						FILE_NAME, &d->fb2);
 		igt_assert(d->fb_id2);
 
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v6 6/7] kms_panel_fitting: Enabled test on non-Intel hardware.

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Switched from DRIVER_INTEL to DRIVER_ANY to enable test
on all hardware.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 tests/kms_panel_fitting.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c
index 427bfc6..272a531 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -212,7 +212,7 @@ igt_simple_main
 
 	igt_skip_on_simulation();
 
-	data.drm_fd = drm_open_driver(DRIVER_INTEL);
+	data.drm_fd = drm_open_driver(DRIVER_ANY);
 	igt_display_init(&data.display, data.drm_fd);
 
 	test_panel_fitting(&data);
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v6 7/7] kms_panel_fitting: Enable connectors with "scaling mode" property set.

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Enable testing on all connectors that have the "scaling mode"
property set.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93012
Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 tests/kms_panel_fitting.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c
index 272a531..b796c68 100644
--- a/tests/kms_panel_fitting.c
+++ b/tests/kms_panel_fitting.c
@@ -139,9 +139,18 @@ static void test_panel_fitting(data_t *d)
 
 	for_each_connected_output(display, output) {
 		drmModeModeInfo *mode, native_mode;
-
-		if (output->config.connector->connector_type !=
-		    DRM_MODE_CONNECTOR_eDP)
+		bool scaling_mode_set;
+
+		scaling_mode_set = kmstest_get_property(d->drm_fd,
+			output->config.connector->connector_id,
+			DRM_MODE_OBJECT_CONNECTOR,
+			"scaling mode",
+			NULL,
+			NULL,
+			NULL);
+
+		/* Check that the "scaling mode" property has been set. */
+		if (!scaling_mode_set)
 			continue;
 
 		pipe = output->config.pipe;
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v6 0/7] Improve kms_panel_fitting.

[Marius Vlad]

[-- Attachment #1.1: Type: text/plain, Size: 1521 bytes --]

Pushed. Thanks!

On Tue, May 03, 2016 at 10:40:15AM -0400, robert.foss@collabora.com wrote:
> From: Robert Foss <robert.foss@collabora.com>
> 
> Changes since v1:
> - Squash patches
> - Based patch on https://lists.freedesktop.org/archives/intel-gfx/2016-March/090617.html
> 
> Changes since v2:
> - Added reviewed-by tomeu to patch 1-5.
> - kms_panel_fitting.c: Replaced connector type checking with "scaling mode" property check.
> 
> Changes since v3:
> - kms_panel_fitting.c: Pass NULL arguments instead
> - Added bugzilla link: https://bugs.freedesktop.org/show_bug.cgi?id=93012
> 
> Changes since v4:
> - Added reviewed-by danvet to patch 6, all patches are now reviewed.
> 
> Changes since v5:
> - Inlcude patch by Jani Nikula: "tests: don't skip kms_panel_fitting when"
>   https://lists.freedesktop.org/archives/intel-gfx/2016-March/090617.html
> 
> Robert Foss (7):
>   kms_panel_fitting: skips if there's a non-eDP display connected. Fix
>     it.
>   kms_panel_fitting: Remove un-read variable.
>   kms_panel_fitting: Remove un-read variable pipe_crc.
>   kms_panel_fitting: Remove un-used variable.
>   kms_panel_fitting: Switched DRM format to a hardware agnostic
>     alternative.
>   kms_panel_fitting: Enabled test on non-Intel hardware.
>   kms_panel_fitting: Enable connectors with "scaling mode" property set.
> 
>  tests/kms_panel_fitting.c | 38 ++++++++++++++++++--------------------
>  1 file changed, 18 insertions(+), 20 deletions(-)
> 
> -- 
> 2.5.0
> 

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx