intel/isl: Add basic modifier introspection

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>

diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 269d73dfcb08f71663a534d10e2cf0c29d659cd0..02c625a81dab4bee49c4ae3a65138b15dfc10b81 100644 (file)
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -38,6 +38,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/gallium/include \
        $(VALGRIND_CFLAGS) \
+       $(LIBDRM_CFLAGS) \
        $(DEFINES)
 
 AM_CFLAGS = \

diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 8b2f9fd055a029e08fb969ad417893b7e25750de..30643e04f08b5ceebce2ef2871fdc7b9140b86b5 100644 (file)
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -148,6 +148,7 @@ GENXML_GENERATED_FILES = \
 ISL_FILES = \
        isl/isl.c \
        isl/isl.h \
+       isl/isl_drm.c \
        isl/isl_format.c \
        isl/isl_priv.h \
        isl/isl_storage_image.c

diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index 07ff01a4270a1f110207170a7094c3fbe8470e49..563bcfb04d6f82097f3c3f83c3c08ea9f889e588 100644 (file)
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -1031,6 +1031,25 @@ struct isl_tile_info {
    struct isl_extent2d phys_extent_B;
 };
 
+/**
+ * Metadata about a DRM format modifier.
+ */
+struct isl_drm_modifier_info {
+   uint64_t modifier;
+
+   /** Text name of the modifier */
+   const char *name;
+
+   /** ISL tiling implied by this modifier */
+   enum isl_tiling tiling;
+
+   /** ISL aux usage implied by this modifier */
+   enum isl_aux_usage aux_usage;
+
+   /** Whether or not this modifier supports clear color */
+   bool supports_clear_color;
+};
+
 /**
  * @brief Input to surface initialization
  *
@@ -1494,6 +1513,9 @@ isl_tiling_is_std_y(enum isl_tiling tiling)
    return (1u << tiling) & ISL_TILING_STD_Y_MASK;
 }
 
+const struct isl_drm_modifier_info * ATTRIBUTE_CONST
+isl_drm_modifier_get_info(uint64_t modifier);
+
 struct isl_extent2d ATTRIBUTE_CONST
 isl_get_interleaved_msaa_px_size_sa(uint32_t samples);
 

diff --git a/src/intel/isl/isl_drm.c b/src/intel/isl/isl_drm.c
new file mode 100644 (file)
index 0000000..8fccc40
--- /dev/null
+++ b/src/intel/isl/isl_drm.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2017 Intel Corporation
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice (including the next
+ *  paragraph) shall be included in all copies or substantial portions of the
+ *  Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ *  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ *  IN THE SOFTWARE.
+ */
+
+#include <assert.h>
+#include <stdlib.h>
+
+#include <drm_fourcc.h>
+
+#include "isl.h"
+#include "common/gen_device_info.h"
+
+struct isl_drm_modifier_info modifier_info[] = {
+   {
+      .modifier = DRM_FORMAT_MOD_NONE,
+      .name = "DRM_FORMAT_MOD_NONE",
+      .tiling = ISL_TILING_LINEAR,
+   },
+   {
+      .modifier = I915_FORMAT_MOD_X_TILED,
+      .name = "I915_FORMAT_MOD_X_TILED",
+      .tiling = ISL_TILING_X,
+   },
+   {
+      .modifier = I915_FORMAT_MOD_Y_TILED,
+      .name = "I915_FORMAT_MOD_Y_TILED",
+      .tiling = ISL_TILING_Y0,
+   },
+};
+
+const struct isl_drm_modifier_info *
+isl_drm_modifier_get_info(uint64_t modifier)
+{
+   for (unsigned i = 0; i < ARRAY_SIZE(modifier_info); i++) {
+      if (modifier_info[i].modifier == modifier)
+         return &modifier_info[i];
+   }
+
+   return NULL;
+}