intel/isl: Add basic modifier introspection

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
This commit is contained in:
Jason Ekstrand 2017-06-12 16:52:20 -07:00
parent 285242e674
commit a668ba9c18
4 changed files with 83 additions and 0 deletions

View File

@ -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 = \

View File

@ -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

View File

@ -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);

59
src/intel/isl/isl_drm.c Normal file
View File

@ -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;
}