* [PATCH i-g-t v5 0/6] Improve kms_panel_fitting.
@ 2016-04-28 13:45 robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 1/6] kms_panel_fitting: Remove un-read variable robert.foss
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: robert.foss @ 2016-04-28 13:45 UTC (permalink / raw)
To: ville.syrjala, daniel.vetter, daniel.stone, jani.nikula; +Cc: intel-gfx
From: Robert Foss <robert.foss@collabora.com>
Changes since v4:
- Added reviewed-by danvet to patch 6, all patches are now reviewed.
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 v2:
- Added reviewed-by tomeu to patch 1-5.
- kms_panel_fitting.c: Replaced connector type checking with "scaling mode" property check.
Changes since v1:
- Squash patches
- Based patch on https://lists.freedesktop.org/archives/intel-gfx/2016-March/090617.html
Robert Foss (6):
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 | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
--
2.5.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH i-g-t v5 1/6] kms_panel_fitting: Remove un-read variable.
2016-04-28 13:45 [PATCH i-g-t v5 0/6] Improve kms_panel_fitting robert.foss
@ 2016-04-28 13:45 ` robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 2/6] kms_panel_fitting: Remove un-read variable pipe_crc robert.foss
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: robert.foss @ 2016-04-28 13:45 UTC (permalink / raw)
To: ville.syrjala, daniel.vetter, daniel.stone, jani.nikula; +Cc: intel-gfx
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH i-g-t v5 2/6] kms_panel_fitting: Remove un-read variable pipe_crc.
2016-04-28 13:45 [PATCH i-g-t v5 0/6] Improve kms_panel_fitting robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 1/6] kms_panel_fitting: Remove un-read variable robert.foss
@ 2016-04-28 13:45 ` robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 3/6] kms_panel_fitting: Remove un-used variable robert.foss
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: robert.foss @ 2016-04-28 13:45 UTC (permalink / raw)
To: ville.syrjala, daniel.vetter, daniel.stone, jani.nikula; +Cc: intel-gfx
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH i-g-t v5 3/6] kms_panel_fitting: Remove un-used variable.
2016-04-28 13:45 [PATCH i-g-t v5 0/6] Improve kms_panel_fitting robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 1/6] kms_panel_fitting: Remove un-read variable robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 2/6] kms_panel_fitting: Remove un-read variable pipe_crc robert.foss
@ 2016-04-28 13:45 ` robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 4/6] kms_panel_fitting: Switched DRM format to a hardware agnostic alternative robert.foss
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: robert.foss @ 2016-04-28 13:45 UTC (permalink / raw)
To: ville.syrjala, daniel.vetter, daniel.stone, jani.nikula; +Cc: intel-gfx
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH i-g-t v5 4/6] kms_panel_fitting: Switched DRM format to a hardware agnostic alternative.
2016-04-28 13:45 [PATCH i-g-t v5 0/6] Improve kms_panel_fitting robert.foss
` (2 preceding siblings ...)
2016-04-28 13:45 ` [PATCH i-g-t v5 3/6] kms_panel_fitting: Remove un-used variable robert.foss
@ 2016-04-28 13:45 ` robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 5/6] kms_panel_fitting: Enabled test on non-Intel hardware robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 6/6] kms_panel_fitting: Enable connectors with "scaling mode" property set robert.foss
5 siblings, 0 replies; 8+ messages in thread
From: robert.foss @ 2016-04-28 13:45 UTC (permalink / raw)
To: ville.syrjala, daniel.vetter, daniel.stone, jani.nikula; +Cc: intel-gfx
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH i-g-t v5 5/6] kms_panel_fitting: Enabled test on non-Intel hardware.
2016-04-28 13:45 [PATCH i-g-t v5 0/6] Improve kms_panel_fitting robert.foss
` (3 preceding siblings ...)
2016-04-28 13:45 ` [PATCH i-g-t v5 4/6] kms_panel_fitting: Switched DRM format to a hardware agnostic alternative robert.foss
@ 2016-04-28 13:45 ` robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 6/6] kms_panel_fitting: Enable connectors with "scaling mode" property set robert.foss
5 siblings, 0 replies; 8+ messages in thread
From: robert.foss @ 2016-04-28 13:45 UTC (permalink / raw)
To: ville.syrjala, daniel.vetter, daniel.stone, jani.nikula; +Cc: intel-gfx
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH i-g-t v5 6/6] kms_panel_fitting: Enable connectors with "scaling mode" property set.
2016-04-28 13:45 [PATCH i-g-t v5 0/6] Improve kms_panel_fitting robert.foss
` (4 preceding siblings ...)
2016-04-28 13:45 ` [PATCH i-g-t v5 5/6] kms_panel_fitting: Enabled test on non-Intel hardware robert.foss
@ 2016-04-28 13:45 ` robert.foss
2016-05-03 13:31 ` Marius Vlad
5 siblings, 1 reply; 8+ messages in thread
From: robert.foss @ 2016-04-28 13:45 UTC (permalink / raw)
To: ville.syrjala, daniel.vetter, daniel.stone, jani.nikula; +Cc: intel-gfx
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH i-g-t v5 6/6] kms_panel_fitting: Enable connectors with "scaling mode" property set.
2016-04-28 13:45 ` [PATCH i-g-t v5 6/6] kms_panel_fitting: Enable connectors with "scaling mode" property set robert.foss
@ 2016-05-03 13:31 ` Marius Vlad
0 siblings, 0 replies; 8+ messages in thread
From: Marius Vlad @ 2016-05-03 13:31 UTC (permalink / raw)
To: robert.foss; +Cc: daniel.vetter, intel-gfx, daniel.stone
[-- Attachment #1.1: Type: text/plain, Size: 1678 bytes --]
This doesn't apply cleanly, the patch from Jani from was not applied, so
is still using igt_require() for testing the connector type. Diff
against master.
On Thu, Apr 28, 2016 at 09:45:24AM -0400, robert.foss@collabora.com wrote:
> 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
[-- 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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-05-03 13:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-28 13:45 [PATCH i-g-t v5 0/6] Improve kms_panel_fitting robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 1/6] kms_panel_fitting: Remove un-read variable robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 2/6] kms_panel_fitting: Remove un-read variable pipe_crc robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 3/6] kms_panel_fitting: Remove un-used variable robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 4/6] kms_panel_fitting: Switched DRM format to a hardware agnostic alternative robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 5/6] kms_panel_fitting: Enabled test on non-Intel hardware robert.foss
2016-04-28 13:45 ` [PATCH i-g-t v5 6/6] kms_panel_fitting: Enable connectors with "scaling mode" property set robert.foss
2016-05-03 13:31 ` Marius Vlad
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.