Skip to contentSkip to conversation

libdrm: modetest: Allow selecting modes by index

PATCH In review John Stultz 2 participants 2 messages Jun 27, 2019 – Jan 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 libdrm: modetest: Allow selecting modes by index

Often there are many similar modes, which cannot be selected via modetest due to its simple string matching.

This change adds a mode index in the display output, which can then be used to specify a specific modeline to be set.

Cc Ilia Mirkin <[email protected]>
Cc Rob Clark <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Sumit Semwal <[email protected]>

---
v2: Reworked mode_str check per Ilia's suggestion
v3: Added index < 0 check per Ilia's suggestion

---
 tests/modetest/modetest.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)
tests/modetest/modetest.c +17 -6
index 9c85c07b..5e1b623a 100644
@@ -204,9 +204,10 @@ static void dump_encoders(struct device *dev)
 	printf("\n");
 }
 
-static void dump_mode(drmModeModeInfo *mode)
+static void dump_mode(drmModeModeInfo *mode, int index)
 {
-	printf("  %s %d %d %d %d %d %d %d %d %d %d",
+	printf("  #%i %s %d %d %d %d %d %d %d %d %d %d",
+	       index,
 	       mode->name,
 	       mode->vrefresh,
 	       mode->hdisplay,
@@ -443,10 +444,10 @@ static void dump_connectors(struct device *dev)
 
 		if (connector->count_modes) {
 			printf("  modes:\n");
-			printf("\tname refresh (Hz) hdisp hss hse htot vdisp "
+			printf("\tindex name refresh (Hz) hdisp hss hse htot vdisp "
 			       "vss vse vtot)\n");
 			for (j = 0; j < connector->count_modes; j++)
-				dump_mode(&connector->modes[j]);
+				dump_mode(&connector->modes[j], j);
 		}
 
 		if (_connector->props) {
@@ -478,7 +479,7 @@ static void dump_crtcs(struct device *dev)
 		       crtc->buffer_id,
 		       crtc->x, crtc->y,
 		       crtc->width, crtc->height);
-		dump_mode(&crtc->mode);
+		dump_mode(&crtc->mode, 0);
 
 		if (_crtc->props) {
 			printf("  props:\n");
@@ -829,6 +830,16 @@ connector_find_mode(struct device *dev, uint32_t con_id, const char *mode_str,
 	if (!connector || !connector->count_modes)
 		return NULL;
 
+	/* Pick by Index */
+	if (mode_str[0] == '#') {
+		int index = atoi(mode_str + 1);
+
+		if (index >= connector->count_modes || index < 0)
+			return NULL;
+		return &connector->modes[index];
+	}
+
+	/* Pick by Name */
 	for (i = 0; i < connector->count_modes; i++) {
 		mode = &connector->modes[i];
 		if (!strcmp(mode->name, mode_str)) {
@@ -1752,7 +1763,7 @@ static void usage(char *name)
 
 	fprintf(stderr, "\n Test options:\n\n");
 	fprintf(stderr, "\t-P <plane_id>@<crtc_id>:<w>x<h>[+<x>+<y>][*<scale>][@<format>]\tset a plane\n");
-	fprintf(stderr, "\t-s <connector_id>[,<connector_id>][@<crtc_id>]:<mode>[-<vrefresh>][@<format>]\tset a mode\n");
+	fprintf(stderr, "\t-s <connector_id>[,<connector_id>][@<crtc_id>]:[#<mode index>]<mode>[-<vrefresh>][@<format>]\tset a mode\n");
 	fprintf(stderr, "\t-C\ttest hw cursor\n");
 	fprintf(stderr, "\t-v\ttest vsynced page flipping\n");
 	fprintf(stderr, "\t-w <obj_id>:<prop_name>:<value>\tset property\n");
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw
Quoted 27 lines · John Stultz

Often there are many similar modes, which cannot be selected via modetest due to its simple string matching.

This change adds a mode index in the display output, which can then be used to specify a specific modeline to be set.

Cc Ilia Mirkin <[email protected]>
Cc Rob Clark <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Sumit Semwal <[email protected]>

---
v2: Reworked mode_str check per Ilia's suggestion
v3: Added index < 0 check per Ilia's suggestion

---
 tests/modetest/modetest.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)
tests/modetest/modetest.c +0 -0
index 9c85c07b..5e1b623a 100644
@@ -204,9 +204,10 @@ static void dump_encoders(struct device *dev)
        printf("\n");
 }

tests/modetest/modetest.c static void dump_encoders(struct device *dev) · line 213

Quoted 10 lines
tests/modetest/modetest.c +3 -2
 
-static void dump_mode(drmModeModeInfo *mode)
+static void dump_mode(drmModeModeInfo *mode, int index)
 {
-       printf("  %s %d %d %d %d %d %d %d %d %d %d",
+       printf("  #%i %s %d %d %d %d %d %d %d %d %d %d",
+              index,
               mode->name,
               mode->vrefresh,
               mode->hdisplay,

Thanks John.
Resolved a minor conflict in the above hunk and pushed to master.

Emil
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel