minigbm: use drv_add_combination when adding a single combination

We defined the function, but it's since gone unused.

Change-Id: I23e7e57413c4a7c82d9da302b79e6b9c5068654d
Reviewed-on: https://chromium-review.googlesource.com/1229438
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

diff --git a/helpers.c b/helpers.c
index 49cedb0..6dbc7ce 100644 (file)
--- a/helpers.c
+++ b/helpers.c
@@ -481,6 +481,16 @@ void drv_decrement_reference_count(struct driver *drv, struct bo *bo, size_t pla
                drmHashInsert(drv->buffer_table, bo->handles[plane].u32, (void *)(num - 1));
 }
 
+void drv_add_combination(struct driver *drv, const uint32_t format,
+                        struct format_metadata *metadata, uint64_t use_flags)
+{
+       struct combination combo = { .format = format,
+                                    .metadata = *metadata,
+                                    .use_flags = use_flags };
+
+       drv_array_append(drv->combos, &combo);
+}
+
 void drv_add_combinations(struct driver *drv, const uint32_t *formats, uint32_t num_formats,
                          struct format_metadata *metadata, uint64_t use_flags)
 {

diff --git a/helpers.h b/helpers.h
index 0d772ac..4f68c3b 100644 (file)
--- a/helpers.h
+++ b/helpers.h
@@ -25,8 +25,8 @@ int drv_get_prot(uint32_t map_flags);
 uintptr_t drv_get_reference_count(struct driver *drv, struct bo *bo, size_t plane);
 void drv_increment_reference_count(struct driver *drv, struct bo *bo, size_t plane);
 void drv_decrement_reference_count(struct driver *drv, struct bo *bo, size_t plane);
-int drv_add_combination(struct driver *drv, uint32_t format, struct format_metadata *metadata,
-                       uint64_t usage);
+void drv_add_combination(struct driver *drv, uint32_t format, struct format_metadata *metadata,
+                        uint64_t usage);
 void drv_add_combinations(struct driver *drv, const uint32_t *formats, uint32_t num_formats,
                          struct format_metadata *metadata, uint64_t usage);
 void drv_modify_combination(struct driver *drv, uint32_t format, struct format_metadata *metadata,

diff --git a/i915.c b/i915.c
index 3f62638..773fb69 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -185,9 +185,8 @@ static int i915_add_combinations(struct driver *drv)
                             texture_use_flags);
 
        /* Support y-tiled NV12 for libva */
-       const uint32_t nv12_format = DRM_FORMAT_NV12;
-       drv_add_combinations(drv, &nv12_format, 1, &metadata,
-                            BO_USE_TEXTURE | BO_USE_HW_VIDEO_DECODER);
+       drv_add_combination(drv, DRM_FORMAT_NV12, &metadata,
+                           BO_USE_TEXTURE | BO_USE_HW_VIDEO_DECODER);
 
        kms_items = drv_query_kms(drv);
        if (!kms_items)