diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2024-04-11 21:15:14 +0300 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2024-04-16 15:29:27 +0300 |
commit | 5568e6b82169fc2055606d6a295dcd05c83d2f0e (patch) | |
tree | ad48b568aa749003b03a42c98a8d66002e31e379 | |
parent | f8af117ae4bf3d292474fde714277fa4f6e5fc51 (diff) |
lib/kms: Adjust forced_connectors[] traversal
Get rid of the sentinel in forced_comnectors[] and just
use ARRAY_SIZE() to determine the limits.
The sentinel stuff actually looks broken due to the use of
ARRAY_SIZE() in forced_connector_free_index(), which was
apparently my doing in
commit ed6539ced33e ("lib/igt_kms: Rework forced connector handling")
Reviewed-by: Kunal Joshi <kunal1.joshi@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-rw-r--r-- | lib/igt_kms.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c index d20a93372..86651e3de 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -98,7 +98,7 @@ struct igt_forced_connector { int dir; }; -static struct igt_forced_connector forced_connectors[MAX_CONNECTORS + 1]; +static struct igt_forced_connector forced_connectors[MAX_CONNECTORS]; /** * igt_kms_get_base_edid: @@ -1499,7 +1499,7 @@ static bool connector_is_forced(int idx, drmModeConnector *connector) { igt_assert(connector->connector_type != 0); - for (int i = 0; forced_connectors[i].connector_type; i++) { + for (int i = 0; i < ARRAY_SIZE(forced_connectors); i++) { struct igt_forced_connector *c = &forced_connectors[i]; if (c->idx == idx && @@ -1513,15 +1513,14 @@ static bool connector_is_forced(int idx, drmModeConnector *connector) static struct igt_forced_connector *forced_connector_alloc(void) { - int i; - - for (i = 0; forced_connectors[i].connector_type; i++) - ; + for (int i = 0; i < ARRAY_SIZE(forced_connectors); i++) { + struct igt_forced_connector *c = &forced_connectors[i]; - if (i >= ARRAY_SIZE(forced_connectors)) - return NULL; + if (!c->connector_type) + return c; + } - return &forced_connectors[i]; + return NULL; } static bool force_connector(int drm_fd, @@ -1578,9 +1577,12 @@ static void dump_forced_connectors(void) igt_debug("Current forced connectors:\n"); - for (int i = 0; forced_connectors[i].connector_type; i++) { + for (int i = 0; i < ARRAY_SIZE(forced_connectors); i++) { struct igt_forced_connector *c = &forced_connectors[i]; + if (!c->connector_type) + continue; + kmstest_connector_dirname(c->idx, c->connector_type, c->connector_type_id, name, sizeof(name)); @@ -5311,9 +5313,12 @@ void igt_reset_connectors(void) { /* reset the connectors stored in forced_connectors, avoiding any * functions that are not safe to call in signal handlers */ - for (int i = 0; i < forced_connectors[i].connector_type; i++) { + for (int i = 0; i < ARRAY_SIZE(forced_connectors); i++) { struct igt_forced_connector *c = &forced_connectors[i]; + if (!c->connector_type) + continue; + igt_sysfs_set(c->dir, "status", "detect"); } } |