AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel: Convert i915 engine type to intel in tools/ common/ and ds/

Browse Source 
This ones were left to be done after initial conversion.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18975>
This commit is contained in:
José Roberto de Souza
2022-10-05 12:52:05 -07:00
committed by Marge Bot
parent 5269d91efc
commit 772dfd60ad
17 changed files with 126 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/common/intel_batch_decoder.c
+1 -1
View File
@@ -51,7 +51,7 @@ intel_batch_decode_ctx_init(struct intel_batch_decode_ctx *ctx,
ctx->fp = fp;
ctx->flags = flags;
ctx->max_vbo_decoded_lines = -1; /* No limit! */
ctx->engine = I915_ENGINE_CLASS_RENDER;
ctx->engine = INTEL_ENGINE_CLASS_RENDER;
if (xml_path == NULL)
ctx->spec = intel_spec_load(devinfo);
src/intel/common/intel_decoder.c
+8 -8
View File
@@ -166,9 +166,9 @@ create_group(struct parser_context *ctx,
group->fixed_length = fixed_length;
group->dword_length_field = NULL;
group->dw_length = 0;
group->engine_mask = I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_RENDER) |
I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_VIDEO) |
I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_COPY);
group->engine_mask = INTEL_ENGINE_CLASS_TO_MASK(INTEL_ENGINE_CLASS_RENDER) |
INTEL_ENGINE_CLASS_TO_MASK(INTEL_ENGINE_CLASS_VIDEO) |
INTEL_ENGINE_CLASS_TO_MASK(INTEL_ENGINE_CLASS_COPY);
group->bias = 1;
for (int i = 0; atts[i]; i += 2) {
@@ -186,11 +186,11 @@ create_group(struct parser_context *ctx,
group->engine_mask = 0;
while (tok != NULL) {
if (strcmp(tok, "render") == 0) {
group->engine_mask |= I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_RENDER);
group->engine_mask |= INTEL_ENGINE_CLASS_TO_MASK(INTEL_ENGINE_CLASS_RENDER);
} else if (strcmp(tok, "video") == 0) {
group->engine_mask |= I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_VIDEO);
group->engine_mask |= INTEL_ENGINE_CLASS_TO_MASK(INTEL_ENGINE_CLASS_VIDEO);
} else if (strcmp(tok, "blitter") == 0) {
group->engine_mask |= I915_ENGINE_CLASS_TO_MASK(I915_ENGINE_CLASS_COPY);
group->engine_mask |= INTEL_ENGINE_CLASS_TO_MASK(INTEL_ENGINE_CLASS_COPY);
} else {
fprintf(stderr, "unknown engine class defined for instruction \"%s\": %s\n", name, atts[i + 1]);
}
@@ -751,13 +751,13 @@ void intel_spec_destroy(struct intel_spec *spec)
struct intel_group *
intel_spec_find_instruction(struct intel_spec *spec,
enum drm_i915_gem_engine_class engine,
enum intel_engine_class engine,
const uint32_t *p)
{
hash_table_foreach(spec->commands, entry) {
struct intel_group *command = entry->data;
uint32_t opcode = *p & command->opcode_mask;
if ((command->engine_mask & I915_ENGINE_CLASS_TO_MASK(engine)) &&
if ((command->engine_mask & INTEL_ENGINE_CLASS_TO_MASK(engine)) &&
opcode == command->opcode)
return command;
}
src/intel/common/intel_decoder.h
+4 -4
View File
@@ -32,7 +32,7 @@
#include "util/hash_table.h"
#include "util/bitset.h"
#include "drm-uapi/i915_drm.h"
#include "common/intel_engine.h"
#ifdef __cplusplus
extern "C" {
@@ -43,7 +43,7 @@ struct intel_group;
struct intel_field;
union intel_field_value;
#define I915_ENGINE_CLASS_TO_MASK(x) BITSET_BIT(x)
#define INTEL_ENGINE_CLASS_TO_MASK(x) BITSET_BIT(x)
static inline uint32_t intel_make_gen(uint32_t major, uint32_t minor)
{
@@ -59,7 +59,7 @@ struct intel_spec *intel_spec_load_filename(const char *filename);
void intel_spec_destroy(struct intel_spec *spec);
uint32_t intel_spec_get_gen(struct intel_spec *spec);
struct intel_group *intel_spec_find_instruction(struct intel_spec *spec,
enum drm_i915_gem_engine_class engine,
enum intel_engine_class engine,
const uint32_t *p);
struct intel_group *intel_spec_find_register(struct intel_spec *spec, uint32_t offset);
struct intel_group *intel_spec_find_register_by_name(struct intel_spec *spec, const char *name);
@@ -251,7 +251,7 @@ struct intel_batch_decode_ctx {
int max_vbo_decoded_lines;
enum drm_i915_gem_engine_class engine;
enum intel_engine_class engine;
int n_batch_buffer_start;
uint64_t acthd;