Add support for atomic modeset to IGT.
v3 cover Add support for atomic modeset to IGT.
With legacy modesets if the primary plane had a null fb it was disabled, and code would often do the following:
for_each_pipe(...)
for_each_output(...) {
igt_output_set_pipe(output, pipe);
igt_display_commit();
if (!output->valid)
bail;
cleanup;
igt_output_set_pipe(output, PIPE_ANY);
igt_display_commit();
}A straightforward replacement of igt_display_commit with igt_display_commit2(COMMIT_ATOMIC) will not work with this series, since in this case it can perform a modeset without primary framebuffer, and invalid configurations get rejected.
Best solution is to do the following to get atomic behavior, with fallback to legacy:
bool valid = false;
for_each_pipe_with_valid_output(display, pipe, output) {
valid = true;
igt_output_set_pipe(output, pipe);
/* perform more setup here for planes, etc */
igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
/* tests + cleanup */
igt_output_set_pipe(output, PIPE_NONE);
}igt_require_f(valid, "no valid crtc/connector combinations found\n");
If the test requires a fixed pipe, use for_each_valid_output_on_pipe instead.
XXX: Make a igt_require_valid_output() for test fixtures?
Unfortunately it made me learn that that setting connector properties with the atomic api doesn't work yet, needs more tests and changes in the kernel. But we'll get there, converting encoder api in the kernel to use the atomic state is a first step.
Changes since second version:
- Split out 2 commits from 'Change PIPE_ANY behavior', to increase readability.
- Small fixes found by review, annotated in the patches.
Maarten Lankhorst (13):
igt_kms: Remove kmstest_connector_config.crtc_idx
igt_kms: Find optimal encoder only after selecting pipe
kms_psr_sink_crc: Use for_each_pipe_with_valid_output to find a valid
config, v2.
kms_sink_crc_basic: Use for_each_pipe_with_valid_output to find a
valid config.
igt_kms: Make PIPE_ANY a alias for PIPE_NONE tests/kms: Clean up more users of unassigned pipes.
igt_kms: Assign pipe properties in pipe init
igt_kms: Use pipes for committing, not outputs
igt_kms: Change PIPE_ANY behavior to mean unassigned, v2.
igt_kms: Handle atomic pipe properties better.
igt_kms: Remove pan members from igt_plane, v2.
igt_kms: Clear all _changed members centrally, v2.
igt_kms: Add modeset support to atomic commits.
lib/igt_kms.c | 623 +++++++++++++++++++++----------------- lib/igt_kms.h | 48 ++- tests/kms_crtc_background_color.c | 3 +- tests/kms_flip_tiling.c | 50 +-- tests/kms_panel_fitting.c | 7 +- tests/kms_plane.c | 8 +- tests/kms_plane_scaling.c | 7 +- tests/kms_psr_sink_crc.c | 8 +- tests/kms_sink_crc_basic.c | 8 +- tests/testdisplay.c | 4 +- 10 files changed, 431 insertions(+), 335 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/13 igt_kms: Remove kmstest_connector_config.crtc_idx
This is the same as using config.pipe because the order of crtcs will never change.
--- lib/igt_kms.c | 4 +--- lib/igt_kms.h | 1 - tests/testdisplay.c | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-)
lib/igt_kms.c +1 -3
@@ -854,9 +854,7 @@ static bool _kmstest_connector_config(int drm_fd, uint32_t connector_id, config->connector = connector; config->encoder = found; config->crtc =drmModeGetCrtc (drm_fd, resources->crtcs[pipe]); - config->crtc_idx = pipe; - config->pipe =kmstest_get_pipe_from_crtc_id (drm_fd, - config->crtc->crtc_id); + config->pipe = pipe;drmModeFreeResources (resources);
lib/igt_kms.h +0 -1
@@ -118,7 +118,6 @@ struct kmstest_connector_config {bool connector_dpms_changed;uint32_t atomic_props_crtc[IGT_NUM_CRTC_PROPS ];uint32_t atomic_props_connector[IGT_NUM_CONNECTOR_PROPS ]; -int crtc_idx;int pipe;unsigned valid_crtc_idx_mask; };
tests/testdisplay.c +1 -3
@@ -112,7 +112,6 @@ struct connector {drmModeEncoder *encoder;drmModeConnector *connector;int crtc; -int crtc_idx;int pipe; };
@@ -211,7 +210,6 @@ static void connector_find_preferred_mode(uint32_t connector_id, c->connector = config.connector; c->encoder = config.encoder; c->crtc = config.crtc->crtc_id; - c->crtc_idx = config.crtc_idx; c->pipe = config.pipe;if (mode_num !=-1 ) {
@@ -497,7 +495,7 @@ int update_display(bool probe)if (test_preferred_mode || force_mode || specified_mode_num !=-1 ) - crtc_idx_mask &= ~(1 << connector->crtc_idx); + crtc_idx_mask &= ~(1 << connector->pipe); } }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/13 igt_kms: Find optimal encoder only after selecting pipe
In reply to Maarten LankhorstThis will allow us to find a matching encoder based on a pipe only.
--- lib/igt_kms.c | 97 +++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 36 deletions(-)
lib/igt_kms.c +61 -36
@@ -761,6 +761,59 @@ bool kmstest_get_connector_default_mode(int drm_fd, drmModeConnector *connector,return true; } +static void +_kmstest_connector_config_crtc_mask (int drm_fd, +drmModeConnector *connector, +struct kmstest_connector_config *config) +{ +int i; + + config->valid_crtc_idx_mask =0 ; + +/* Now get a compatible encoder */ +for (i =0 ; i < connector->count_encoders; i++) { +drmModeEncoder *encoder =drmModeGetEncoder (drm_fd, + connector->encoders[i]); + +if (!encoder) { +igt_warn ("could not get encoder %d: %s\n" , + connector->encoders[i], +strerror (errno)); + +continue ; + } + + config->valid_crtc_idx_mask |= encoder->possible_crtcs; +drmModeFreeEncoder (encoder); + } +} + +static drmModeEncoder * +_kmstest_connector_config_find_encoder (int drm_fd,drmModeConnector *connector,enum pipe pipe) +{ +int i; + +for (i =0 ; i < connector->count_encoders; i++) { +drmModeEncoder *encoder =drmModeGetEncoder (drm_fd, connector->encoders[i]); + +if (!encoder) { +igt_warn ("could not get encoder %d: %s\n" , + connector->encoders[i], +strerror (errno)); + +continue ; + } + +if (encoder->possible_crtcs & (1 << pipe)) +return encoder; + +drmModeFreeEncoder (encoder); + } + +igt_assert (false); +return NULL ; +} +/** * _kmstest_connector_config: * @drm_fd: DRM fd
@@ -779,8 +832,6 @@ static bool _kmstest_connector_config(int drm_fd, uint32_t connector_id, {drmModeRes *resources;drmModeConnector *connector; -drmModeEncoder *encoder, *found =NULL ; -int i, j, pipe; resources =drmModeGetResources (drm_fd);if (!resources) {
@@ -816,51 +867,25 @@ static bool _kmstest_connector_config(int drm_fd, uint32_t connector_id,* In both cases find the first compatible encoder and skip the CRTC * if there is non such. */ - config->valid_crtc_idx_mask =0 ; -for (i =0 ; i < resources->count_crtcs; i++) { -if (!resources->crtcs[i]) -continue ; +_kmstest_connector_config_crtc_mask (drm_fd, connector, config); -/* Now get a compatible encoder */ -for (j =0 ; j < connector->count_encoders; j++) { - encoder =drmModeGetEncoder (drm_fd, - connector->encoders[j]); - -if (!encoder) { -igt_warn ("could not get encoder %d: %s\n" , - resources->encoders[j], -strerror (errno)); - -continue ; - } - - config->valid_crtc_idx_mask |= encoder->possible_crtcs; - -if (!found && (crtc_idx_mask & encoder->possible_crtcs & (1 << i))) { - found = encoder; - pipe = i; - }else -drmModeFreeEncoder (encoder); - } - } - -if (!found) + crtc_idx_mask &= config->valid_crtc_idx_mask; +if (!crtc_idx_mask) goto err3; + config->pipe =ffs (crtc_idx_mask) -1 ; +if (!kmstest_get_connector_default_mode (drm_fd, connector, &config->default_mode)) - goto err4; + goto err3; + config->encoder =_kmstest_connector_config_find_encoder (drm_fd, connector, config->pipe); config->connector = connector; - config->encoder = found; - config->crtc =drmModeGetCrtc (drm_fd, resources->crtcs[pipe]); - config->pipe = pipe; + config->crtc =drmModeGetCrtc (drm_fd, resources->crtcs[config->pipe]);drmModeFreeResources (resources);return true; -err4: -drmModeFreeEncoder (found); err3:drmModeFreeConnector (connector); err2:
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/13 kms_psr_sink_crc: Use for_each_pipe_with_valid_output to find a valid config, v2.
In reply to Maarten LankhorstThis is the only time PIPE_ANY was used to mean something other than unassign this output from a pipe. Without this PIPE_ANY can be aliased to PIPE_NONE.
Changes since v1:
- Remove DRM_MODE_CONNECTED check, it's implied.
--- tests/kms_psr_sink_crc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tests/kms_psr_sink_crc.c +4 -4
@@ -103,15 +103,15 @@ static void setup_output(data_t *data) {igt_display_t *display = &data->display;igt_output_t *output; +enum pipe pipe; -for_each_connected_output (display, output) { +for_each_pipe_with_valid_output (display, pipe, output) {drmModeConnectorPtr c = output->config.connector; -if (c->connector_type != DRM_MODE_CONNECTOR_eDP || - c->connection !=DRM_MODE_CONNECTED ) +if (c->connector_type != DRM_MODE_CONNECTOR_eDP)continue ; -igt_output_set_pipe (output,PIPE_ANY ); +igt_output_set_pipe (output, pipe); data->crtc_id = output->config.crtc->crtc_id; data->output = output; data->mode =igt_output_get_mode (output);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/13 kms_sink_crc_basic: Use for_each_pipe_with_valid_output to find a valid config.
In reply to Maarten LankhorstPIPE_ANY was used here to assign the first valid pipe, this will no longer be allowed, so explicitly set it.
--- tests/kms_sink_crc_basic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tests/kms_sink_crc_basic.c +4 -4
@@ -112,15 +112,15 @@ static void run_test(data_t *data)igt_display_t *display = &data->display;igt_output_t *output;drmModeModeInfo *mode; +enum pipe pipe; -for_each_connected_output (display, output) { +for_each_pipe_with_valid_output (display, pipe, output) {drmModeConnectorPtr c = output->config.connector; -if (c->connector_type != DRM_MODE_CONNECTOR_eDP || - c->connection !=DRM_MODE_CONNECTED ) +if (c->connector_type != DRM_MODE_CONNECTOR_eDP)continue ; -igt_output_set_pipe (output,PIPE_ANY ); +igt_output_set_pipe (output, pipe); mode =igt_output_get_mode (output);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 5/13 igt_kms: Make PIPE_ANY a alias for PIPE_NONE
In reply to Maarten Lankhorst--- lib/igt_kms.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/igt_kms.h +2 -1
@@ -40,7 +40,8 @@/* Low-level helpers with kmstest_ prefix */ enum pipe { -PIPE_ANY =-1 , +PIPE_NONE =-1 , +PIPE_ANY =PIPE_NONE ,PIPE_A =0 ,PIPE_B ,PIPE_C ,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 6/13 tests/kms: Clean up more users of unassigned pipes.
In reply to Maarten LankhorstUse for_each_pipe_with_valid_output instead.
This may increase test time slightly on the affected tests, because now outputs will be tested on every pipe instead of the first pipe. This will increase test coverage to all usable pipes though, so it shouldn't be an issue.
--- tests/kms_crtc_background_color.c | 3 +-- tests/kms_flip_tiling.c | 50 +++++++++++++++++++++++---------------- tests/kms_panel_fitting.c | 5 ++-- tests/kms_plane_scaling.c | 5 ++-- 4 files changed, 34 insertions(+), 29 deletions(-)
tests/kms_crtc_background_color.c +1 -2
@@ -133,10 +133,9 @@ static void test_crtc_background(data_t *data)igt_require (data->display.has_universal_planes); -for_each_connected_output (display, output) { +for_each_pipe_with_valid_output (display, pipe, output) {igt_plane_t *plane; - pipe = output->config.pipe;igt_output_set_pipe (output, pipe); plane =igt_output_get_plane (output,IGT_PLANE_PRIMARY );
tests/kms_flip_tiling.c +29 -21
138 lines not on this page · raw message
tests/kms_panel_fitting.c +2 -3
@@ -87,7 +87,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,if (s ==COMMIT_LEGACY ) {int ret; ret = drmModeSetCrtc(data->drm_fd, - output->config.crtc->crtc_id, + plane->pipe->crtc_id, data->fb_id1, plane->pan_x, plane->pan_y, &output->id,
@@ -137,7 +137,7 @@ static void test_panel_fitting(data_t *d)enum pipe pipe;int valid_tests =0 ; -for_each_connected_output (display, output) { +for_each_pipe_with_valid_output (display, pipe, output) {drmModeModeInfo *mode, native_mode;bool scaling_mode_set;
@@ -153,7 +153,6 @@ static void test_panel_fitting(data_t *d)if (!scaling_mode_set)continue ; - pipe = output->config.pipe;igt_output_set_pipe (output, pipe); mode =igt_output_get_mode (output);
tests/kms_plane_scaling.c +2 -3
@@ -96,7 +96,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,if (s ==COMMIT_LEGACY ) {int ret; ret = drmModeSetCrtc(data->drm_fd, - output->config.crtc->crtc_id, + plane->pipe->crtc_id, data->fb_id1, plane->pan_x, plane->pan_y, &output->id,
@@ -186,10 +186,9 @@ static void test_plane_scaling(data_t *d)igt_require (d->display.has_universal_planes);igt_require (d->num_scalers); -for_each_connected_output (display, output) { +for_each_pipe_with_valid_output (display, pipe, output) {drmModeModeInfo *mode; - pipe = output->config.pipe;igt_output_set_pipe (output, pipe); mode =igt_output_get_mode (output);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 7/13 igt_kms: Assign pipe properties in pipe init
In reply to Maarten LankhorstThis is a small change required for changing PIPE_ANY to PIPE_NONE, but it's a standalone change, so make it a separate commit.
--- lib/igt_kms.c | 54 +++++++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 31 deletions(-)
lib/igt_kms.c +23 -31
@@ -1325,15 +1325,37 @@ void igt_display_init(igt_display_t *display, int drm_fd)int p =IGT_PLANE_2 ;int j, type;uint8_t n_planes =0 ; +uint64_t prop_value; pipe->crtc_id = resources->crtcs[i]; pipe->display = display; pipe->pipe = i; +get_crtc_property (display->drm_fd, pipe->crtc_id, +"background_color" , + &pipe->background_property, + &prop_value, +NULL ); + pipe->background = (uint32_t )prop_value; +get_crtc_property (display->drm_fd, pipe->crtc_id, +"DEGAMMA_LUT" , + &pipe->degamma_property, +NULL , +NULL ); +get_crtc_property (display->drm_fd, pipe->crtc_id, +"CTM" , + &pipe->ctm_property, +NULL , +NULL ); +get_crtc_property (display->drm_fd, pipe->crtc_id, +"GAMMA_LUT" , + &pipe->gamma_property, +NULL , +NULL ); +/* add the planes that can be used with that pipe */ for (j =0 ; j < plane_resources->count_planes; j++) {drmModePlane *drm_plane; -uint64_t prop_value; drm_plane =drmModeGetPlane (display->drm_fd, plane_resources->planes[j]);
@@ -1440,7 +1462,6 @@ void igt_display_init(igt_display_t *display, int drm_fd)igt_assert (display->outputs);for (i =0 ; i < display->n_outputs; i++) { -int j;igt_output_t *output = &display->outputs[i];/*
@@ -1452,35 +1473,6 @@ void igt_display_init(igt_display_t *display, int drm_fd) output->display = display;igt_output_refresh (output); - -for (j =0 ; j < display->n_pipes; j++) { -uint64_t prop_value; -igt_pipe_t *pipe = &display->pipes[j]; - -if (output->config.crtc) { -get_crtc_property (display->drm_fd, output->config.crtc->crtc_id, -"background_color" , - &pipe->background_property, - &prop_value, -NULL ); - pipe->background = (uint32_t )prop_value; -get_crtc_property (display->drm_fd, output->config.crtc->crtc_id, -"DEGAMMA_LUT" , - &pipe->degamma_property, -NULL , -NULL ); -get_crtc_property (display->drm_fd, output->config.crtc->crtc_id, -"CTM" , - &pipe->ctm_property, -NULL , -NULL ); -get_crtc_property (display->drm_fd, output->config.crtc->crtc_id, -"GAMMA_LUT" , - &pipe->gamma_property, -NULL , -NULL ); - } - } }drmModeFreePlaneResources (plane_resources);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 8/13 igt_kms: Use pipes for committing, not outputs
In reply to Maarten LankhorstThis can be split off from the PIPE_ANY -> PIPE_NONE commit by making small changes to how igt_pipe_get_output works, next commit restores the behavior.
--- lib/igt_kms.c | 115 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 63 insertions(+), 52 deletions(-)
lib/igt_kms.c +63 -52
@@ -1259,10 +1259,10 @@ get_crtc_property(int drm_fd, uint32_t crtc_id, const char *name, }static void -igt_crtc_set_property (igt_output_t *output,uint32_t prop_id,uint64_t value) +igt_crtc_set_property (igt_pipe_t *pipe,uint32_t prop_id,uint64_t value) { -drmModeObjectSetProperty (output->display->drm_fd, - output->config.crtc->crtc_id,DRM_MODE_OBJECT_CRTC , prop_id, value); +drmModeObjectSetProperty (pipe->display->drm_fd, + pipe->crtc_id,DRM_MODE_OBJECT_CRTC , prop_id, value); }/*
@@ -1620,6 +1620,18 @@ static igt_plane_t *igt_pipe_get_plane(igt_pipe_t *pipe, enum igt_plane plane)return &pipe->planes[idx]; } +static igt_output_t *igt_pipe_get_output (igt_pipe_t *pipe) +{ +igt_display_t *display = pipe->display; +igt_output_t *output; + +for_each_connected_output (display, output) +if (output->config.pipe == pipe->pipe) +return output; + +return NULL ; +} +bool igt_pipe_get_property (igt_pipe_t *pipe,const char *name,uint32_t *prop_id,uint64_t *value,drmModePropertyPtr *prop)
@@ -1733,10 +1745,10 @@ igt_atomic_prepare_plane_commit(igt_plane_t *plane, igt_output_t *output,* tests that expect a specific error code). */ static int igt_drm_plane_commit (igt_plane_t *plane, -igt_output_t *output, +igt_pipe_t *pipe,bool fail_on_error) { -igt_display_t *display = output->display; +igt_display_t *display = pipe->display;uint32_t fb_id, crtc_id;int ret;uint32_t src_x;
@@ -1755,13 +1767,12 @@ static int igt_drm_plane_commit(igt_plane_t *plane, !plane->rotation_changed); fb_id =igt_plane_get_fb_id (plane); - crtc_id = output->config.crtc->crtc_id; + crtc_id = pipe->crtc_id;if ((plane->fb_changed || plane->size_changed) && fb_id ==0 ) {LOG (display, -"%s: SetPlane pipe %s, plane %d, disabling\n" , -igt_output_name (output), -kmstest_pipe_name (output->config.pipe), +"SetPlane pipe %s, plane %d, disabling\n" , +kmstest_pipe_name (pipe->pipe), plane->index); ret = drmModeSetPlane(display->drm_fd,
@@ -1789,10 +1800,9 @@ static int igt_drm_plane_commit(igt_plane_t *plane, crtc_h = plane->crtc_h; LOG(display, - "%s: SetPlane %s.%d, fb %u, src = (%d, %d) " + "SetPlane %s.%d, fb %u, src = (%d, %d) " "%ux%u dst = (%u, %u) %ux%u\n", - igt_output_name(output), - kmstest_pipe_name(output->config.pipe), + kmstest_pipe_name(pipe->pipe), plane->index, fb_id, src_x >> 16, src_y >> 16, src_w >> 16, src_h >> 16,
@@ -1833,11 +1843,11 @@ static int igt_drm_plane_commit(igt_plane_t *plane,* code). */ static int igt_cursor_commit_legacy (igt_plane_t *cursor, -igt_output_t *output, +igt_pipe_t *pipe,bool fail_on_error) { -igt_display_t *display = output->display; -uint32_t crtc_id = output->config.crtc->crtc_id; +igt_display_t *display = pipe->display; +uint32_t crtc_id = pipe->crtc_id;int ret;if (cursor->fb_changed) {
@@ -1845,9 +1855,8 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor,if (gem_handle) {LOG (display, -"%s: SetCursor pipe %s, fb %u %dx%d\n" , -igt_output_name (output), -kmstest_pipe_name (output->config.pipe), +"SetCursor pipe %s, fb %u %dx%d\n" , +kmstest_pipe_name (pipe->pipe), gem_handle, cursor->crtc_w, cursor->crtc_h);
@@ -1857,9 +1866,8 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor, cursor->crtc_h); }else {LOG (display, -"%s: SetCursor pipe %s, disabling\n" , -igt_output_name (output), -kmstest_pipe_name (output->config.pipe)); +"SetCursor pipe %s, disabling\n" , +kmstest_pipe_name (pipe->pipe)); ret =drmModeSetCursor (display->drm_fd, crtc_id,0 ,0 ,0 );
@@ -1875,9 +1883,8 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor,int y = cursor->crtc_y;LOG (display, -"%s: MoveCursor pipe %s, (%d, %d)\n" , -igt_output_name (output), -kmstest_pipe_name (output->config.pipe), +"MoveCursor pipe %s, (%d, %d)\n" , +kmstest_pipe_name (pipe->pipe), x, y); ret =drmModeMoveCursor (display->drm_fd, crtc_id, x, y);
@@ -1894,10 +1901,11 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor,* (setmode). */ static int igt_primary_plane_commit_legacy (igt_plane_t *primary, -igt_output_t *output, +igt_pipe_t *pipe,bool fail_on_error) {struct igt_display *display = primary->pipe->display; +igt_output_t *output =igt_pipe_get_output (pipe);drmModeModeInfo *mode;uint32_t fb_id, crtc_id;int ret;
@@ -1912,7 +1920,7 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary, !primary->size_changed && !primary->panning_changed)return 0 ; - crtc_id = output->config.crtc->crtc_id; + crtc_id = pipe->crtc_id; fb_id =igt_plane_get_fb_id (primary);if (fb_id) mode =igt_output_get_mode (output);
@@ -1924,7 +1932,7 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary,"%s: SetCrtc pipe %s, fb %u, panning (%d, %d), " "mode %dx%d\n" ,igt_output_name (output), -kmstest_pipe_name (output->config.pipe), +kmstest_pipe_name (pipe->pipe), fb_id, primary->pan_x, primary->pan_y, mode->hdisplay, mode->vdisplay);
@@ -1938,9 +1946,8 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary, mode); }else {LOG (display, -"%s: SetCrtc pipe %s, disabling\n" , -igt_output_name (output), -kmstest_pipe_name (output->config.pipe)); +"SetCrtc pipe %s, disabling\n" , +kmstest_pipe_name (pipe->pipe)); ret = drmModeSetCrtc(display->drm_fd, crtc_id,
@@ -1968,17 +1975,17 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary,* which API is used to do the programming. */ static int igt_plane_commit (igt_plane_t *plane, -igt_output_t *output, +igt_pipe_t *pipe,enum igt_commit_style s,bool fail_on_error) {if (plane->is_cursor && s ==COMMIT_LEGACY ) { -return igt_cursor_commit_legacy (plane, output, fail_on_error); +return igt_cursor_commit_legacy (plane, pipe, fail_on_error); }else if (plane->is_primary && s ==COMMIT_LEGACY ) { -return igt_primary_plane_commit_legacy (plane, output, +return igt_primary_plane_commit_legacy (plane, pipe, fail_on_error); }else { -return igt_drm_plane_commit (plane, output, fail_on_error); +return igt_drm_plane_commit (plane, pipe, fail_on_error); } }
@@ -1992,31 +1999,28 @@ static int igt_plane_commit(igt_plane_t *plane,* further programming will take place, which may result in some changes * taking effect and others not taking effect. */ -static int igt_output_commit (igt_output_t *output, -enum igt_commit_style s, -bool fail_on_error) +static int igt_pipe_commit (igt_pipe_t *pipe, +enum igt_commit_style s, +bool fail_on_error) { -igt_display_t *display = output->display; -igt_pipe_t *pipe; +igt_display_t *display = pipe->display;int i;int ret;bool need_wait_for_vblank = false; - pipe =igt_output_get_driving_pipe (output); -if (pipe->background_changed) { -igt_crtc_set_property (output, pipe->background_property, +igt_crtc_set_property (pipe, pipe->background_property, pipe->background); pipe->background_changed = false; }if (pipe->color_mgmt_changed) { -igt_crtc_set_property (output, pipe->degamma_property, +igt_crtc_set_property (pipe, pipe->degamma_property, pipe->degamma_blob); -igt_crtc_set_property (output, pipe->ctm_property, +igt_crtc_set_property (pipe, pipe->ctm_property, pipe->ctm_blob); -igt_crtc_set_property (output, pipe->gamma_property, +igt_crtc_set_property (pipe, pipe->gamma_property, pipe->gamma_blob); pipe->color_mgmt_changed = false;
@@ -2028,7 +2032,7 @@ static int igt_output_commit(igt_output_t *output,if (plane->fb_changed || plane->position_changed || plane->size_changed) need_wait_for_vblank = true; - ret =igt_plane_commit (plane, output, s, fail_on_error); + ret =igt_plane_commit (plane, pipe, s, fail_on_error);CHECK_RETURN (ret, fail_on_error); }
@@ -2052,6 +2056,9 @@ static void igt_atomic_prepare_crtc_commit(igt_output_t *output, drmModeAtomicReigt_pipe_t *pipe_obj =igt_output_get_driving_pipe (output); +if (!pipe_obj) +return ; +if (pipe_obj->background_changed)igt_atomic_populate_crtc_req (req, output,IGT_CRTC_BACKGROUND , pipe_obj->background);
@@ -2117,6 +2124,8 @@ static int igt_atomic_commit(igt_display_t *display) pipe_obj =igt_output_get_driving_pipe (output); +if (!pipe_obj) +continue ; pipe = pipe_obj->pipe;
@@ -2159,14 +2168,14 @@ static int do_display_commit(igt_display_t *display, } -for (i =0 ; i < display->n_outputs; i++) { -igt_output_t *output = &display->outputs[i]; +for_each_pipe (display, i) { +igt_pipe_t *pipe_obj = &display->pipes[i]; +igt_output_t *output =igt_pipe_get_output (pipe_obj); -if (!output->valid) -continue ; +if (output && output->valid) + valid_outs++; - valid_outs++; - ret =igt_output_commit (output, s, fail_on_error); + ret =igt_pipe_commit (pipe_obj, s, fail_on_error);CHECK_RETURN (ret, fail_on_error); }
@@ -2289,6 +2298,8 @@ igt_plane_t *igt_output_get_plane(igt_output_t *output, enum igt_plane plane)igt_pipe_t *pipe; pipe =igt_output_get_driving_pipe (output); +igt_assert (pipe); +return igt_pipe_get_plane (pipe, plane); }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 9/13 igt_kms: Change PIPE_ANY behavior to mean unassigned, v2.
In reply to Maarten LankhorstNone of the tests requires that a output bound to PIPE_ANY is assigned, so don't do it. Fix the display commit to iterate over crtc's instead oof outputs to properly disable pipes without outputs.
This also means that output->valid is only set after connecting a output to a pipe, so no longer depend on it in for_each_connected_output and similar macros.
New code should use PIPE_NONE to avoid confusion, PIPE_ANY is a deprecated alias, and will be removed.
Changes since v1:
- Split out the property changes.
- Split out the commit changes.
--- lib/igt_kms.c | 83 ++++++++++++++++++++++++++--------------------------------- lib/igt_kms.h | 18 +++++++++++-- 2 files changed, 52 insertions(+), 49 deletions(-)
lib/igt_kms.c +36 -47
@@ -869,18 +869,20 @@ static bool _kmstest_connector_config(int drm_fd, uint32_t connector_id,*/ _kmstest_connector_config_crtc_mask (drm_fd, connector, config); +if (!kmstest_get_connector_default_mode (drm_fd, connector, + &config->default_mode)) + goto err3; + + config->connector = connector; + crtc_idx_mask &= config->valid_crtc_idx_mask;if (!crtc_idx_mask) - goto err3; +/* Keep config->connector */ + goto err2; config->pipe =ffs (crtc_idx_mask) -1 ; -if (!kmstest_get_connector_default_mode (drm_fd, connector, - &config->default_mode)) - goto err3; - config->encoder =_kmstest_connector_config_find_encoder (drm_fd, connector, config->pipe); - config->connector = connector; config->crtc =drmModeGetCrtc (drm_fd, resources->crtcs[config->pipe]);drmModeFreeResources (resources);
@@ -940,8 +942,13 @@ bool kmstest_probe_connector_config(int drm_fd, uint32_t connector_id,void kmstest_free_connector_config (struct kmstest_connector_config *config) {drmModeFreeCrtc (config->crtc); + config->crtc =NULL ; +drmModeFreeEncoder (config->encoder); + config->encoder =NULL ; +drmModeFreeConnector (config->connector); + config->connector =NULL ; }/**
@@ -1197,8 +1204,7 @@ static void igt_output_refresh(igt_output_t *output)/* we mask out the pipes already in use */ crtc_idx_mask = output->pending_crtc_idx_mask & ~display->pipes_in_use; -if (output->valid) -kmstest_free_connector_config (&output->config); +kmstest_free_connector_config (&output->config); ret = kmstest_get_connector_config(display->drm_fd, output->id,
@@ -1209,19 +1215,19 @@ static void igt_output_refresh(igt_output_t *output)else output->valid = false; -if (!output->valid) -return ; - -if (output->use_override_mode) - output->config.default_mode = output->override_mode; - -if (!output->name) { +if (!output->name && output->config.connector) {drmModeConnector *c = output->config.connector;igt_assert_neq (asprintf (&output->name,"%s-%d" ,kmstest_connector_type_str (c->connector_type), c->connector_type_id),-1 ); } +if (!output->valid) +return ; + +if (output->use_override_mode) + output->config.default_mode = output->override_mode; +LOG (display,"%s: Selecting pipe %s\n" , output->name,kmstest_pipe_name (output->config.pipe));
@@ -1465,10 +1471,10 @@ void igt_display_init(igt_display_t *display, int drm_fd)igt_output_t *output = &display->outputs[i];/* -* We're free to select any pipe to drive that output until -* a constraint is set with igt_output_set_pipe(). +* We don't assign each output a pipe unless +* a pipe is set with igt_output_set_pipe(). */ - output->pending_crtc_idx_mask =-1UL ; + output->pending_crtc_idx_mask =0 ; output->id = resources->connectors[i]; output->display = display;
@@ -1537,7 +1543,7 @@ static void igt_display_refresh(igt_display_t *display)for (i =0 ; i < display->n_outputs; i++) {igt_output_t *a = &display->outputs[i]; -if (a->pending_crtc_idx_mask ==-1UL ) +if (!a->pending_crtc_idx_mask)continue ;for (j =0 ; j < display->n_outputs; j++) {
@@ -1546,9 +1552,6 @@ static void igt_display_refresh(igt_display_t *display)if (i == j)continue ; -if (b->pending_crtc_idx_mask ==-1UL ) -continue ; - igt_assert_f(a->pending_crtc_idx_mask != b->pending_crtc_idx_mask, "%s and %s are both trying to use pipe %s\n",
@@ -1557,25 +1560,9 @@ static void igt_display_refresh(igt_display_t *display) } } -/* -* The pipe allocation has to be done in two phases: -* - first, try to satisfy the outputs where a pipe has been specified -* - then, allocate the outputs with PIPE_ANY -*/ -for (i =0 ; i < display->n_outputs; i++) { -igt_output_t *output = &display->outputs[i]; - -if (output->pending_crtc_idx_mask ==-1UL ) -continue ; - -igt_output_refresh (output); - }for (i =0 ; i < display->n_outputs; i++) {igt_output_t *output = &display->outputs[i]; -if (output->pending_crtc_idx_mask !=-1UL ) -continue ; -igt_output_refresh (output); } }
@@ -1585,12 +1572,11 @@ static igt_pipe_t *igt_output_get_driving_pipe(igt_output_t *output)igt_display_t *display = output->display;enum pipe pipe; -if (output->pending_crtc_idx_mask ==-1UL ) { +if (!output->pending_crtc_idx_mask) {/* -* The user hasn't specified a pipe to use, take the one -* configured by the last refresh() +* The user hasn't specified a pipe to use, return none. */ - pipe = output->config.pipe; +return NULL ; }else {/* * Otherwise, return the pending pipe (ie the pipe that should
@@ -1623,11 +1609,14 @@ static igt_plane_t *igt_pipe_get_plane(igt_pipe_t *pipe, enum igt_plane plane)static igt_output_t *igt_pipe_get_output (igt_pipe_t *pipe) {igt_display_t *display = pipe->display; -igt_output_t *output; +int i; + +for (i =0 ; i < display->n_outputs; i++) { +igt_output_t *output = &display->outputs[i]; -for_each_connected_output (display, output) -if (output->config.pipe == pipe->pipe) +if (output->pending_crtc_idx_mask == (1 << pipe->pipe))return output; + }return NULL ; }
@@ -2283,9 +2272,9 @@ void igt_output_set_pipe(igt_output_t *output, enum pipe pipe) {igt_display_t *display = output->display; -if (pipe ==PIPE_ANY ) { +if (pipe ==PIPE_NONE ) {LOG (display,"%s: set_pipe(any)\n" ,igt_output_name (output)); - output->pending_crtc_idx_mask =-1UL ; + output->pending_crtc_idx_mask =0 ; }else {LOG (display,"%s: set_pipe(%s)\n" ,igt_output_name (output),kmstest_pipe_name (pipe));
lib/igt_kms.h +16 -2
@@ -334,17 +334,31 @@ void igt_fb_set_size(struct igt_fb *fb, igt_plane_t *plane,void igt_wait_for_vblank (int drm_fd,enum pipe pipe); +static inline bool igt_output_is_connected (igt_output_t *output) +{ +/* Something went wrong during probe? */ +if (!output->config.connector) +return false; + +if (output->config.connector->connection ==DRM_MODE_CONNECTED ) +return true; + +return false; +} +static inline bool igt_pipe_connector_valid (enum pipe pipe,igt_output_t *output) { -return output->valid && (output->config.valid_crtc_idx_mask & (1 << pipe)); +return igt_output_is_connected (output) && + (output->config.valid_crtc_idx_mask & (1 << pipe)); }#define for_each_if (condition) if (!(condition)) {} else#define for_each_connected_output (display, output) \ for (int i__ = 0; i__ < (display)->n_outputs; i__++) \ - for_each_if (((output = &(display)->outputs[i__]), output->valid)) + for_each_if (((output = &(display)->outputs[i__]), \ + igt_output_is_connected(output)))#define for_each_pipe (display, pipe) \ for (pipe = 0; pipe < igt_display_get_n_pipes(display); pipe++) \
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 10/13 igt_kms: Handle atomic pipe properties better.
In reply to Maarten LankhorstMove properties to the pipe, they don't belong in the output and make atomic commit use the pipes for crtc properties.
--- lib/igt_kms.c | 98 +++++++++++++++++++++++++++++------------------------------ lib/igt_kms.h | 12 +++++--- 2 files changed, 55 insertions(+), 55 deletions(-)
lib/igt_kms.c +48 -50
@@ -213,8 +213,7 @@ igt_atomic_fill_plane_props(igt_display_t *display, igt_plane_t *plane,* config->atomic_props_crtc and config->atomic_props_connector. */ static void -igt_atomic_fill_props (igt_display_t *display,igt_output_t *output, -int num_crtc_props,const char **crtc_prop_names, +igt_atomic_fill_connector_props (igt_display_t *display,igt_output_t *output,int num_connector_props,const char **conn_prop_names) {drmModeObjectPropertiesPtr props;
@@ -222,18 +221,18 @@ igt_atomic_fill_props(igt_display_t *display, igt_output_t *output, fd = display->drm_fd; - props =drmModeObjectGetProperties (fd, output->config.crtc->crtc_id,DRM_MODE_OBJECT_CRTC ); + props =drmModeObjectGetProperties (fd, output->config.connector->connector_id,DRM_MODE_OBJECT_CONNECTOR );igt_assert (props);for (i =0 ; i < props->count_props; i++) {drmModePropertyPtr prop =drmModeGetProperty (fd, props->props[i]); -for (j =0 ; j < num_crtc_props; j++) { -if (strcmp (prop->name, crtc_prop_names[j]) !=0 ) +for (j =0 ; j < num_connector_props; j++) { +if (strcmp (prop->name, conn_prop_names[j]) !=0 )continue ; - output->config.atomic_props_crtc[j] = props->props[i]; + output->config.atomic_props_connector[j] = props->props[i];break ; }
@@ -241,19 +240,29 @@ igt_atomic_fill_props(igt_display_t *display, igt_output_t *output, }drmModeFreeObjectProperties (props); - props =NULL ; - props =drmModeObjectGetProperties (fd, output->config.connector->connector_id,DRM_MODE_OBJECT_CONNECTOR ); +} + +static void +igt_atomic_fill_pipe_props (igt_display_t *display,igt_pipe_t *pipe, +int num_crtc_props,const char **crtc_prop_names) +{ +drmModeObjectPropertiesPtr props; +int i, j, fd; + + fd = display->drm_fd; + + props =drmModeObjectGetProperties (fd, pipe->crtc_id,DRM_MODE_OBJECT_CRTC );igt_assert (props);for (i =0 ; i < props->count_props; i++) {drmModePropertyPtr prop =drmModeGetProperty (fd, props->props[i]); -for (j =0 ; j < num_connector_props; j++) { -if (strcmp (prop->name, conn_prop_names[j]) !=0 ) +for (j =0 ; j < num_crtc_props; j++) { +if (strcmp (prop->name, crtc_prop_names[j]) !=0 )continue ; - output->config.atomic_props_connector[j] = props->props[i]; + pipe->atomic_props_crtc[j] = props->props[i];break ; }
@@ -261,7 +270,6 @@ igt_atomic_fill_props(igt_display_t *display, igt_output_t *output, }drmModeFreeObjectProperties (props); - }const unsigned char *igt_kms_get_alt_edid (void )
@@ -1222,6 +1230,9 @@ static void igt_output_refresh(igt_output_t *output) -1); } +igt_atomic_fill_connector_props (display, output, +IGT_NUM_CONNECTOR_PROPS , igt_connector_prop_names); +if (!output->valid)return ;
@@ -1232,8 +1243,6 @@ static void igt_output_refresh(igt_output_t *output) kmstest_pipe_name(output->config.pipe)); display->pipes_in_use |=1 << output->config.pipe; -igt_atomic_fill_props (display, output,IGT_NUM_CRTC_PROPS , igt_crtc_prop_names, -IGT_NUM_CONNECTOR_PROPS , igt_connector_prop_names); } static bool
@@ -1359,6 +1368,8 @@ void igt_display_init(igt_display_t *display, int drm_fd)NULL , NULL); +igt_atomic_fill_pipe_props (display, pipe,IGT_NUM_CRTC_PROPS , igt_crtc_prop_names); +/* add the planes that can be used with that pipe */ for (j =0 ; j < plane_resources->count_planes; j++) {drmModePlane *drm_plane;
@@ -1660,11 +1671,10 @@ static uint32_t igt_plane_get_fb_gem_handle(igt_plane_t *plane)* Add position and fb changes of a plane to the atomic property set */ static void -igt_atomic_prepare_plane_commit (igt_plane_t *plane,igt_output_t *output, +igt_atomic_prepare_plane_commit (igt_plane_t *plane,igt_pipe_t *pipe,drmModeAtomicReq *req) { - -igt_display_t *display = output->display; +igt_display_t *display = pipe->display;uint32_t fb_id, crtc_id;igt_assert (plane->drm_plane);
@@ -1674,12 +1684,11 @@ igt_atomic_prepare_plane_commit(igt_plane_t *plane, igt_output_t *output, !plane->rotation_changed); fb_id =igt_plane_get_fb_id (plane); - crtc_id = output->config.crtc->crtc_id; + crtc_id = pipe->crtc_id;LOG (display, -"%s: populating plane data: %s.%d, fb %u\n" , -igt_output_name (output), -kmstest_pipe_name (output->config.pipe), +"populating plane data: %s.%d, fb %u\n" , +kmstest_pipe_name (pipe->pipe), plane->index, fb_id);
@@ -2040,21 +2049,15 @@ static int igt_pipe_commit(igt_pipe_t *pipe,/* * Add crtc property changes to the atomic property set */ -static void igt_atomic_prepare_crtc_commit (igt_output_t *output,drmModeAtomicReq *req) +static void igt_atomic_prepare_crtc_commit (igt_pipe_t *pipe_obj,drmModeAtomicReq *req) { - -igt_pipe_t *pipe_obj =igt_output_get_driving_pipe (output); - -if (!pipe_obj) -return ; -if (pipe_obj->background_changed) -igt_atomic_populate_crtc_req (req, output,IGT_CRTC_BACKGROUND , pipe_obj->background); +igt_atomic_populate_crtc_req (req, pipe_obj,IGT_CRTC_BACKGROUND , pipe_obj->background);if (pipe_obj->color_mgmt_changed) { -igt_atomic_populate_crtc_req (req, output,IGT_CRTC_DEGAMMA_LUT , pipe_obj->degamma_blob); -igt_atomic_populate_crtc_req (req, output,IGT_CRTC_CTM , pipe_obj->ctm_blob); -igt_atomic_populate_crtc_req (req, output,IGT_CRTC_GAMMA_LUT , pipe_obj->gamma_blob); +igt_atomic_populate_crtc_req (req, pipe_obj,IGT_CRTC_DEGAMMA_LUT , pipe_obj->degamma_blob); +igt_atomic_populate_crtc_req (req, pipe_obj,IGT_CRTC_CTM , pipe_obj->ctm_blob); +igt_atomic_populate_crtc_req (req, pipe_obj,IGT_CRTC_GAMMA_LUT , pipe_obj->gamma_blob); }/*
@@ -2088,42 +2091,37 @@ static void igt_atomic_prepare_connector_commit(igt_output_t *output, drmModeAtostatic int igt_atomic_commit (igt_display_t *display) { -int ret =0 ; +int ret =0 , i; +enum pipe pipe;drmModeAtomicReq *req;igt_output_t *output; +if (display->is_atomic !=1 )return -1 ; req =drmModeAtomicAlloc ();drmModeAtomicSetCursor (req,0 ); -for_each_connected_output (display, output) { -igt_pipe_t *pipe_obj; +for_each_pipe (display, pipe) { +igt_pipe_t *pipe_obj = &display->pipes[pipe];igt_plane_t *plane; -enum pipe pipe;/* * Add CRTC Properties to the property set */ -igt_atomic_prepare_crtc_commit (output, req); - -/* -* Add Connector Properties to the property set -*/ -igt_atomic_prepare_connector_commit (output, req); - - - pipe_obj =igt_output_get_driving_pipe (output); -if (!pipe_obj) -continue ; - - pipe = pipe_obj->pipe; +igt_atomic_prepare_crtc_commit (pipe_obj, req);for_each_plane_on_pipe (display, pipe, plane) { -igt_atomic_prepare_plane_commit (plane, output, req); +igt_atomic_prepare_plane_commit (plane, pipe_obj, req); } } +for (i =0 ; i < display->n_outputs; i++) { + output = &display->outputs[i]; + +igt_atomic_prepare_connector_commit (output, req); + } + ret =drmModeAtomicCommit (display->drm_fd, req,0 ,NULL );drmModeAtomicFree (req);return ret;
lib/igt_kms.h +7 -5
@@ -117,7 +117,6 @@ struct kmstest_connector_config {bool connector_scaling_mode_changed;uint64_t connector_dpms;bool connector_dpms_changed; -uint32_t atomic_props_crtc[IGT_NUM_CRTC_PROPS ];uint32_t atomic_props_connector[IGT_NUM_CONNECTOR_PROPS ];int pipe;unsigned valid_crtc_idx_mask;
@@ -257,6 +256,9 @@ struct igt_pipe {bool enabled;int n_planes;igt_plane_t planes[IGT_MAX_PLANES ]; + +uint32_t atomic_props_crtc[IGT_NUM_CRTC_PROPS ]; +uint64_t background;/* Background color MSB BGR 16bpc LSB */ uint32_t background_changed : 1;uint32_t background_property;
@@ -395,13 +397,13 @@ static inline bool igt_pipe_connector_valid(enum pipe pipe,/** * igt_atomic_populate_crtc_req: * @req: A pointer to drmModeAtomicReq -* @output: A pointer igt_output_t +* @pipe: A pointer igt_pipe_t * @prop: one of igt_atomic_crtc_properties * @value: the value to add */ -#define igt_atomic_populate_crtc_req (req, output, prop, value) \ - igt_assert_lt(0, drmModeAtomicAddProperty(req, output->config.crtc->crtc_id,\ - output->config.atomic_props_crtc[prop], value)) +#define igt_atomic_populate_crtc_req (req, pipe, prop, value) \ + igt_assert_lt(0, drmModeAtomicAddProperty(req, pipe->crtc_id,\ + pipe->atomic_props_crtc[prop], value))/** * igt_atomic_populate_connector_req: * @req: A pointer to drmModeAtomicReq
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 11/13 igt_kms: Remove pan members from igt_plane, v2.
In reply to Maarten LankhorstThey're duplicates with src_x/y, so just use those.
Changes since v1:
- Fix order of parameters in calls to igt_fb_set_position.
--- lib/igt_kms.c | 24 ++++-------------------- lib/igt_kms.h | 4 ---- tests/kms_panel_fitting.c | 2 +- tests/kms_plane.c | 8 +++----- tests/kms_plane_scaling.c | 2 +- 5 files changed, 9 insertions(+), 31 deletions(-)
lib/igt_kms.c +4 -20
@@ -1915,7 +1915,7 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary,igt_assert (!primary->rotation_changed);if (!primary->fb_changed && !primary->position_changed && - !primary->size_changed && !primary->panning_changed) + !primary->size_changed)return 0 ; crtc_id = pipe->crtc_id;
@@ -1927,18 +1927,18 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary,if (fb_id) {LOG (display, -"%s: SetCrtc pipe %s, fb %u, panning (%d, %d), " +"%s: SetCrtc pipe %s, fb %u, src (%d, %d), " "mode %dx%d\n" ,igt_output_name (output),kmstest_pipe_name (pipe->pipe), fb_id, - primary->pan_x, primary->pan_y, + primary->src_x, primary->src_x, mode->hdisplay, mode->vdisplay); ret =drmModeSetCrtc (display->drm_fd, crtc_id, fb_id, - primary->pan_x, primary->pan_y, + primary->src_x, primary->src_x, &output->id,1 , mode);
@@ -1962,7 +1962,6 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary, primary->fb_changed = false; primary->position_changed = false; primary->size_changed = false; - primary->panning_changed = false;return 0 ; }
@@ -2408,21 +2407,6 @@ void igt_fb_set_size(struct igt_fb *fb, igt_plane_t *plane, plane->fb_changed = true; } -void igt_plane_set_panning (igt_plane_t *plane,int x,int y) -{ -igt_pipe_t *pipe = plane->pipe; -igt_display_t *display = pipe->display; - -LOG (display,"%s.%d: plane_set_panning(%d,%d)\n" , -kmstest_pipe_name (pipe->pipe), - plane->index, x, y); - - plane->pan_x = x; - plane->pan_y = y; - - plane->panning_changed = true; -} -static const char *rotation_name (igt_rotation_t rotation) {switch (rotation) {
lib/igt_kms.h +0 -4
@@ -220,7 +220,6 @@ typedef struct {/* state tracking */ unsigned int fb_changed : 1; unsigned int position_changed : 1; - unsigned int panning_changed : 1; unsigned int rotation_changed : 1; unsigned int size_changed : 1;/*
@@ -244,8 +243,6 @@ typedef struct {uint32_t src_w;uint32_t src_h; -/* panning offset within the fb */ -unsigned int pan_x, pan_y;igt_rotation_t rotation;uint32_t atomic_props_plane[IGT_NUM_PLANE_PROPS ]; } igt_plane_t;
@@ -326,7 +323,6 @@ void igt_pipe_set_gamma_lut(igt_pipe_t *pipe, void *ptr, size_t length);void igt_plane_set_fb (igt_plane_t *plane,struct igt_fb *fb);void igt_plane_set_position (igt_plane_t *plane,int x,int y);void igt_plane_set_size (igt_plane_t *plane,int w,int h); -void igt_plane_set_panning (igt_plane_t *plane,int x,int y);void igt_plane_set_rotation (igt_plane_t *plane,igt_rotation_t rotation);void igt_crtc_set_background (igt_pipe_t *pipe,uint64_t background); void igt_fb_set_position(struct igt_fb *fb, igt_plane_t *plane,
tests/kms_panel_fitting.c +1 -1
@@ -89,7 +89,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe, ret =drmModeSetCrtc (data->drm_fd, plane->pipe->crtc_id, data->fb_id1, - plane->pan_x, plane->pan_y, + plane->src_x, plane->src_y, &output->id,1 , mode);
tests/kms_plane.c +3 -5
@@ -321,11 +321,9 @@ test_plane_panning_with_output(data_t *data,igt_plane_set_fb (primary, &primary_fb);if (flags &TEST_PANNING_TOP_LEFT ) -igt_plane_set_panning (primary,0 ,0 ); +igt_fb_set_position (&primary_fb, primary,0 ,0 );else -igt_plane_set_panning (primary, mode->hdisplay, mode->vdisplay); - -igt_plane_set_position (primary,0 ,0 ); +igt_fb_set_position (&primary_fb, primary, mode->hdisplay, mode->vdisplay);igt_display_commit (&data->display);
@@ -343,7 +341,7 @@ test_plane_panning_with_output(data_t *data,/* reset states to neutral values, assumed by other tests */ igt_output_set_pipe (output,PIPE_ANY ); -igt_plane_set_panning (primary,0 ,0 ); +igt_fb_set_position (&primary_fb, primary,0 ,0 );test_fini (data); }
tests/kms_plane_scaling.c +1 -1
@@ -98,7 +98,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe, ret =drmModeSetCrtc (data->drm_fd, plane->pipe->crtc_id, data->fb_id1, - plane->pan_x, plane->pan_y, + plane->src_x, plane->src_y, &output->id,1 , mode);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 12/13 igt_kms: Clear all _changed members centrally, v2.
In reply to Maarten LankhorstThis will make it easier to support TEST_ONLY commits.
Changes since v1:
- Fix color_mgmt_changed and background_changed being cleared for legacy too. (anderco)
--- lib/igt_kms.c | 82 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 36 deletions(-)
lib/igt_kms.c +46 -36
@@ -1727,11 +1727,6 @@ igt_atomic_prepare_plane_commit(igt_plane_t *plane, igt_pipe_t *pipe,if (plane->rotation_changed)igt_atomic_populate_plane_req (req, plane,IGT_PLANE_ROTATION , plane->rotation); - - plane->fb_changed = false; - plane->position_changed = false; - plane->size_changed = false; - plane->rotation_changed = false; }
@@ -1819,15 +1814,10 @@ static int igt_drm_plane_commit(igt_plane_t *plane,CHECK_RETURN (ret, fail_on_error); } - plane->fb_changed = false; - plane->position_changed = false; - plane->size_changed = false; -if (plane->rotation_changed) { ret =igt_plane_set_property (plane, plane->rotation_property, plane->rotation); - plane->rotation_changed = false;CHECK_RETURN (ret, fail_on_error); }
@@ -1872,8 +1862,6 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor, }CHECK_RETURN (ret, fail_on_error); - - cursor->fb_changed = false; }if (cursor->position_changed) {
@@ -1887,8 +1875,6 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor, ret =drmModeMoveCursor (display->drm_fd, crtc_id, x, y);CHECK_RETURN (ret, fail_on_error); - - cursor->position_changed = false; }return 0 ;
@@ -1915,7 +1901,7 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary,igt_assert (!primary->rotation_changed);if (!primary->fb_changed && !primary->position_changed && - !primary->size_changed) + !primary->size_changed)return 0 ; crtc_id = pipe->crtc_id;
@@ -1959,9 +1945,6 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary,CHECK_RETURN (ret, fail_on_error); primary->pipe->enabled = (fb_id !=0 ); - primary->fb_changed = false; - primary->position_changed = false; - primary->size_changed = false;return 0 ; }
@@ -1982,7 +1965,7 @@ static int igt_plane_commit(igt_plane_t *plane,return igt_primary_plane_commit_legacy (plane, pipe, fail_on_error); }else { -return igt_drm_plane_commit (plane, pipe, fail_on_error); +return igt_drm_plane_commit (plane, pipe, fail_on_error); } }
@@ -2008,8 +1991,6 @@ static int igt_pipe_commit(igt_pipe_t *pipe,if (pipe->background_changed) {igt_crtc_set_property (pipe, pipe->background_property, pipe->background); - - pipe->background_changed = false; }if (pipe->color_mgmt_changed) {
@@ -2019,8 +2000,6 @@ static int igt_pipe_commit(igt_pipe_t *pipe, pipe->ctm_blob);igt_crtc_set_property (pipe, pipe->gamma_property, pipe->gamma_blob); - - pipe->color_mgmt_changed = false; }for (i =0 ; i < pipe->n_planes; i++) {
@@ -2140,35 +2119,66 @@ static int do_display_commit(igt_display_t *display, bool fail_on_error) {int i, ret; -int valid_outs =0 ; - +enum pipe pipe;LOG_INDENT (display,"commit" );igt_display_refresh (display);if (s ==COMMIT_ATOMIC ) { - ret =igt_atomic_commit (display); +CHECK_RETURN (ret, fail_on_error); -return 0 ; + }else { +int valid_outs =0 ; - } +for_each_pipe (display, pipe) { +igt_pipe_t *pipe_obj = &display->pipes[pipe]; +igt_output_t *output =igt_pipe_get_output (pipe_obj); -for_each_pipe (display, i) { -igt_pipe_t *pipe_obj = &display->pipes[i]; -igt_output_t *output =igt_pipe_get_output (pipe_obj); +if (output && output->valid) + valid_outs++; -if (output && output->valid) - valid_outs++; + ret =igt_pipe_commit (pipe_obj, s, fail_on_error); +CHECK_RETURN (ret, fail_on_error); + } - ret =igt_pipe_commit (pipe_obj, s, fail_on_error);CHECK_RETURN (ret, fail_on_error); + +if (valid_outs ==0 ) { +LOG_UNINDENT (display); + +return -1 ; + } }LOG_UNINDENT (display); -if (valid_outs ==0 ) -return -1 ; +if (ret) +return ret; + +for_each_pipe (display, pipe) { +igt_pipe_t *pipe_obj = &display->pipes[pipe]; +igt_plane_t *plane; + + pipe_obj->color_mgmt_changed = false; + pipe_obj->background_changed = false; + +for_each_plane_on_pipe (display, pipe, plane) { + plane->fb_changed = false; + plane->position_changed = false; + plane->size_changed = false; + +if (s !=COMMIT_LEGACY || !(plane->is_primary || plane->is_cursor)) + plane->rotation_changed = false; + } + } + +for (i =0 ; i < display->n_outputs && s ==COMMIT_ATOMIC ; i++) { +igt_output_t *output = &display->outputs[i]; + + output->config.connector_dpms_changed = false; + output->config.connector_scaling_mode_changed = false; + }igt_debug_wait_for_keypress ("modeset" );
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 13/13 igt_kms: Add modeset support to atomic commits.
In reply to Maarten LankhorstAdd the correct properties, add pipe_changed and mode_changed and go!
--- lib/igt_kms.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++------------ lib/igt_kms.h | 10 +++-- 2 files changed, 105 insertions(+), 29 deletions(-)
lib/igt_kms.c +98 -26
@@ -167,11 +167,13 @@ static const char *igt_crtc_prop_names[IGT_NUM_CRTC_PROPS] = {"CTM" ,"DEGAMMA_LUT" ,"GAMMA_LUT" , +"MODE_ID" , + "ACTIVE" };static const char *igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS ] = {"scaling mode" , -"DPMS" +"CRTC_ID" };/*
@@ -312,6 +314,9 @@ const char *kmstest_pipe_name(enum pipe pipe) {const char *str[] = {"A" ,"B" ,"C" }; +if (pipe ==PIPE_NONE ) +return "None" ; +if (pipe >2 )return "invalid" ;
@@ -841,6 +846,8 @@ static bool _kmstest_connector_config(int drm_fd, uint32_t connector_id,drmModeRes *resources;drmModeConnector *connector; + config->pipe =PIPE_NONE ; + resources =drmModeGetResources (drm_fd);if (!resources) {igt_warn ("drmModeGetResources failed" );
@@ -1230,8 +1237,9 @@ static void igt_output_refresh(igt_output_t *output) -1); } -igt_atomic_fill_connector_props (display, output, -IGT_NUM_CONNECTOR_PROPS , igt_connector_prop_names); +if (output->config.connector) +igt_atomic_fill_connector_props (display, output, +IGT_NUM_CONNECTOR_PROPS , igt_connector_prop_names);if (!output->valid)return ;
@@ -1465,8 +1473,13 @@ void igt_display_init(igt_display_t *display, int drm_fd) pipe->n_planes = n_planes; +for_each_plane_on_pipe (display, i, plane) + plane->fb_changed = true; +/* make sure we don't overflow the plane array */ igt_assert_lte (pipe->n_planes,IGT_MAX_PLANES ); + + pipe->mode_changed = true; }/*
@@ -1490,6 +1503,8 @@ void igt_display_init(igt_display_t *display, int drm_fd) output->display = display;igt_output_refresh (output); + + output->config.pipe_changed = true; }drmModeFreePlaneResources (plane_resources);
@@ -2023,6 +2038,22 @@ static int igt_pipe_commit(igt_pipe_t *pipe,return 0 ; } +static void +igt_pipe_replace_blob (igt_pipe_t *pipe,uint64_t *blob,void *ptr,size_t length) +{ +igt_display_t *display = pipe->display; +uint32_t blob_id =0 ; + +if (*blob !=0 ) +igt_assert (drmModeDestroyPropertyBlob (display->drm_fd, + *blob) ==0 ); + +if (length >0 ) +igt_assert (drmModeCreatePropertyBlob (display->drm_fd, + ptr, length, &blob_id) ==0 ); + + *blob = blob_id; +}/* * Add crtc property changes to the atomic property set
@@ -2038,6 +2069,28 @@ static void igt_atomic_prepare_crtc_commit(igt_pipe_t *pipe_obj, drmModeAtomicReigt_atomic_populate_crtc_req (req, pipe_obj,IGT_CRTC_GAMMA_LUT , pipe_obj->gamma_blob); } +if (pipe_obj->mode_changed) { +igt_output_t *output =igt_pipe_get_output (pipe_obj); + +if (!output) { +igt_pipe_replace_blob (pipe_obj, &pipe_obj->mode_blob,NULL ,0 ); + +LOG (pipe_obj->display,"%s: Setting NULL mode\n" , +kmstest_pipe_name (pipe_obj->pipe)); + }else { +drmModeModeInfo *mode =igt_output_get_mode (output); + +igt_pipe_replace_blob (pipe_obj, &pipe_obj->mode_blob, mode,sizeof (*mode)); + +LOG (pipe_obj->display,"%s: Setting mode %s from %s\n" , +kmstest_pipe_name (pipe_obj->pipe), + mode->name,igt_output_name (output)); + } + +igt_atomic_populate_crtc_req (req, pipe_obj,IGT_CRTC_MODE_ID , pipe_obj->mode_blob); +igt_atomic_populate_crtc_req (req, pipe_obj,IGT_CRTC_ACTIVE , !!output); + } +/* * TODO: Add all crtc level properties here */
@@ -2054,8 +2107,14 @@ static void igt_atomic_prepare_connector_commit(igt_output_t *output, drmModeAtoif (config->connector_scaling_mode_changed)igt_atomic_populate_connector_req (req, output,IGT_CONNECTOR_SCALING_MODE , config->connector_scaling_mode); -if (config->connector_dpms_changed) -igt_atomic_populate_connector_req (req, output,IGT_CONNECTOR_DPMS , config->connector_dpms); +if (config->pipe_changed) { +uint32_t crtc_id =0 ; + +if (output->config.pipe !=PIPE_NONE ) + crtc_id = output->config.crtc->crtc_id; + +igt_atomic_populate_connector_req (req, output,IGT_CONNECTOR_CRTC_ID , crtc_id); + }/* * TODO: Add all other connector level properties here */
@@ -2097,10 +2156,17 @@ static int igt_atomic_commit(igt_display_t *display)for (i =0 ; i < display->n_outputs; i++) { output = &display->outputs[i]; +if (!output->config.connector) +continue ; + +LOG (display,"%s: preparing atomic, pipe: %s\n" , +igt_output_name (output), +kmstest_pipe_name (output->config.pipe)); +igt_atomic_prepare_connector_commit (output, req); } - ret =drmModeAtomicCommit (display->drm_fd, req,0 ,NULL ); + ret =drmModeAtomicCommit (display->drm_fd, req,DRM_MODE_ATOMIC_ALLOW_MODESET ,NULL );drmModeAtomicFree (req);return ret;
@@ -2163,6 +2229,9 @@ static int do_display_commit(igt_display_t *display, pipe_obj->color_mgmt_changed = false; pipe_obj->background_changed = false; +if (s !=COMMIT_UNIVERSAL ) + pipe_obj->mode_changed = false; +for_each_plane_on_pipe (display, pipe, plane) { plane->fb_changed = false; plane->position_changed = false;
@@ -2173,11 +2242,14 @@ static int do_display_commit(igt_display_t *display, } } -for (i =0 ; i < display->n_outputs && s ==COMMIT_ATOMIC ; i++) { +for (i =0 ; i < display->n_outputs; i++) {igt_output_t *output = &display->outputs[i]; - output->config.connector_dpms_changed = false; - output->config.connector_scaling_mode_changed = false; +if (s !=COMMIT_UNIVERSAL ) + output->config.pipe_changed = false; + +if (s ==COMMIT_ATOMIC ) + output->config.connector_scaling_mode_changed = false; }igt_debug_wait_for_keypress ("modeset" );
@@ -2271,13 +2343,25 @@ drmModeModeInfo *igt_output_get_mode(igt_output_t *output)*/ void igt_output_override_mode (igt_output_t *output,drmModeModeInfo *mode) { +igt_pipe_t *pipe =igt_output_get_driving_pipe (output); + output->override_mode = *mode; output->use_override_mode = true; + +if (pipe) + pipe->mode_changed = true; }void igt_output_set_pipe (igt_output_t *output,enum pipe pipe) {igt_display_t *display = output->display; +igt_pipe_t *old_pipe; + +if (output->pending_crtc_idx_mask) { + old_pipe =igt_output_get_driving_pipe (output); + + old_pipe->mode_changed = true; + }if (pipe ==PIPE_NONE ) {LOG (display,"%s: set_pipe(any)\n" ,igt_output_name (output));
@@ -2286,7 +2370,12 @@ void igt_output_set_pipe(igt_output_t *output, enum pipe pipe)LOG (display,"%s: set_pipe(%s)\n" ,igt_output_name (output),kmstest_pipe_name (pipe)); output->pending_crtc_idx_mask =1 << pipe; + + display->pipes[pipe].mode_changed = true; } + +if (pipe != output->config.pipe) + output->config.pipe_changed = true; }igt_plane_t *igt_output_get_plane (igt_output_t *output,enum igt_plane plane)
@@ -2447,23 +2536,6 @@ void igt_plane_set_rotation(igt_plane_t *plane, igt_rotation_t rotation) plane->rotation_changed = true; } -static void -igt_pipe_replace_blob (igt_pipe_t *pipe,uint64_t *blob,void *ptr,size_t length) -{ -igt_display_t *display = pipe->display; -uint32_t blob_id =0 ; - -if (*blob !=0 ) -igt_assert (drmModeDestroyPropertyBlob (display->drm_fd, - *blob) ==0 ); - -if (length >0 ) -igt_assert (drmModeCreatePropertyBlob (display->drm_fd, - ptr, length, &blob_id) ==0 ); - - *blob = blob_id; -} -void igt_pipe_set_degamma_lut (igt_pipe_t *pipe,void *ptr,size_t length) {
lib/igt_kms.h +7 -3
@@ -99,12 +99,14 @@ enum igt_atomic_crtc_properties {IGT_CRTC_CTM ,IGT_CRTC_DEGAMMA_LUT ,IGT_CRTC_GAMMA_LUT , +IGT_CRTC_MODE_ID , +IGT_CRTC_ACTIVE , IGT_NUM_CRTC_PROPS };enum igt_atomic_connector_properties {IGT_CONNECTOR_SCALING_MODE =0 , -IGT_CONNECTOR_DPMS , +IGT_CONNECTOR_CRTC_ID ,IGT_NUM_CONNECTOR_PROPS };
@@ -115,8 +117,7 @@ struct kmstest_connector_config {drmModeModeInfo default_mode;uint64_t connector_scaling_mode;bool connector_scaling_mode_changed; -uint64_t connector_dpms; -bool connector_dpms_changed; +bool pipe_changed;uint32_t atomic_props_connector[IGT_NUM_CONNECTOR_PROPS ];int pipe;unsigned valid_crtc_idx_mask;
@@ -269,6 +270,9 @@ struct igt_pipe { uint32_t color_mgmt_changed : 1;uint32_t crtc_id; + +uint64_t mode_blob; +bool mode_changed; }; typedef struct {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx