Skip to contentSkip to conversation

Add support for atomic modeset to IGT.

PATCH Superseded Maarten Lankhorst 3 participants 32 messages Jul 6, 2016 – Jul 25, 2016 Library code

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 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 first series:
- Silence compiler warning about unused variable 'encoder'.
- Update pan members patch to fix ordering.
- Clean up more tests that rely on outputs with unassigned pipes having filled in a default pipe.
- Add kms_atomic_transition
- Add atomic test for fastset panel fitting changes, to ensure no modeset's done. Removing the call to intel_update_pipe_config in the kernel caused fifo underruns and hw state validator failures, so I think this test works as intended. :-)

Maarten Lankhorst (15):
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.
igt_kms: Make PIPE_ANY a alias for PIPE_NONE
tests/kms: Clean up more users of unassigned pipes.
igt_kms: Change PIPE_ANY behavior to mean unassigned
igt_kms: Handle atomic pipe properties better.
igt_kms: Remove pan members from igt_plane, v2.
igt_kms: Clear all _changed members centrally
igt_kms: Add modeset support to atomic commits.
tests: Add kms_rmfb test.
tests: Add kms_atomic_transition
igt_kms: Add more apis for panel fitting test.
igt_kms: Allow disabling previous override mode
kms_panel_fitting: Add tests for fastboot.

 lib/igt_kms.c                     | 698 +++++++++++++++++++++++---------------
 lib/igt_kms.h                     |  51 ++-
 tests/Makefile.sources            |   2 +
 tests/kms_atomic_transition.c     | 189 +++++++++++
 tests/kms_crtc_background_color.c |   3 +-
 tests/kms_flip_tiling.c           |  50 +--
 tests/kms_panel_fitting.c         | 108 +++++-
 tests/kms_plane.c                 |   8 +-
 tests/kms_plane_scaling.c         |   7 +-
 tests/kms_psr_sink_crc.c          |   5 +-
 tests/kms_rmfb.c                  | 171 ++++++++++
 tests/testdisplay.c               |   4 +-
 12 files changed, 954 insertions(+), 342 deletions(-)
 create mode 100644 tests/kms_atomic_transition.c
 create mode 100644 tests/kms_rmfb.c
Signature · 6 lines
2.5.5

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

PATCH v2 1/15 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
index 8f9ac2da43ff..c16e40ea273b 100644
@@ -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
index 829615d70874..4882075430c8 100644
@@ -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
index 45280e4cad82..a974f42be9f1 100644
@@ -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.5.5

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

Re: [PATCH i-g-t v2 01/15] igt_kms: Remove kmstest_connector_config.crtc_idx

Quoted 4 lines · Maarten Lankhorst

This is the same as using config.pipe because the order of crtcs will never change.

In the interest of generic igt, I'm somewhat inclined to instead nuke crtc->pipe (it's an Intelism) instead of crtc->idx. I also thought there's some work from Robert Foss (still uncommented) to reorganize this. -Daniel

Quoted 69 lines
---
 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
index 8f9ac2da43ff..c16e40ea273b 100644
@@ -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
index 829615d70874..4882075430c8 100644
@@ -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
index 45280e4cad82..a974f42be9f1 100644
@@ -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.5.5

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Re: [PATCH i-g-t v2 01/15] igt_kms: Remove kmstest_connector_config.crtc_idx

Hey,

Op 13-07-16 om 14:13 schreef Daniel Vetter:

Quoted 8 lines · Maarten Lankhorst
Quoted 4 lines

This is the same as using config.pipe because the order of crtcs will never change.

In the interest of generic igt, I'm somewhat inclined to instead nuke crtc->pipe (it's an Intelism) instead of crtc->idx. I also thought there's some work from Robert Foss (still uncommented) to reorganize this.

config->pipe is mostly used as argument to kmstest_pipe_name, so I think this commit is fine. it's named display->pipes in the tests, not display->crtcs.

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

#4 lore raw

PATCH v2 2/15 igt_kms: Find optimal encoder only after selecting pipe

In reply to Maarten Lankhorst

This 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
index c16e40ea273b..ce8aa2455348 100644
@@ -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.5.5

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v2 2/15
#5 lore raw

Re: [PATCH i-g-t v2 02/15] igt_kms: Find optimal encoder only after selecting pipe

Quoted 87 lines · Maarten Lankhorst

This 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 +0 -0
index c16e40ea273b..ce8aa2455348 100644
@@ -761,6 +761,59 @@ bool kmstest_get_connector_default_mode(int drm_fd,
 drmModeConnector *connector,
  	return true;
  }

lib/igt_kms.c +13 -0
+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-
Quoted 1 line

encoders[i]);

lib/igt_kms.c +16 -0
+
+		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)

lib/igt_kms.c +5 -0
+{
+	int i;
+
+	for (i = 0; i < connector->count_encoders; i++) {
+		drmModeEncoder *encoder = drmModeGetEncoder(drm_fd,

connector->encoders[i]);

lib/igt_kms.c +19 -0
+
+		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

lib/igt_kms.c +0 -2
@@ -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) {

lib/igt_kms.c static bool _kmstest_connector_config(int drm_fd, · line 823

Quoted 8 lines
lib/igt_kms.c +0 -4
@@ -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;

This patch looses the NULL check above, but if I understand correctly this can't happen anyway, since we would have bailed on a GetResources failure. So,

Quoted 53 lines
lib/igt_kms.c +1 -0
+	_kmstest_connector_config_crtc_mask(drm_fd, connector, config);

lib/igt_kms.c +0 -14
-		/* 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-
Quoted 1 line

possible_crtcs;

lib/igt_kms.c +0 -2
-
-			if (!found && (crtc_idx_mask & encoder-
Quoted 1 line

possible_crtcs & (1 << i))) {

lib/igt_kms.c +2 -8
-				found = encoder;
-				pipe = i;
-			} else
-				drmModeFreeEncoder(encoder);
-		}
-	}
-
-	if (!found)
+	crtc_idx_mask &= config->valid_crtc_idx_mask;
+	if (!crtc_idx_mask)

  goto err3;

lib/igt_kms.c +2 -0
+	config->pipe = ffs(crtc_idx_mask) - 1;
+

  if (!kmstest_get_connector_default_mode(drm_fd, connector, &config->default_mode))

lib/igt_kms.c +1 -1
-		goto err4;
+		goto err3;

lib/igt_kms.c +1 -0
+	config->encoder = _kmstest_connector_config_find_encoder(drm_fd,

connector, config->pipe);
  config->connector = connector;

lib/igt_kms.c +1 -3
-	config->encoder = found;
-	config->crtc = drmModeGetCrtc(drm_fd, resources->crtcs[pipe]);
-	config->pipe = pipe;
+	config->crtc = drmModeGetCrtc(drm_fd, resources->crtcs[config-
Quoted 1 line

pipe]);


  drmModeFreeResources(resources);

  return true;

lib/igt_kms.c +0 -2
-err4:
-	drmModeFreeEncoder(found);
Quoted 3 lines

 err3:
  drmModeFreeConnector(connector);
 err2:

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

#6 lore raw

PATCH v2 3/15 kms_psr_sink_crc: Use for_each_pipe_with_valid_output to find a valid config.

In reply to Maarten Lankhorst

This 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.

---
 tests/kms_psr_sink_crc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
tests/kms_psr_sink_crc.c +3 -2
index b18e426303e3..d7bce3bb7855 100644
@@ -103,15 +103,16 @@ 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)
 			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.5.5

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v2 3/15
#7 lore raw

Re: [PATCH i-g-t v2 03/15] kms_psr_sink_crc: Use for_each_pipe_with_valid_output to find a valid config.

Quoted 5 lines · Maarten Lankhorst

This 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.

Quoted 24 lines

---
 tests/kms_psr_sink_crc.c | 5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)
tests/kms_psr_sink_crc.c +1 -0
index b18e426303e3..d7bce3bb7855 100644
@@ -103,15 +103,16 @@ static void setup_output(data_t *data)
  {
  	igt_display_t *display = &data->display;
  	igt_output_t *output;
+	enum pipe pipe;

tests/kms_psr_sink_crc.c +1 -1
-	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) continue;

tests/kms_psr_sink_crc.c +1 -1
-		igt_output_set_pipe(output, PIPE_ANY);
+		igt_output_set_pipe(output, pipe);
Quoted 3 lines

  data->crtc_id = output->config.crtc->crtc_id; data->output = output;
  data->mode = igt_output_get_mode(output);

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

#8 lore raw

Re: [PATCH i-g-t v2 03/15] kms_psr_sink_crc: Use for_each_pipe_with_valid_output to find a valid config.

Quoted 8 lines · Ander Conselvan De Oliveira
Quoted 6 lines · Maarten Lankhorst

This 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.

Actually, kms_sink_crc_basic needs the same treatment.

Ander

Quoted 21 lines
Quoted 21 lines

---
 tests/kms_psr_sink_crc.c | 5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)
tests/kms_psr_sink_crc.c +1 -0
index b18e426303e3..d7bce3bb7855 100644
@@ -103,15 +103,16 @@ static void setup_output(data_t *data)
  {
  	igt_display_t *display = &data->display;
  	igt_output_t *output;
+	enum pipe pipe;

tests/kms_psr_sink_crc.c +1 -1
-	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 ||

Quoted 8 lines
Quoted 8 lines

      c->connection != DRM_MODE_CONNECTED) continue;

tests/kms_psr_sink_crc.c +1 -1
-		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);

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

#9 lore raw

Re: [PATCH i-g-t v2 03/15] kms_psr_sink_crc: Use for_each_pipe_with_valid_output to find a valid config.

Op 19-07-16 om 15:58 schreef Ander Conselvan De Oliveira:

Quoted 9 lines · Ander Conselvan De Oliveira
Quoted 7 lines · Maarten Lankhorst
Quoted 5 lines

This 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.

Actually, kms_sink_crc_basic needs the same treatment.

Indeed, how does this fixup look to the patch? Will probably send kms_sink_crc_basic out as separate patch. The DRM_MODE_CONNECTED check is implied by for_each_connected_output and for_each_pipe_with_valid_output, it can be killed.

tests/kms_psr_sink_crc.c +1 -2
index d7bce3bb7855..8aafedb03614 100644
@@ -108,8 +108,7 @@ static void setup_output(data_t *data)
 	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);

And for kms_sink_crc_basic:

tests/kms_sink_crc_basic.c +4 -4
index 9fac958f2142..c332eb1e39c2 100644
@@ -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);
 

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

#10 lore raw

Re: [PATCH i-g-t v2 03/15] kms_psr_sink_crc: Use for_each_pipe_with_valid_output to find a valid config.

Quoted 10 lines · Maarten Lankhorst

Op 19-07-16 om 15:58 schreef Ander Conselvan De Oliveira:

Quoted 9 lines · Ander Conselvan De Oliveira
Quoted 7 lines · Maarten Lankhorst
Quoted 5 lines

This 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.

Quoted 8 lines
Quoted 3 lines
Quoted 2 lines
Quoted 1 line

Actually, kms_sink_crc_basic needs the same treatment.

Indeed, how does this fixup look to the patch? Will probably send kms_sink_crc_basic out as separate patch.
The DRM_MODE_CONNECTED check is implied by for_each_connected_output and for_each_pipe_with_valid_output,
it can be killed.

True, kmstest_get_connector_config() already tests for that, so it is enough to check output->valid.

Quoted 38 lines
tests/kms_psr_sink_crc.c +0 -0
index d7bce3bb7855..8aafedb03614 100644
@@ -108,8 +108,7 @@ static void setup_output(data_t *data)
  	for_each_pipe_with_valid_output(display, pipe, output) {
  		drmModeConnectorPtr c = output->config.connector;

tests/kms_psr_sink_crc.c +1 -2
-		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);

And for kms_sink_crc_basic:

tests/kms_sink_crc_basic.c +1 -0
index 9fac958f2142..c332eb1e39c2 100644
@@ -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;

tests/kms_sink_crc_basic.c +1 -1
-	for_each_connected_output(display, output) {
+	for_each_pipe_with_valid_output(display, pipe, output) {

  drmModeConnectorPtr c = output->config.connector;

tests/kms_sink_crc_basic.c +1 -2
-		if (c->connector_type != DRM_MODE_CONNECTOR_eDP ||
-		    c->connection != DRM_MODE_CONNECTED)
+		if (c->connector_type != DRM_MODE_CONNECTOR_eDP)

  continue;

tests/kms_sink_crc_basic.c +1 -1
-		igt_output_set_pipe(output, PIPE_ANY);
+		igt_output_set_pipe(output, pipe);
Quoted 2 lines


  mode = igt_output_get_mode(output);

Both look good. Feel free to slap my R-b on it.

Ander

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

#11 lore raw

PATCH v2 4/15 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
index 4882075430c8..dc6be5e53b74 100644
@@ -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.5.5

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

PATCH v2 5/15 tests/kms: Clean up more users of unassigned pipes.

In reply to Maarten Lankhorst

Use for_each_pipe_with_valid_output instead.

---
 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
index b496625c1693..b97c1142df6e 100644
@@ -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
index b796c6812679..7c501fcdd3fb 100644
@@ -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
index ad5404d90bfa..39bb5e113411 100644
@@ -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.5.5

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

Re: [PATCH i-g-t v2 05/15] tests/kms: Clean up more users of unassigned pipes.

Quoted 25 lines · Maarten Lankhorst

Use for_each_pipe_with_valid_output instead.

---
 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 +0 -0
index b496625c1693..b97c1142df6e 100644
@@ -133,10 +133,9 @@ static void test_crtc_background(data_t *data)

igt_require(data->display.has_universal_planes);

tests/kms_crtc_background_color.c +1 -1
-	for_each_connected_output(display, output) {
+	for_each_pipe_with_valid_output(display, pipe, output) {

  igt_plane_t *plane;

tests/kms_crtc_background_color.c +0 -1
-		pipe = output->config.pipe;
Quoted 1 line

  igt_output_set_pipe(output, pipe);

Won't this cause the test to be executed more times? I.e., every output paired with every supported pipe vs. every output only with the pipe it is currently configured to use.

None of the changed tests are part of BAT, so I'm not sure we care about a potential increase in execution time, though. But maybe add a note in the commit message for future reference?

Ander

Quoted 203 lines

  plane = igt_output_get_plane(output, IGT_PLANE_PRIMARY);

tests/kms_flip_tiling.c +0 -0
index f58e65be61ee..cd2f510f1d45 100644
@@ -80,16 +80,15 @@ static void wait_for_pageflip(int fd)
  }


 static void

tests/kms_flip_tiling.c +1 -1
-test_flip_tiling(data_t *data, igt_output_t *output, uint64_t tiling[2])
+test_flip_tiling(data_t *data, enum pipe pipe, igt_output_t *output, uint64_t

tiling[2])
 {
  drmModeModeInfo *mode;
  igt_plane_t *primary;
  struct igt_fb fb[2];
  igt_pipe_crc_t *pipe_crc;
  igt_crc_t reference_crc, crc;

tests/kms_flip_tiling.c +1 -1
-	int fb_id, pipe, ret, width;
+	int fb_id, ret, width;

tests/kms_flip_tiling.c +0 -1
-	pipe = output->config.pipe;

  pipe_crc = pipe_crc_new(pipe);
  igt_output_set_pipe(output, pipe);

tests/kms_flip_tiling.c +1 -0
@@ -184,31 +183,34 @@ igt_main
  	igt_subtest_f("flip-changes-tiling") {
  		uint64_t tiling[2] = { LOCAL_I915_FORMAT_MOD_X_TILED,
  				       LOCAL_DRM_FORMAT_MOD_NONE };
+		enum pipe pipe;

tests/kms_flip_tiling.c +2 -2
-		for_each_connected_output(&data.display, output)
-			test_flip_tiling(&data, output, tiling);
+		for_each_pipe_with_valid_output(&data.display, pipe, output)
+			test_flip_tiling(&data, pipe, output, tiling);

  }

  igt_subtest_f("flip-changes-tiling-Y") {
  uint64_t tiling[2] = { LOCAL_I915_FORMAT_MOD_Y_TILED, LOCAL_DRM_FORMAT_MOD_NONE };

tests/kms_flip_tiling.c +1 -0
+		enum pipe pipe;


  igt_require_fb_modifiers(data.drm_fd); igt_require(data.gen >= 9);

tests/kms_flip_tiling.c +2 -2
-		for_each_connected_output(&data.display, output)
-			test_flip_tiling(&data, output, tiling);
+		for_each_pipe_with_valid_output(&data.display, pipe, output)
+			test_flip_tiling(&data, pipe, output, tiling);

  }

  igt_subtest_f("flip-changes-tiling-Yf") {
  uint64_t tiling[2] = { LOCAL_I915_FORMAT_MOD_Yf_TILED, LOCAL_DRM_FORMAT_MOD_NONE };

tests/kms_flip_tiling.c +1 -0
+		enum pipe pipe;


  igt_require_fb_modifiers(data.drm_fd); igt_require(data.gen >= 9);

tests/kms_flip_tiling.c +2 -2
-		for_each_connected_output(&data.display, output)
-			test_flip_tiling(&data, output, tiling);
+		for_each_pipe_with_valid_output(&data.display, pipe, output)
+			test_flip_tiling(&data, pipe, output, tiling);

  }

  /*

tests/kms_flip_tiling.c +1 -0
@@ -222,31 +224,34 @@ igt_main
  	igt_subtest_f("flip-X-tiled") {
  		uint64_t tiling[2] = { LOCAL_I915_FORMAT_MOD_X_TILED,
  				       LOCAL_I915_FORMAT_MOD_X_TILED };
+		enum pipe pipe;

tests/kms_flip_tiling.c +2 -2
-		for_each_connected_output(&data.display, output)
-			test_flip_tiling(&data, output, tiling);
+		for_each_pipe_with_valid_output(&data.display, pipe, output)
+			test_flip_tiling(&data, pipe, output, tiling);

  }

  igt_subtest_f("flip-Y-tiled") {
  uint64_t tiling[2] = { LOCAL_I915_FORMAT_MOD_Y_TILED, LOCAL_I915_FORMAT_MOD_Y_TILED };

tests/kms_flip_tiling.c +1 -0
+		enum pipe pipe;


  igt_require_fb_modifiers(data.drm_fd); igt_require(data.gen >= 9);

tests/kms_flip_tiling.c +2 -2
-		for_each_connected_output(&data.display, output)
-			test_flip_tiling(&data, output, tiling);
+		for_each_pipe_with_valid_output(&data.display, pipe, output)
+			test_flip_tiling(&data, pipe, output, tiling);

  }

  igt_subtest_f("flip-Yf-tiled") {
  uint64_t tiling[2] = { LOCAL_I915_FORMAT_MOD_Yf_TILED, LOCAL_I915_FORMAT_MOD_Yf_TILED };

tests/kms_flip_tiling.c +1 -0
+		enum pipe pipe;


  igt_require_fb_modifiers(data.drm_fd); igt_require(data.gen >= 9);

tests/kms_flip_tiling.c +2 -2
-		for_each_connected_output(&data.display, output)
-			test_flip_tiling(&data, output, tiling);
+		for_each_pipe_with_valid_output(&data.display, pipe, output)
+			test_flip_tiling(&data, pipe, output, tiling);

  }

  /*

tests/kms_flip_tiling.c +1 -0
@@ -260,31 +265,34 @@ igt_main
  	igt_subtest_f("flip-to-X-tiled") {
  		uint64_t tiling[2] = { LOCAL_DRM_FORMAT_MOD_NONE,
  				       LOCAL_I915_FORMAT_MOD_X_TILED };
+		enum pipe pipe;

tests/kms_flip_tiling.c +2 -2
-		for_each_connected_output(&data.display, output)
-			test_flip_tiling(&data, output, tiling);
+		for_each_pipe_with_valid_output(&data.display, pipe, output)
+			test_flip_tiling(&data, pipe, output, tiling);

  }

  igt_subtest_f("flip-to-Y-tiled") {
  uint64_t tiling[2] = { LOCAL_DRM_FORMAT_MOD_NONE, LOCAL_I915_FORMAT_MOD_Y_TILED };

tests/kms_flip_tiling.c +1 -0
+		enum pipe pipe;


  igt_require_fb_modifiers(data.drm_fd); igt_require(data.gen >= 9);

tests/kms_flip_tiling.c +2 -2
-		for_each_connected_output(&data.display, output)
-			test_flip_tiling(&data, output, tiling);
+		for_each_pipe_with_valid_output(&data.display, pipe, output)
+			test_flip_tiling(&data, pipe, output, tiling);

  }

  igt_subtest_f("flip-to-Yf-tiled") {
  uint64_t tiling[2] = { LOCAL_DRM_FORMAT_MOD_NONE, LOCAL_I915_FORMAT_MOD_Yf_TILED };

tests/kms_flip_tiling.c +1 -0
+		enum pipe pipe;


  igt_require_fb_modifiers(data.drm_fd); igt_require(data.gen >= 9);

tests/kms_flip_tiling.c +2 -2
-		for_each_connected_output(&data.display, output)
-			test_flip_tiling(&data, output, tiling);
+		for_each_pipe_with_valid_output(&data.display, pipe, output)
+			test_flip_tiling(&data, pipe, output, tiling);

  }

  igt_fixture {

tests/kms_panel_fitting.c +1 -1
index b796c6812679..7c501fcdd3fb 100644
@@ -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,

tests/kms_panel_fitting.c +0 -0
@@ -137,7 +137,7 @@ static void test_panel_fitting(data_t *d)
  	enum pipe pipe;
  	int valid_tests = 0;

tests/kms_panel_fitting.c +1 -1
-	for_each_connected_output(display, output) {
+	for_each_pipe_with_valid_output(display, pipe, output) {

  drmModeModeInfo *mode, native_mode; bool scaling_mode_set;

tests/kms_panel_fitting.c +0 -0
@@ -153,7 +153,6 @@ static void test_panel_fitting(data_t *d)
  		if (!scaling_mode_set)
  			continue;

tests/kms_panel_fitting.c +0 -1
-		pipe = output->config.pipe;

  igt_output_set_pipe(output, pipe);
  mode = igt_output_get_mode(output);

tests/kms_plane_scaling.c +1 -1
index ad5404d90bfa..39bb5e113411 100644
@@ -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,

tests/kms_plane_scaling.c +0 -0
@@ -186,10 +186,9 @@ static void test_plane_scaling(data_t *d)
  	igt_require(d->display.has_universal_planes);
  	igt_require(d->num_scalers);

tests/kms_plane_scaling.c +1 -1
-	for_each_connected_output(display, output) {
+	for_each_pipe_with_valid_output(display, pipe, output) {

  drmModeModeInfo *mode;

tests/kms_plane_scaling.c +0 -1
-		pipe = output->config.pipe;
Quoted 3 lines

  igt_output_set_pipe(output, pipe);
  mode = igt_output_get_mode(output);

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

#14 lore raw

Re: [PATCH i-g-t v2 05/15] tests/kms: Clean up more users of unassigned pipes.

Op 20-07-16 om 14:56 schreef Ander Conselvan De Oliveira:

Quoted 31 lines · Maarten Lankhorst
Quoted 17 lines

Use for_each_pipe_with_valid_output instead.

---
 tests/kms_crtc_background_color.c |  3 +--
 tests/kms_flip_tiling.c           | 50 +++++++++++++++++++++++---------------
(quoted diff) +0 -1
-
 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 +0 -0
index b496625c1693..b97c1142df6e 100644

tests/kms_crtc_background_color.c static void test_crtc_background(data_t *data) · line 139

Quoted 9 lines
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);

Won't this cause the test to be executed more times? I.e., every output paired with every supported pipe vs. every output only with the pipe it is currently configured to use.

Quoted 3 lines

None of the changed tests are part of BAT, so I'm not sure we care about a potential increase in execution time, though. But maybe add a note in the commit message for future reference?

It will, but it will also increase test coverage by running the test on each crtc. If we only cared for the test to run with a single combination, we should have just added break at the end.

Good idea to put it in the commit message though, would be useful.

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

#15 lore raw

Re: [PATCH i-g-t v2 05/15] tests/kms: Clean up more users of unassigned pipes.

In reply to Ander Conselvan De Oliveira

How about this?

tests/kms: Clean up more users of unassigned pipes.

Use 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.

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

#16 lore raw

PATCH v2 6/15 igt_kms: Change PIPE_ANY behavior to mean unassigned

In reply to Maarten Lankhorst

None 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 of 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.

---
 lib/igt_kms.c | 246 ++++++++++++++++++++++++++++------------------------------
 lib/igt_kms.h |  18 ++++-
 2 files changed, 135 insertions(+), 129 deletions(-)
lib/igt_kms.c +119 -127
index ce8aa2455348..88cae7d51787 100644
@@ -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));
 
@@ -1259,10 +1265,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);
 }
 
 /*
@@ -1325,15 +1331,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,47 +1468,17 @@ 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];
 
 		/*
-		 * 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;
 
 		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);
@@ -1545,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++) {
@@ -1554,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",
@@ -1565,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);
 	}
 }
@@ -1593,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
@@ -1628,6 +1606,21 @@ 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;
+	int i;
+
+	for (i = 0; i < display->n_outputs; i++) {
+		igt_output_t *output = &display->outputs[i];
+
+		if (output->pending_crtc_idx_mask == (1 << 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)
@@ -1741,10 +1734,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;
@@ -1763,13 +1756,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,
@@ -1797,10 +1789,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,
@@ -1841,11 +1832,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) {
@@ -1853,9 +1844,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);
 
@@ -1865,9 +1855,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);
@@ -1883,9 +1872,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);
@@ -1902,10 +1890,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;
@@ -1920,7 +1909,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);
@@ -1932,7 +1921,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);
@@ -1946,9 +1935,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,
@@ -1976,17 +1964,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);
 	}
 }
 
@@ -2000,31 +1988,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;
@@ -2036,7 +2021,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);
 	}
 
@@ -2060,6 +2045,9 @@ static void igt_atomic_prepare_crtc_commit(igt_output_t *output, drmModeAtomicRe
 
 	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);
 
@@ -2125,6 +2113,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;
 
@@ -2167,14 +2157,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);
 	}
 
@@ -2282,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));
@@ -2297,6 +2287,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);
 }
 
lib/igt_kms.h +16 -2
index dc6be5e53b74..3531dc20b6e0 100644
@@ -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.5.5

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

Re: [PATCH i-g-t v2 06/15] igt_kms: Change PIPE_ANY behavior to mean unassigned

Quoted 142 lines · Maarten Lankhorst

None 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 of 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.

---
 lib/igt_kms.c | 246 ++++++++++++++++++++++++++++----------------------------- -
 lib/igt_kms.h |  18 ++++-

 2 files changed, 135 insertions(+), 129 deletions(-)
lib/igt_kms.c +0 -0
index ce8aa2455348..88cae7d51787 100644
@@ -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);

lib/igt_kms.c +6 -0
+	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)

lib/igt_kms.c +2 -1
-		goto err3;
+		/* Keep config->connector */
+		goto err2;


  config->pipe = ffs(crtc_idx_mask) - 1;

lib/igt_kms.c +0 -4
-	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);

lib/igt_kms.c +0 -1
-	config->connector = connector;

  config->crtc = drmModeGetCrtc(drm_fd, resources->crtcs[config-

Quoted 1 line

pipe]);


  drmModeFreeResources(resources);

lib/igt_kms.c +5 -0
@@ -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;
  }


 /**

lib/igt_kms.c +0 -0
@@ -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-

Quoted 1 line

pipes_in_use;

lib/igt_kms.c +1 -2
-	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,

lib/igt_kms.c +0 -0
@@ -1209,19 +1215,19 @@ static void igt_output_refresh(igt_output_t *output)

  else
  output->valid = false;

lib/igt_kms.c +1 -7
-	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);
  }

lib/igt_kms.c +6 -0
+	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));

lib/igt_kms.c +0 -0
@@ -1259,10 +1265,10 @@ get_crtc_property(int drm_fd, uint32_t crtc_id, const
 char *name,
  }


 static void

lib/igt_kms.c +1 -1
-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)

 {

lib/igt_kms.c +0 -2
-	drmModeObjectSetProperty(output->display->drm_fd,
-		output->config.crtc->crtc_id, DRM_MODE_OBJECT_CRTC, prop_id,

value);

lib/igt_kms.c +2 -0
+	drmModeObjectSetProperty(pipe->display->drm_fd,
+		pipe->crtc_id, DRM_MODE_OBJECT_CRTC, prop_id, value);

 }

 /*

lib/igt_kms.c +1 -0
@@ -1325,15 +1331,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;

lib/igt_kms.c +12 -0
+		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,

lib/igt_kms.c void igt_display_init(igt_display_t *display, int drm_fd) · line 1361

Quoted 10 lines
lib/igt_kms.c +10 -0
+				  "CTM",
+				  &pipe->ctm_property,
+				  NULL,
+				  NULL);
+		get_crtc_property(display->drm_fd, pipe->crtc_id,
+				  "GAMMA_LUT",
+				  &pipe->gamma_property,
+				  NULL,
+				  NULL);
+

I think it might be worth splitting the drm property related changes to a separate patch. They seem fairly self contained and this is a somewhat long patch.

Quoted 274 lines

  /* add the planes that can be used with that pipe */ for (j = 0; j < plane_resources->count_planes; j++) { drmModePlane *drm_plane;

lib/igt_kms.c +0 -1
-			uint64_t prop_value;


  drm_plane = drmModeGetPlane(display->drm_fd, plane_resources-

Quoted 1 line

planes[j]);

lib/igt_kms.c +0 -0
@@ -1440,47 +1468,17 @@ void igt_display_init(igt_display_t *display, int
 drm_fd)
  	igt_assert(display->outputs);


  for (i = 0; i < display->n_outputs; i++) {

lib/igt_kms.c +0 -1
-		int j;

  igt_output_t *output = &display->outputs[i];
  /*

lib/igt_kms.c +2 -2
-		 * 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().

   */

lib/igt_kms.c +1 -1
-		output->pending_crtc_idx_mask = -1UL;
+		output->pending_crtc_idx_mask = 0;

  output->id = resources->connectors[i]; output->display = display;

  igt_output_refresh(output);

lib/igt_kms.c +0 -7
-
-		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-
Quoted 1 line

config.crtc->crtc_id,

lib/igt_kms.c +0 -2
-						   "background_color",
-						   &pipe-
Quoted 1 line

background_property,

lib/igt_kms.c +0 -4
-						   &prop_value,
-						   NULL);
-				pipe->background = (uint32_t)prop_value;
-				get_crtc_property(display->drm_fd, output-
Quoted 1 line

config.crtc->crtc_id,

lib/igt_kms.c +0 -5
-						  "DEGAMMA_LUT",
-						  &pipe->degamma_property,
-						  NULL,
-						  NULL);
-				get_crtc_property(display->drm_fd, output-
Quoted 1 line

config.crtc->crtc_id,

lib/igt_kms.c +0 -5
-						  "CTM",
-						  &pipe->ctm_property,
-						  NULL,
-						  NULL);
-				get_crtc_property(display->drm_fd, output-
Quoted 1 line

config.crtc->crtc_id,

lib/igt_kms.c +0 -6
-						  "GAMMA_LUT",
-						  &pipe->gamma_property,
-						  NULL,
-						  NULL);
-			}
-		}

  }
drmModeFreePlaneResources(plane_resources);

lib/igt_kms.c +0 -0
@@ -1545,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++) {

lib/igt_kms.c +0 -0
@@ -1554,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",

lib/igt_kms.c +0 -0
@@ -1565,25 +1560,9 @@ static void igt_display_refresh(igt_display_t *display)
                  }
          }

lib/igt_kms.c +0 -3
-	/*
-	 * The pipe allocation has to be done in two phases:
-	 *   - first, try to satisfy the outputs where a pipe has been

specified

lib/igt_kms.c +0 -2
-	 *   - then, allocate the outputs with PIPE_ANY
-	 */

  for (i = 0; i < display->n_outputs; i++) { igt_output_t *output = &display->outputs[i];

lib/igt_kms.c +0 -11
-		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);
  }
 }

lib/igt_kms.c +0 -0
@@ -1593,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;

lib/igt_kms.c +1 -1
-	if (output->pending_crtc_idx_mask == -1UL) {
+	if (!output->pending_crtc_idx_mask) {

  /*

lib/igt_kms.c +1 -2
-		 * 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.

   */

lib/igt_kms.c +1 -1
-		pipe = output->config.pipe;
+		return NULL;

  } else {
  /*
   * Otherwise, return the pending pipe (ie the pipe that should

lib/igt_kms.c +0 -0
@@ -1628,6 +1606,21 @@ static igt_plane_t *igt_pipe_get_plane(igt_pipe_t
 *pipe, enum igt_plane plane)
  	return &pipe->planes[idx];
  }

lib/igt_kms.c +15 -0
+static igt_output_t *igt_pipe_get_output(igt_pipe_t *pipe)
+{
+	igt_display_t *display = pipe->display;
+	int i;
+
+	for (i = 0; i < display->n_outputs; i++) {
+		igt_output_t *output = &display->outputs[i];
+
+		if (output->pending_crtc_idx_mask == (1 << 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)

lib/igt_kms.c +2 -2
@@ -1741,10 +1734,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;

lib/igt_kms.c +0 -0
@@ -1763,13 +1756,12 @@ static int igt_drm_plane_commit(igt_plane_t *plane,
  		   !plane->rotation_changed);


  fb_id = igt_plane_get_fb_id(plane);

lib/igt_kms.c +1 -1
-	crtc_id = output->config.crtc->crtc_id;
+	crtc_id = pipe->crtc_id;


  if ((plane->fb_changed || plane->size_changed) && fb_id == 0) { LOG(display,

lib/igt_kms.c +2 -3
-		    "%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,

lib/igt_kms.c +0 -0
@@ -1797,10 +1789,9 @@ static int igt_drm_plane_commit(igt_plane_t *plane,
  		crtc_h = plane->crtc_h;


  LOG(display,

lib/igt_kms.c +1 -1
-		    "%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",

lib/igt_kms.c +1 -2
-		    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,

lib/igt_kms.c +3 -3
@@ -1841,11 +1832,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) {

lib/igt_kms.c +0 -0
@@ -1853,9 +1844,8 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor,


  if (gem_handle) {
  LOG(display,

lib/igt_kms.c +2 -3
-			    "%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);

lib/igt_kms.c +2 -3
@@ -1865,9 +1855,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);

lib/igt_kms.c +0 -0
@@ -1883,9 +1872,8 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor,
  		int y = cursor->crtc_y;


  LOG(display,

lib/igt_kms.c +2 -3
-		    "%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);

lib/igt_kms.c +2 -1
@@ -1902,10 +1890,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;

lib/igt_kms.c +0 -0
@@ -1920,7 +1909,7 @@ static int igt_primary_plane_commit_legacy(igt_plane_t
 *primary,
  		!primary->size_changed && !primary->panning_changed)
  		return 0;

lib/igt_kms.c +1 -1
-	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);

lib/igt_kms.c +0 -0
@@ -1932,7 +1921,7 @@ static int igt_primary_plane_commit_legacy(igt_plane_t
 *primary,
Quoted 3 lines

      "%s: SetCrtc pipe %s, fb %u, panning (%d, %d), " "mode %dx%d\n", igt_output_name(output),

Here you kept the output name in the log while it was removed in all other LOG() instances. Should it be removed from here too for consistency?

Looks good otherwise.

Ander

Quoted 197 lines
lib/igt_kms.c +1 -1
-		    kmstest_pipe_name(output->config.pipe),
+		    kmstest_pipe_name(pipe->pipe),

      fb_id,
      primary->pan_x, primary->pan_y, mode->hdisplay, mode->vdisplay);

lib/igt_kms.c +2 -3
@@ -1946,9 +1935,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,

lib/igt_kms.c +4 -4
@@ -1976,17 +1964,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);
  }
 }

lib/igt_kms.c +4 -5
@@ -2000,31 +1988,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;

lib/igt_kms.c +0 -2
-	pipe = igt_output_get_driving_pipe(output);
-

  if (pipe->background_changed) {

lib/igt_kms.c +1 -1
-		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) {

lib/igt_kms.c +1 -1
-		igt_crtc_set_property(output, pipe->degamma_property,
+		igt_crtc_set_property(pipe, pipe->degamma_property,

        pipe->degamma_blob);

lib/igt_kms.c +1 -1
-		igt_crtc_set_property(output, pipe->ctm_property,
+		igt_crtc_set_property(pipe, pipe->ctm_property,

        pipe->ctm_blob);

lib/igt_kms.c +1 -1
-		igt_crtc_set_property(output, pipe->gamma_property,
+		igt_crtc_set_property(pipe, pipe->gamma_property,

        pipe->gamma_blob);
  pipe->color_mgmt_changed = false;

lib/igt_kms.c +0 -0
@@ -2036,7 +2021,7 @@ static int igt_output_commit(igt_output_t *output,

  if (plane->fb_changed || plane->position_changed || plane-

Quoted 1 line

size_changed)

  need_wait_for_vblank = true;

lib/igt_kms.c +1 -1
-		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);
  }

lib/igt_kms.c +0 -0
@@ -2060,6 +2045,9 @@ static void igt_atomic_prepare_crtc_commit(igt_output_t
 *output, drmModeAtomicRe


  igt_pipe_t *pipe_obj = igt_output_get_driving_pipe(output);

lib/igt_kms.c +3 -0
+	if (!pipe_obj)
+		return;
+

  if (pipe_obj->background_changed) igt_atomic_populate_crtc_req(req, output, IGT_CRTC_BACKGROUND, pipe_obj->background);

lib/igt_kms.c +0 -0
@@ -2125,6 +2113,8 @@ static int igt_atomic_commit(igt_display_t *display)



  pipe_obj = igt_output_get_driving_pipe(output);

lib/igt_kms.c +2 -0
+		if (!pipe_obj)
+			continue;


  pipe = pipe_obj->pipe;

lib/igt_kms.c +0 -0
@@ -2167,14 +2157,14 @@ static int do_display_commit(igt_display_t *display,


  }

lib/igt_kms.c +3 -2
-	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);

lib/igt_kms.c +2 -2
-		if (!output->valid)
-			continue;
+		if (output && output->valid)
+			valid_outs++;

lib/igt_kms.c +1 -2
-		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);
  }

lib/igt_kms.c +0 -0
@@ -2282,9 +2272,9 @@ void igt_output_set_pipe(igt_output_t *output, enum pipe
 pipe)
  {
  	igt_display_t *display = output->display;

lib/igt_kms.c +1 -1
-	if (pipe == PIPE_ANY) {
+	if (pipe == PIPE_NONE) {

  LOG(display, "%s: set_pipe(any)\n", igt_output_name(output));

lib/igt_kms.c +1 -1
-		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.c +0 -0
@@ -2297,6 +2287,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);

lib/igt_kms.c +2 -0
+	igt_assert(pipe);
+

  return igt_pipe_get_plane(pipe, plane);
 }

lib/igt_kms.h +0 -0
index dc6be5e53b74..3531dc20b6e0 100644
@@ -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);

lib/igt_kms.h +12 -0
+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) {

lib/igt_kms.h +0 -1
-	return output->valid && (output->config.valid_crtc_idx_mask & (1 <<

pipe));

lib/igt_kms.h +2 -0
+	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__++) \

lib/igt_kms.h +0 -1
-		for_each_if (((output = &(display)->outputs[i__]), output-
Quoted 1 line

valid))

lib/igt_kms.h +2 -0
+		for_each_if (((output = &(display)->outputs[i__]), \
+			      igt_output_is_connected(output)))
Quoted 4 lines


 #define for_each_pipe(display, pipe) \
  for (pipe = 0; pipe < igt_display_get_n_pipes(display); pipe++) \

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

#18 lore raw

PATCH v2 7/15 igt_kms: Handle atomic pipe properties better.

In reply to Maarten Lankhorst

Move 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
index 88cae7d51787..8c7598a88a69 100644
@@ -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, drmModeAto
 static 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
index 3531dc20b6e0..b9e8d344ed8c 100644
@@ -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.5.5

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v2 7/15
#19 lore raw

Re: [PATCH i-g-t v2 07/15] igt_kms: Handle atomic pipe properties better.

Quoted 4 lines · Maarten Lankhorst

Move properties to the pipe, they don't belong in the output and make atomic commit use the pipes for crtc properties.

Quoted 297 lines

---
 lib/igt_kms.c | 98 +++++++++++++++++++++++++++++----------------------------- -
 lib/igt_kms.h | 12 +++++---

 2 files changed, 55 insertions(+), 55 deletions(-)
lib/igt_kms.c +0 -0
index 88cae7d51787..8c7598a88a69 100644
@@ -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

lib/igt_kms.c +1 -2
-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;

lib/igt_kms.c +0 -0
@@ -222,18 +221,18 @@ igt_atomic_fill_props(igt_display_t *display,
 igt_output_t *output,


  fd = display->drm_fd;

lib/igt_kms.c +0 -1
-	props = drmModeObjectGetProperties(fd, output->config.crtc->crtc_id,

DRM_MODE_OBJECT_CRTC);

lib/igt_kms.c +1 -0
+	props = drmModeObjectGetProperties(fd, output->config.connector-
Quoted 1 line

connector_id, DRM_MODE_OBJECT_CONNECTOR);

  igt_assert(props);

  for (i = 0; i < props->count_props; i++) { drmModePropertyPtr prop = drmModeGetProperty(fd, props->props[i]);

lib/igt_kms.c +2 -2
-		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;

lib/igt_kms.c +0 -1
-			output->config.atomic_props_crtc[j] = props-
Quoted 1 line

props[i];

lib/igt_kms.c +1 -0
+			output->config.atomic_props_connector[j] = props-
Quoted 1 line

props[i];

  break;
  }

lib/igt_kms.c +0 -0
@@ -241,19 +240,29 @@ igt_atomic_fill_props(igt_display_t *display,
 igt_output_t *output,
  	}


  drmModeFreeObjectProperties(props);

lib/igt_kms.c +0 -2
-	props = NULL;
-	props = drmModeObjectGetProperties(fd, output->config.connector-
Quoted 1 line

connector_id, DRM_MODE_OBJECT_CONNECTOR);

lib/igt_kms.c +12 -0
+}
+
+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]);

lib/igt_kms.c +2 -2
-		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;

lib/igt_kms.c +0 -1
-			output->config.atomic_props_connector[j] = props-
Quoted 1 line

props[i];

lib/igt_kms.c +1 -0
+			pipe->atomic_props_crtc[j] = props->props[i];

  break;
  }

lib/igt_kms.c +0 -0
@@ -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)

lib/igt_kms.c +0 -0
@@ -1222,6 +1230,9 @@ static void igt_output_refresh(igt_output_t *output)
  			       -1);
  	}

lib/igt_kms.c +3 -0
+	igt_atomic_fill_connector_props(display, output,
+		IGT_NUM_CONNECTOR_PROPS, igt_connector_prop_names);
+

  if (!output->valid)
  return;

lib/igt_kms.c +0 -0
@@ -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;

lib/igt_kms.c +0 -1
-	igt_atomic_fill_props(display, output, IGT_NUM_CRTC_PROPS,

igt_crtc_prop_names,

lib/igt_kms.c +0 -1
-		IGT_NUM_CONNECTOR_PROPS, igt_connector_prop_names);

 }

 static bool

lib/igt_kms.c +0 -0
@@ -1359,6 +1368,8 @@ void igt_display_init(igt_display_t *display, int
 drm_fd)
  				  NULL,
  				  NULL);

lib/igt_kms.c +1 -0
+		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;

lib/igt_kms.c +0 -0
@@ -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

lib/igt_kms.c +1 -1
-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)
 {

lib/igt_kms.c +1 -2
-
-	igt_display_t *display = output->display;
+	igt_display_t *display = pipe->display;

  uint32_t fb_id, crtc_id;

  igt_assert(plane->drm_plane);

lib/igt_kms.c +0 -0
@@ -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);

lib/igt_kms.c +1 -1
-	crtc_id = output->config.crtc->crtc_id;
+	crtc_id = pipe->crtc_id;


  LOG(display,

lib/igt_kms.c +2 -3
-	    "%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);

lib/igt_kms.c +2 -8
@@ -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) {

lib/igt_kms.c +0 -1
-		igt_atomic_populate_crtc_req(req, output,

IGT_CRTC_DEGAMMA_LUT, pipe_obj->degamma_blob);

lib/igt_kms.c +0 -1
-		igt_atomic_populate_crtc_req(req, output, IGT_CRTC_CTM,

pipe_obj->ctm_blob);

lib/igt_kms.c +0 -1
-		igt_atomic_populate_crtc_req(req, output, IGT_CRTC_GAMMA_LUT,

pipe_obj->gamma_blob);

lib/igt_kms.c +1 -0
+		igt_atomic_populate_crtc_req(req, pipe_obj,

IGT_CRTC_DEGAMMA_LUT, pipe_obj->degamma_blob);

lib/igt_kms.c +1 -0
+		igt_atomic_populate_crtc_req(req, pipe_obj, IGT_CRTC_CTM,

pipe_obj->ctm_blob);

lib/igt_kms.c +1 -0
+		igt_atomic_populate_crtc_req(req, pipe_obj,

IGT_CRTC_GAMMA_LUT, pipe_obj->gamma_blob);
  }

  /*

lib/igt_kms.c +0 -0
@@ -2088,42 +2091,37 @@ static void

igt_atomic_prepare_connector_commit(igt_output_t *output, drmModeAto static int igt_atomic_commit(igt_display_t *display)
 {

lib/igt_kms.c +2 -1
-	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);

lib/igt_kms.c +2 -2
-	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;

lib/igt_kms.c +0 -1
-		enum pipe pipe;


  /*
   * Add CRTC Properties to the property set */

lib/igt_kms.c +1 -13
-		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) {

lib/igt_kms.c +1 -1
-			igt_atomic_prepare_plane_commit(plane, output, req);
+			igt_atomic_prepare_plane_commit(plane, pipe_obj,

req);
  }

  }

lib/igt_kms.c +6 -0
+	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 +3 -1
index 3531dc20b6e0..b9e8d344ed8c 100644
@@ -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;

lib/igt_kms.h +4 -4
@@ -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-
Quoted 1 line

atomic_props_crtc[prop], value))

Quoted 3 lines

 /**
  * igt_atomic_populate_connector_req:
  * @req: A pointer to drmModeAtomicReq

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

#20 lore raw

PATCH v2 8/15 igt_kms: Remove pan members from igt_plane, v2.

In reply to Maarten Lankhorst

They'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
index 8c7598a88a69..9fc5559a5df4 100644
@@ -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
index b9e8d344ed8c..4d18c01042c9 100644
@@ -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
index 7c501fcdd3fb..da09da32d704 100644
@@ -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
index 60b8d71d52d4..7c01fe91b263 100644
@@ -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
index 39bb5e113411..4546ce548515 100644
@@ -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.5.5

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v2 8/15
#21 lore raw

Re: [PATCH i-g-t v2 08/15] igt_kms: Remove pan members from igt_plane, v2.

Quoted 135 lines · Maarten Lankhorst

They'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 +0 -0
index 8c7598a88a69..9fc5559a5df4 100644
@@ -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 &&

lib/igt_kms.c +1 -1
-		!primary->size_changed && !primary->panning_changed)
+		!primary->size_changed)

  return 0;

  crtc_id = pipe->crtc_id;

lib/igt_kms.c +0 -0
@@ -1927,18 +1927,18 @@ static int igt_primary_plane_commit_legacy(igt_plane_t
 *primary,


  if (fb_id) {
  LOG(display,

lib/igt_kms.c +1 -1
-		    "%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,

lib/igt_kms.c +1 -1
-		    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,

lib/igt_kms.c +1 -1
-				     primary->pan_x, primary->pan_y,
+				     primary->src_x, primary->src_x,

       &output->id,
       1,
       mode);

lib/igt_kms.c +0 -1
@@ -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;
 }

lib/igt_kms.c +0 -0
@@ -2408,21 +2407,6 @@ void igt_fb_set_size(struct igt_fb *fb, igt_plane_t
 *plane,
  	plane->fb_changed = true;
  }

lib/igt_kms.c +0 -15
-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 -1
index b9e8d344ed8c..4d18c01042c9 100644
@@ -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;

lib/igt_kms.h +0 -2
-	/* 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;

lib/igt_kms.h +0 -1
@@ -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
index 7c501fcdd3fb..da09da32d704 100644
@@ -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 +0 -0
index 60b8d71d52d4..7c01fe91b263 100644
@@ -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)

tests/kms_plane.c

Quoted 2 lines
tests/kms_plane.c +1 -1
-		igt_plane_set_panning(primary, 0, 0);
+		igt_fb_set_position(&primary_fb, primary, 0, 0);

While at it you might want to rename igt_fb_set_position() to igt_plane_set_position() or something. The name is very misleading as it doens't depend on the fb and only sets properties on the plane.

But anyway,

Quoted 32 lines

  else

tests/kms_plane.c +0 -1
-		igt_plane_set_panning(primary, mode->hdisplay, mode-
Quoted 1 line

vdisplay);

tests/kms_plane.c +1 -2
-
-	igt_plane_set_position(primary, 0, 0);
+		igt_fb_set_position(&primary_fb, primary, mode->hdisplay,

mode->vdisplay);

  igt_display_commit(&data->display);

tests/kms_plane.c +0 -0
@@ -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);

tests/kms_plane.c +1 -1
-	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
index 39bb5e113411..4546ce548515 100644
@@ -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,
Quoted 1 line

  mode);

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

#22 lore raw

Re: [PATCH i-g-t v2 08/15] igt_kms: Remove pan members from igt_plane, v2.

Op 21-07-16 om 13:42 schreef Ander Conselvan De Oliveira:

Quoted 135 lines · Maarten Lankhorst
Quoted 134 lines

They'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 +1 -1
index 8c7598a88a69..9fc5559a5df4 100644
@@ -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;
 
lib/igt_kms.c +3 -3
 	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,
lib/igt_kms.c +0 -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;

}

lib/igt_kms.c +0 -15
@@ -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)
 {
lib/igt_kms.c +0 -0
 	switch (rotation) {
lib/igt_kms.h +0 -4
index b9e8d344ed8c..4d18c01042c9 100644
@@ -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
index 7c501fcdd3fb..da09da32d704 100644
@@ -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,
tests/kms_panel_fitting.c +0 -0
 				mode);
tests/kms_plane.c +0 -0
index 60b8d71d52d4..7c01fe91b263 100644
@@ -321,11 +321,9 @@ test_plane_panning_with_output(data_t *data,
 	igt_plane_set_fb(primary, &primary_fb);
 
Quoted 6 lines

tests/kms_plane.c test_plane_panning_with_output(data_t *data, · line 324

Quoted 3 lines
tests/kms_plane.c +1 -1
 	if (flags & TEST_PANNING_TOP_LEFT)
-		igt_plane_set_panning(primary, 0, 0);
+		igt_fb_set_position(&primary_fb, primary, 0, 0);

While at it you might want to rename igt_fb_set_position() to igt_plane_set_position() or something. The name is very misleading as it doens't depend on the fb and only sets properties on the plane.

That one already exists for dst, but yeah it should be renamed to igt_plane_set_src_position, the fb argument is unused anyway..

Will probably just commit some patches to do so later on.
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#23 lore raw

PATCH v2 9/15 igt_kms: Clear all _changed members centrally

In reply to Maarten Lankhorst

This will make it easier to support TEST_ONLY commits.

---
 lib/igt_kms.c | 84 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 48 insertions(+), 36 deletions(-)
lib/igt_kms.c +48 -36
index 9fc5559a5df4..d0d0dcff8193 100644
@@ -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,68 @@ 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;
+
+		if (s == COMMIT_ATOMIC) {
+			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.5.5

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

Re: [PATCH i-g-t v2 09/15] igt_kms: Clear all _changed members centrally

Quoted 160 lines · Maarten Lankhorst

This will make it easier to support TEST_ONLY commits.

---
 lib/igt_kms.c | 84 ++++++++++++++++++++++++++++++++++----------------------
---

 1 file changed, 48 insertions(+), 36 deletions(-)
lib/igt_kms.c +0 -5
index 9fc5559a5df4..d0d0dcff8193 100644
@@ -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;
  }


lib/igt_kms.c +0 -0
@@ -1819,15 +1814,10 @@ static int igt_drm_plane_commit(igt_plane_t *plane,
  		CHECK_RETURN(ret, fail_on_error);
  	}

lib/igt_kms.c +0 -4
-	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);

lib/igt_kms.c +0 -1
-		plane->rotation_changed = false;

  CHECK_RETURN(ret, fail_on_error);
  }

lib/igt_kms.c +0 -0
@@ -1872,8 +1862,6 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor,
  		}


  CHECK_RETURN(ret, fail_on_error);

lib/igt_kms.c +0 -2
-
-		cursor->fb_changed = false;

  }

  if (cursor->position_changed) {

lib/igt_kms.c +0 -0
@@ -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);

lib/igt_kms.c +0 -2
-
-		cursor->position_changed = false;

  }

  return 0;

lib/igt_kms.c +0 -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 &&

lib/igt_kms.c +1 -1
-		!primary->size_changed)
+	    !primary->size_changed)

  return 0;

  crtc_id = pipe->crtc_id;

lib/igt_kms.c +0 -0
@@ -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);

lib/igt_kms.c +0 -3
-	primary->fb_changed = false;
-	primary->position_changed = false;
-	primary->size_changed = false;


  return 0;
 }

lib/igt_kms.c +1 -1
@@ -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);
  	}
  }

lib/igt_kms.c +0 -2
@@ -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) {

lib/igt_kms.c +0 -2
@@ -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++) {

lib/igt_kms.c +1 -2
@@ -2140,35 +2119,68 @@ 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);

lib/igt_kms.c +2 -1
-		return 0;
+	} else {
+		int valid_outs = 0;

lib/igt_kms.c +3 -1
-	}
+		for_each_pipe(display, pipe) {
+			igt_pipe_t *pipe_obj = &display->pipes[pipe];
+			igt_output_t *output = igt_pipe_get_output(pipe_obj);

lib/igt_kms.c +2 -3
-	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++;

lib/igt_kms.c +3 -2
-		if (output && output->valid)
-			valid_outs++;
+			ret = igt_pipe_commit(pipe_obj, s, fail_on_error);
+			CHECK_RETURN(ret, fail_on_error);
+		}

lib/igt_kms.c +0 -1
-		ret = igt_pipe_commit(pipe_obj, s, fail_on_error);

  CHECK_RETURN(ret, fail_on_error);

lib/igt_kms.c +6 -0
+
+		if (valid_outs == 0) {
+			LOG_UNINDENT(display);
+
+			return -1;
+		}

  }

  LOG_UNINDENT(display);

lib/igt_kms.c +1 -2
-	if (valid_outs == 0)
-		return -1;
+	if (ret)

lib/igt_kms.c static int do_display_commit(igt_display_t *display, · line 2166

Quoted 10 lines
lib/igt_kms.c +10 -0
+		return ret;
+
+	for_each_pipe(display, pipe) {
+		igt_pipe_t *pipe_obj = &display->pipes[pipe];
+		igt_plane_t *plane;
+
+		if (s == COMMIT_ATOMIC) {
+			pipe_obj->color_mgmt_changed = false;
+			pipe_obj->background_changed = false;
+		}

If this is supposed to match the previous behavior, shouldn't the condition be "!= COMMIT_ATOMIC". Both flags are set from igt_pipe_commit() which is not called in the atomic case. However, the flags aren't set to false in igt_atomic_prepare_crtc_commit(). That actually sounds like a bug?

lib/igt_kms.c static int do_display_commit(igt_display_t *display, · line 2174

Quoted 9 lines
lib/igt_kms.c +7 -0
+
+		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))

lib/igt_kms.c +1 -0
+				plane->rotation_changed = false;

Can't plane->rotation_changed be set unconditionally here? The legacy primary plane commit has an assert for rotation_changed == false and perhaps the cursor version should have the same.

Quoted 9 lines
lib/igt_kms.c +9 -0
+		}
+	}
+
+	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;
+	}
Quoted 3 lines


  igt_debug_wait_for_keypress("modeset");

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

#25 lore raw

Re: [PATCH i-g-t v2 09/15] igt_kms: Clear all _changed members centrally

Op 21-07-16 om 14:13 schreef Ander Conselvan De Oliveira:

Quoted 167 lines · Maarten Lankhorst
Quoted 166 lines

This will make it easier to support TEST_ONLY commits.

---
 lib/igt_kms.c | 84 ++++++++++++++++++++++++++++++++++----------------------
---
 1 file changed, 48 insertions(+), 36 deletions(-)
lib/igt_kms.c +1 -15
index 9fc5559a5df4..d0d0dcff8193 100644
@@ -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;
 
lib/igt_kms.c +0 -3
 	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;

}

lib/igt_kms.c +26 -18
@@ -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,68 @@ 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;
+
Quoted 8 lines

lib/igt_kms.c static int do_display_commit(igt_display_t *display, · line 2166

Quoted 4 lines
lib/igt_kms.c +4 -0
+		if (s == COMMIT_ATOMIC) {
+			pipe_obj->color_mgmt_changed = false;
+			pipe_obj->background_changed = false;
+		}

If this is supposed to match the previous behavior, shouldn't the condition be "!= COMMIT_ATOMIC". Both flags are set from igt_pipe_commit() which is not called in the atomic case. However, the flags aren't set to false in igt_atomic_prepare_crtc_commit(). That actually sounds like a bug?

I think you're right, real fix is to just update those atomically too. :)

Quoted 4 lines
Quoted 4 lines
lib/igt_kms.c +4 -0
+
+		for_each_plane_on_pipe(display, pipe, plane) {
+			plane->fb_changed = false;
+			plane->position_changed = false;
Quoted 8 lines

lib/igt_kms.c static int do_display_commit(igt_display_t *display, · line 2174

Quoted 5 lines
lib/igt_kms.c +4 -0
+			plane->size_changed = false;
+
+			if (s != COMMIT_LEGACY || !(plane->is_primary || 
 plane->is_cursor))
+				plane->rotation_changed = false;

Can't plane->rotation_changed be set unconditionally here? The legacy primary plane commit has an assert for rotation_changed == false and perhaps the cursor version should have the same.

This is specifically to exclude s == COMMIT_LEGACY && (plane->is_primary || plane->is_cursor), we don't update rotation_changed in this case.

Maybe I should just add an assert to the legacy update functions instead.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#26 lore raw

PATCH v2 10/15 igt_kms: Add modeset support to atomic commits.

In reply to Maarten Lankhorst

Add 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
index d0d0dcff8193..17865c263f35 100644
@@ -167,11 +167,13 @@ static const char *igt_crtc_prop_names[IGT_NUM_CRTC_PROPS] = {
 	"DEGAMMA_LUT",
 	"CTM",
 	"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, drmModeAtomicRe
 		igt_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, drmModeAto
 	if (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;
 
@@ -2165,6 +2231,9 @@ static int do_display_commit(igt_display_t *display,
 			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;
@@ -2175,11 +2244,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");
@@ -2273,13 +2345,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));
@@ -2288,7 +2372,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)
@@ -2449,23 +2538,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
index 4d18c01042c9..39e3b9fa1972 100644
@@ -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.5.5

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

PATCH v2 11/15 tests: Add kms_rmfb test.

In reply to Maarten Lankhorst

This tests rmfb and last close behavior. In those cases the framebuffers should be removed from the crtc.

If atomic modeset is supported, we do it all in one nice atomic commit too.

---
 tests/Makefile.sources |   1 +
 tests/kms_rmfb.c       | 171 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)
 create mode 100644 tests/kms_rmfb.c
tests/Makefile.sources +1 -0
index 80e9a35330dd..2ab25eac7764 100644
@@ -103,6 +103,7 @@ TESTS_progs_M = \
 	kms_plane \
 	kms_psr_sink_crc \
 	kms_render \
+	kms_rmfb \
 	kms_rotation_crc \
 	kms_setmode \
 	kms_universal_plane \
tests/kms_rmfb.c new file +171 -0

171 lines not on this page · raw message

Signature · 6 lines
2.5.5

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

PATCH v2 12/15 tests: Add kms_atomic_transition

In reply to Maarten Lankhorst

This is meant as a stress test, to ensure that all combinations of atomic transitions work correctly. This could be useful for other drivers too, so I kept it generic. For i915 this will mainly be a stress test on watermark calculations.

---
 tests/Makefile.sources        |   1 +
 tests/kms_atomic_transition.c | 189 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+)
 create mode 100644 tests/kms_atomic_transition.c
tests/Makefile.sources +1 -0
index 2ab25eac7764..6e86c723f78e 100644
@@ -84,6 +84,7 @@ TESTS_progs_M = \
 	gvt_basic \
 	kms_addfb_basic \
 	kms_atomic \
+	kms_atomic_transition \
 	kms_chv_cursor_fail \
 	kms_cursor_crc \
 	kms_cursor_legacy \
tests/kms_atomic_transition.c new file +189 -0

189 lines not on this page · raw message

Signature · 6 lines
2.5.5

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

PATCH v2 13/15 igt_kms: Add more apis for panel fitting test.

In reply to Maarten Lankhorst

igt_output_set_scaling_mode is a simple way to update scaling mode, igt_display_(try_)commit_atomic will allow you to call drmAtomicCommit with custom flags, like TEST_ONLY, EVENT, NONBLOCKING or without ALLOW_MODESET.

This is useful when you only want to do any of those things, for events it can be useful to set the user_data pointer too, so export that to users.

---
 lib/igt_kms.c | 113 +++++++++++++++++++++++++++++++++++++++++++---------------
 lib/igt_kms.h |   3 ++
 2 files changed, 87 insertions(+), 29 deletions(-)
lib/igt_kms.c +84 -29
index 17865c263f35..681f2bb41b07 100644
@@ -867,7 +867,9 @@ static bool _kmstest_connector_config(int drm_fd, uint32_t connector_id,
 		goto err3;
 
 	if (!connector->count_modes) {
-		igt_warn("connector %d has no modes\n", connector_id);
+		igt_warn("connector %d/%s-%d has no modes\n", connector_id,
+			 kmstest_connector_type_str(connector->connector_type),
+			 connector->connector_type_id);
 		goto err3;
 	}
 
@@ -2125,7 +2127,7 @@ static void igt_atomic_prepare_connector_commit(igt_output_t *output, drmModeAto
  * Commit all the changes of all the planes,crtcs, connectors
  * atomically using drmModeAtomicCommit()
  */
-static int igt_atomic_commit(igt_display_t *display)
+static int igt_atomic_commit(igt_display_t *display, uint32_t flags, void *user_data)
 {
 
 	int ret = 0, i;
@@ -2166,11 +2168,51 @@ static int igt_atomic_commit(igt_display_t *display)
 		igt_atomic_prepare_connector_commit(output, req);
 	}
 
-	ret = drmModeAtomicCommit(display->drm_fd, req, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
+	ret = drmModeAtomicCommit(display->drm_fd, req, flags, user_data);
 	drmModeAtomicFree(req);
 	return ret;
 
 }
+
+static void
+display_commit_changed(igt_display_t *display, enum igt_commit_style s)
+{
+	int i;
+	enum pipe pipe;
+
+	for_each_pipe(display, pipe) {
+		igt_pipe_t *pipe_obj = &display->pipes[pipe];
+		igt_plane_t *plane;
+
+		if (s == COMMIT_ATOMIC) {
+			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;
+			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; i++) {
+		igt_output_t *output = &display->outputs[i];
+
+		if (s != COMMIT_UNIVERSAL)
+			output->config.pipe_changed = false;
+
+		if (s == COMMIT_ATOMIC)
+			output->config.connector_scaling_mode_changed = false;
+	}
+}
+
 /*
  * Commit all plane changes across all outputs of the display.
  *
@@ -2184,14 +2226,14 @@ static int do_display_commit(igt_display_t *display,
 			     enum igt_commit_style s,
 			     bool fail_on_error)
 {
-	int i, ret;
+	int ret;
 	enum pipe pipe;
 	LOG_INDENT(display, "commit");
 
 	igt_display_refresh(display);
 
 	if (s == COMMIT_ATOMIC) {
-		ret = igt_atomic_commit(display);
+		ret = igt_atomic_commit(display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
 
 		CHECK_RETURN(ret, fail_on_error);
 	} else {
@@ -2222,43 +2264,42 @@ static int do_display_commit(igt_display_t *display,
 	if (ret)
 		return ret;
 
-	for_each_pipe(display, pipe) {
-		igt_pipe_t *pipe_obj = &display->pipes[pipe];
-		igt_plane_t *plane;
+	display_commit_changed(display, s);
 
-		if (s == COMMIT_ATOMIC) {
-			pipe_obj->color_mgmt_changed = false;
-			pipe_obj->background_changed = false;
-		}
+	igt_debug_wait_for_keypress("modeset");
 
-		if (s != COMMIT_UNIVERSAL)
-			pipe_obj->mode_changed = false;
+	return 0;
+}
 
-		for_each_plane_on_pipe(display, pipe, plane) {
-			plane->fb_changed = false;
-			plane->position_changed = false;
-			plane->size_changed = false;
+int igt_display_try_commit_atomic(igt_display_t *display, uint32_t flags, void *user_data)
+{
+	int ret;
 
-			if (s != COMMIT_LEGACY || !(plane->is_primary || plane->is_cursor))
-				plane->rotation_changed = false;
-		}
-	}
+	LOG_INDENT(display, "commit");
 
-	for (i = 0; i < display->n_outputs; i++) {
-		igt_output_t *output = &display->outputs[i];
+	igt_display_refresh(display);
 
-		if (s != COMMIT_UNIVERSAL)
-			output->config.pipe_changed = false;
+	ret = igt_atomic_commit(display, flags, user_data);
 
-		if (s == COMMIT_ATOMIC)
-			output->config.connector_scaling_mode_changed = false;
-	}
+	LOG_UNINDENT(display);
+
+	if (ret || (flags & DRM_MODE_ATOMIC_TEST_ONLY))
+		return ret;
+
+	display_commit_changed(display, COMMIT_ATOMIC);
 
 	igt_debug_wait_for_keypress("modeset");
 
 	return 0;
 }
 
+void igt_display_commit_atomic(igt_display_t *display, uint32_t flags, void *user_data)
+{
+	int ret = igt_display_try_commit_atomic(display, flags, user_data);
+
+	igt_assert_eq(ret, 0);
+}
+
 /**
  * igt_display_commit2:
  * @display: DRM device handle
@@ -2380,6 +2421,15 @@ void igt_output_set_pipe(igt_output_t *output, enum pipe pipe)
 		output->config.pipe_changed = true;
 }
 
+void igt_output_set_scaling_mode(igt_output_t *output, uint64_t scaling_mode)
+{
+	output->config.connector_scaling_mode_changed = true;
+
+	output->config.connector_scaling_mode = scaling_mode;
+
+	igt_require(output->config.atomic_props_connector[IGT_CONNECTOR_SCALING_MODE]);
+}
+
 igt_plane_t *igt_output_get_plane(igt_output_t *output, enum igt_plane plane)
 {
 	igt_pipe_t *pipe;
@@ -2411,6 +2461,11 @@ void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb *fb)
 		plane->src_w = fb->width;
 		plane->src_h = fb->height;
 	} else {
+		plane->src_x = 0;
+		plane->src_y = 0;
+		plane->src_w = 0;
+		plane->src_h = 0;
+
 		plane->crtc_w = 0;
 		plane->crtc_h = 0;
 	}
lib/igt_kms.h +3 -0
index 39e3b9fa1972..bc7825a3f06d 100644
@@ -303,6 +303,8 @@ void igt_display_init(igt_display_t *display, int drm_fd);
 void igt_display_fini(igt_display_t *display);
 int  igt_display_commit2(igt_display_t *display, enum igt_commit_style s);
 int  igt_display_commit(igt_display_t *display);
+int  igt_display_try_commit_atomic(igt_display_t *display, uint32_t flags, void *user_data);
+void igt_display_commit_atomic(igt_display_t *display, uint32_t flags, void *user_data);
 int  igt_display_try_commit2(igt_display_t *display, enum igt_commit_style s);
 int  igt_display_get_n_pipes(igt_display_t *display);
 
@@ -310,6 +312,7 @@ const char *igt_output_name(igt_output_t *output);
 drmModeModeInfo *igt_output_get_mode(igt_output_t *output);
 void igt_output_override_mode(igt_output_t *output, drmModeModeInfo *mode);
 void igt_output_set_pipe(igt_output_t *output, enum pipe pipe);
+void igt_output_set_scaling_mode(igt_output_t *output, uint64_t scaling_mode);
 igt_plane_t *igt_output_get_plane(igt_output_t *output, enum igt_plane plane);
 bool igt_pipe_get_property(igt_pipe_t *pipe, const char *name,
 			   uint32_t *prop_id, uint64_t *value,
Signature · 6 lines
2.5.5

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

PATCH v2 14/15 igt_kms: Allow disabling previous override mode

In reply to Maarten Lankhorst
---
 lib/igt_kms.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
lib/igt_kms.c +9 -3
index 681f2bb41b07..263f32883beb 100644
@@ -2378,7 +2378,7 @@ drmModeModeInfo *igt_output_get_mode(igt_output_t *output)
 /**
  * igt_output_override_mode:
  * @output: Output of which the mode will be overridden
- * @mode: New mode
+ * @mode: New mode, or NULL to disable override.
  *
  * Overrides the output's mode with @mode, so that it is used instead of the
  * mode obtained with get connectors. Note that the mode is used without
@@ -2388,8 +2388,14 @@ 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 (mode)
+		output->override_mode = *mode;
+	else /* restore default_mode, may have been overwritten in igt_output_refresh */
+		kmstest_get_connector_default_mode(output->display->drm_fd,
+						   output->config.connector,
+						   &output->config.default_mode);
+
+	output->use_override_mode = !!mode;
 
 	if (pipe)
 		pipe->mode_changed = true;
Signature · 6 lines
2.5.5

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

PATCH v2 15/15 kms_panel_fitting: Add tests for fastboot.

In reply to Maarten Lankhorst

This is a small testcase to ensure fastboot works as intended. When I removed the pipe updates in intel_update_pipe_config the test started failing, so I think it's useful to keep.

---
 tests/kms_panel_fitting.c | 101 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 94 insertions(+), 7 deletions(-)
tests/kms_panel_fitting.c +94 -7
index da09da32d704..acc51ec5cc88 100644
@@ -24,7 +24,7 @@
 
 #include "igt.h"
 #include <math.h>
-
+#include <sys/stat.h>
 
 IGT_TEST_DESCRIPTION("Test display panel fitting");
 
@@ -214,16 +214,103 @@ static void test_panel_fitting(data_t *d)
 	igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
 }
 
-igt_simple_main
+static void
+test_panel_fitting_fastset(igt_display_t *display, const enum pipe pipe, igt_output_t *output)
+{
+	igt_plane_t *primary, *sprite;
+	drmModeModeInfo mode;
+	igt_crc_t topleft, cur_crc;
+	igt_pipe_crc_t *pipe_crc;
+
+	struct igt_fb black, red;
+
+	igt_assert(kmstest_get_connector_default_mode(display->drm_fd, output->config.connector, &mode));
+
+	igt_output_override_mode(output, &mode);
+	igt_output_set_pipe(output, pipe);
+
+	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
+	sprite = igt_output_get_plane(output, IGT_PLANE_2);
+
+	igt_create_color_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
+			    DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE,
+			    0.f, 0.f, 0.f, &black);
+
+	igt_create_color_fb(display->drm_fd, 640, 480,
+			    DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE,
+			    1.f, 0.f, 0.f, &red);
+
+	igt_plane_set_fb(primary, &black);
+	igt_plane_set_fb(sprite, &red);
+
+	igt_display_commit2(display, COMMIT_ATOMIC);
+
+	pipe_crc = igt_pipe_crc_new(pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
+	igt_pipe_crc_collect_crc(pipe_crc, &topleft);
+
+	mode.hdisplay = 640;
+	mode.vdisplay = 480;
+	igt_output_override_mode(output, &mode);
+
+	igt_plane_set_fb(sprite, NULL);
+	igt_plane_set_fb(primary, &red);
+
+	/* Don't pass ALLOW_MODESET with overridden mode, force fastset. */
+	igt_display_commit_atomic(display, 0, NULL);
+
+	igt_pipe_crc_collect_crc(pipe_crc, &cur_crc);
+
+	igt_assert(!igt_crc_equal(&topleft, &cur_crc));
+
+	igt_plane_set_fb(primary, NULL);
+	igt_output_set_pipe(output, PIPE_NONE);
+	igt_output_override_mode(output, NULL);
+
+	igt_pipe_crc_free(pipe_crc);
+}
+
+static void test_atomic_fastset(igt_display_t *display)
+{
+	igt_output_t *output;
+	enum pipe pipe;
+	int valid_tests = 0;
+	struct stat sb;
+
+	/* Until this is force enabled, force modeset evasion. */
+	if (stat("/sys/module/i915/parameters/fastboot", &sb) == 0)
+		igt_set_module_param_int("fastboot", 1);
+
+	igt_require_pipe_crc();
+	igt_require(display->is_atomic);
+	igt_require(intel_gen(intel_get_drm_devid(display->drm_fd)) >= 5);
+
+	for_each_pipe_with_valid_output(display, pipe, output) {
+		if (!output->config.atomic_props_connector[IGT_CONNECTOR_SCALING_MODE])
+			continue;
+
+		test_panel_fitting_fastset(display, pipe, output);
+		valid_tests++;
+	}
+	igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
+}
+
+igt_main
 {
 	data_t data = {};
 
-	igt_skip_on_simulation();
+	igt_fixture {
+		igt_skip_on_simulation();
+
+		data.drm_fd = drm_open_driver(DRIVER_ANY);
+		igt_display_init(&data.display, data.drm_fd);
+	}
 
-	data.drm_fd = drm_open_driver(DRIVER_ANY);
-	igt_display_init(&data.display, data.drm_fd);
+	igt_subtest("legacy")
+		test_panel_fitting(&data);
 
-	test_panel_fitting(&data);
+	igt_subtest("atomic-fastset")
+		test_atomic_fastset(&data.display);
 
-	igt_display_fini(&data.display);
+	igt_fixture
+		igt_display_fini(&data.display);
 }
Signature · 6 lines
2.5.5

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