minigbm: Use more descriptive modifier names

DRM_FORMAT_MOD_NONE means that the buffer layout is "not modified", as
opposed to "no modifier present". In other words, linear, since the
assumption is that that's the starting point.  This was later
clarified by introducing the DRM_FORMAT_MOD_LINEAR as a alias for
DRM_FORMAT_MOD_NONE and DRM_FORMAT_MOD_INVALID as a NULL-like value
for modifiers.

This commit replaces DRM_FORMAT_MOD_NONE with DRM_FORMAT_MOD_LINEAR
where we mean linear (which is most places) and DRM_FORMAT_MOD_INVALID
where we want to indicate "no modifier" (in struct kms_item).

BUG=chromium:763760
TEST=Intel GPU board boots and has X-tiled framebuffers.

Change-Id: I93e1419e1ab4c04ad6ef3d48ada19487b880886d
Reviewed-on: https://chromium-review.googlesource.com/737409
Commit-Ready: Kristian H. Kristensen <hoegsberg@chromium.org>
Tested-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>

5 files changed, 10 insertions, 10 deletions

diff --git a/amdgpu.c b/amdgpu.c
index f858183..b5bcbb6 100644
--- a/amdgpu.c
+++ b/amdgpu.c
@@ -293,7 +293,7 @@ static int amdgpu_init(struct driver *drv)
 
 	metadata.tiling = ADDR_DISPLAYABLE << 16 | ADDR_TM_LINEAR_ALIGNED;
 	metadata.priority = 2;
-	metadata.modifier = DRM_FORMAT_MOD_NONE;
+	metadata.modifier = DRM_FORMAT_MOD_LINEAR;
 
 	ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
 				   &metadata, use_flags);
@@ -306,7 +306,7 @@ static int amdgpu_init(struct driver *drv)
 
 	metadata.tiling = ADDR_NON_DISPLAYABLE << 16 | ADDR_TM_LINEAR_ALIGNED;
 	metadata.priority = 3;
-	metadata.modifier = DRM_FORMAT_MOD_NONE;
+	metadata.modifier = DRM_FORMAT_MOD_LINEAR;
 
 	ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
 				   &metadata, use_flags);
diff --git a/helpers.c b/helpers.c
index def03f5..07044da 100644
--- a/helpers.c
+++ b/helpers.c
@@ -530,7 +530,7 @@ struct kms_item *drv_query_kms(struct driver *drv, uint32_t *num_items)
 			bool found = false;
 			for (k = 0; k < item_size; k++) {
 				if (items[k].format == plane->formats[j] &&
-				    items[k].modifier == DRM_FORMAT_MOD_NONE) {
+				    items[k].modifier == DRM_FORMAT_MOD_INVALID) {
 					items[k].use_flags |= use_flag;
 					found = true;
 					break;
@@ -551,7 +551,7 @@ struct kms_item *drv_query_kms(struct driver *drv, uint32_t *num_items)
 
 			if (!found) {
 				items[item_size].format = plane->formats[j];
-				items[item_size].modifier = DRM_FORMAT_MOD_NONE;
+				items[item_size].modifier = DRM_FORMAT_MOD_INVALID;
 				items[item_size].use_flags = use_flag;
 				item_size++;
 			}
diff --git a/i915.c b/i915.c
index e3886a6..3836012 100644
--- a/i915.c
+++ b/i915.c
@@ -63,7 +63,7 @@ static int i915_add_kms_item(struct driver *drv, const struct kms_item *item)
 		if (combo->format != item->format)
 			continue;
 
-		if (item->modifier == DRM_FORMAT_MOD_NONE &&
+		if (item->modifier == DRM_FORMAT_MOD_INVALID &&
 		    combo->metadata.tiling == I915_TILING_X) {
 			/*
 			 * FIXME: drv_query_kms() does not report the available modifiers
@@ -94,7 +94,7 @@ static int i915_add_combinations(struct driver *drv)
 
 	metadata.tiling = I915_TILING_NONE;
 	metadata.priority = 1;
-	metadata.modifier = DRM_FORMAT_MOD_NONE;
+	metadata.modifier = DRM_FORMAT_MOD_LINEAR;
 
 	ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
 				   &metadata, render_use_flags);
diff --git a/rockchip.c b/rockchip.c
index 97ca85b..5fb0be4 100644
--- a/rockchip.c
+++ b/rockchip.c
@@ -118,7 +118,7 @@ static int rockchip_init(struct driver *drv)
 
 	metadata.tiling = 0;
 	metadata.priority = 1;
-	metadata.modifier = DRM_FORMAT_MOD_NONE;
+	metadata.modifier = DRM_FORMAT_MOD_LINEAR;
 
 	ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
 				   &metadata, BO_USE_RENDER_MASK);
@@ -192,7 +192,7 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint
 		 * pick that */
 		afbc_bo_from_format(bo, width, height, format);
 	} else {
-		if (!has_modifier(modifiers, count, DRM_FORMAT_MOD_NONE)) {
+		if (!has_modifier(modifiers, count, DRM_FORMAT_MOD_LINEAR)) {
 			errno = EINVAL;
 			fprintf(stderr, "no usable modifier found\n");
 			return -1;
@@ -234,7 +234,7 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint
 static int rockchip_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
 			      uint64_t use_flags)
 {
-	uint64_t modifiers[] = { DRM_FORMAT_MOD_NONE };
+	uint64_t modifiers[] = { DRM_FORMAT_MOD_LINEAR };
 	return rockchip_bo_create_with_modifiers(bo, width, height, format, modifiers,
 						 ARRAY_SIZE(modifiers));
 }
diff --git a/tegra.c b/tegra.c
index 02f0d1a..d16a182 100644
--- a/tegra.c
+++ b/tegra.c
@@ -185,7 +185,7 @@ static int tegra_init(struct driver *drv)
 
 	metadata.tiling = NV_MEM_KIND_PITCH;
 	metadata.priority = 1;
-	metadata.modifier = DRM_FORMAT_MOD_NONE;
+	metadata.modifier = DRM_FORMAT_MOD_LINEAR;
 
 	ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
 				   &metadata, use_flags);