summaryrefslogtreecommitdiff
path: root/tests/kms_dp_tiled_display.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2021-01-01 17:03:43 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2021-01-01 17:21:18 +0000
commit00eade054575c876c68b565c8d339cf69f8bec34 (patch)
treea2b150a600242d052676ffa0ee4e23c4ef80bccd /tests/kms_dp_tiled_display.c
parent479562b21cef0f66925d833e1a4916ff5b80e30a (diff)
kms_dp_tiled_display: Rearrange loops to avoid uninitialised values
../tests/kms_dp_tiled_display.c:77:14: warning: variable 'blob' is used uninitialized whenever 'for' loop exits because its condition is false [-Wsometimes-uninitialized] for (i = 0; i < conn->count_props; i++) { ^~~~~~~~~~~~~~~~~~~~~ ../tests/kms_dp_tiled_display.c:99:26: note: uninitialized use occurs here drmModeFreePropertyBlob(blob); Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Acked-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Diffstat (limited to 'tests/kms_dp_tiled_display.c')
-rw-r--r--tests/kms_dp_tiled_display.c35
1 files changed, 14 insertions, 21 deletions
diff --git a/tests/kms_dp_tiled_display.c b/tests/kms_dp_tiled_display.c
index b1160fee..9e738a4f 100644
--- a/tests/kms_dp_tiled_display.c
+++ b/tests/kms_dp_tiled_display.c
@@ -70,33 +70,26 @@ static int drm_property_is_tile(drmModePropertyPtr prop)
static void get_connector_tile_props(data_t *data, drmModeConnectorPtr conn,
igt_tile_info_t *tile)
{
- int i = 0;
- drmModePropertyPtr prop;
- drmModePropertyBlobPtr blob;
+ for (int i = 0; i < conn->count_props; i++) {
+ drmModePropertyBlobPtr blob;
+ drmModePropertyPtr prop;
- for (i = 0; i < conn->count_props; i++) {
prop = drmModeGetProperty(data->drm_fd, conn->props[i]);
-
igt_assert(prop);
- if (!drm_property_is_tile(prop)) {
- drmModeFreeProperty(prop);
- continue;
+ blob = NULL;
+ if (drm_property_is_tile(prop)) {
+ blob = drmModeGetPropertyBlob(data->drm_fd,
+ conn->prop_values[i]);
+ if (blob) {
+ igt_parse_connector_tile_blob(blob, tile);
+ drmModeFreePropertyBlob(blob);
+ }
}
-
- blob = drmModeGetPropertyBlob(data->drm_fd,
- conn->prop_values[i]);
-
- if (!blob)
- goto cleanup;
-
- igt_parse_connector_tile_blob(blob, tile);
- break;
+ drmModeFreeProperty(prop);
+ if (blob)
+ return;
}
-
-cleanup:
- drmModeFreeProperty(prop);
- drmModeFreePropertyBlob(blob);
}
static void get_number_of_h_tiles(data_t *data)