Improve kms_panel_fitting.
v6 cover Improve kms_panel_fitting.
From: Robert Foss <[email protected]>
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(-)
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 1/7 kms_panel_fitting: skips if there's a non-eDP display connected. Fix it.
From: Robert Foss <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93012
--- tests/kms_panel_fitting.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tests/kms_panel_fitting.c +3 -2
@@ -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);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 2/7 kms_panel_fitting: Remove un-read variable.
In reply to [email protected]From: Robert Foss <[email protected]>
Remove devid from data_t since it is never read.
Also remove one assignment to devid.
--- tests/kms_panel_fitting.c | 2 -- 1 file changed, 2 deletions(-)
tests/kms_panel_fitting.c +0 -2
@@ -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);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 3/7 kms_panel_fitting: Remove un-read variable pipe_crc.
In reply to [email protected]From: Robert Foss <[email protected]>
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.
--- tests/kms_panel_fitting.c | 9 --------- 1 file changed, 9 deletions(-)
tests/kms_panel_fitting.c +0 -9
@@ -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_mainigt_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);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 4/7 kms_panel_fitting: Remove un-used variable.
In reply to [email protected]From: Robert Foss <[email protected]>
ref_crc is never assigned or read, and can be safely removed.
--- tests/kms_panel_fitting.c | 1 - 1 file changed, 1 deletion(-)
tests/kms_panel_fitting.c +0 -1
@@ -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;
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 5/7 kms_panel_fitting: Switched DRM format to a hardware agnostic alternative.
In reply to [email protected]From: Robert Foss <[email protected]>
Changed the DRM format to LOCAL_DRM_FORMAT_MOD_NONE since it is hardware agnostic.
Also fixed formatting/tabs.
--- tests/kms_panel_fitting.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tests/kms_panel_fitting.c +5 -5
@@ -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);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 6/7 kms_panel_fitting: Enabled test on non-Intel hardware.
In reply to [email protected]From: Robert Foss <[email protected]>
Switched from DRIVER_INTEL to DRIVER_ANY to enable test on all hardware.
--- tests/kms_panel_fitting.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/kms_panel_fitting.c +1 -1
@@ -212,7 +212,7 @@ igt_simple_mainigt_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);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 7/7 kms_panel_fitting: Enable connectors with "scaling mode" property set.
In reply to [email protected]From: Robert Foss <[email protected]>
Enable testing on all connectors that have the "scaling mode" property set.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93012
--- tests/kms_panel_fitting.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
tests/kms_panel_fitting.c +12 -3
@@ -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;
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Pushed. Thanks!
Quoted 32 lines · On Tue, May 03, 2016 at 10:40:15AM -0400, [email protected] wrote:
From: Robert Foss <[email protected]>
Changes since v1:
- Squash patches
- Based patch on https://lists.freedesktop.org/archives/intel-gfx/2016-March/090617.htmlChanges 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=93012Changes 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 skipkms_panel_fittingwhen"
https://lists.freedesktop.org/archives/intel-gfx/2016-March/090617.htmlRobert Foss (7):
kms_panel_fitting: skips if there's a non-eDP display connected. Fixit.
kms_panel_fitting: Remove un-read variable.
kms_panel_fitting: Remove un-read variablepipe_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.
Quoted 6 lines
tests/kms_panel_fitting.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-)Signature · 1 line
2.5.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx