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

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
+4 -6
View File
@@ -30,8 +30,6 @@
#include <stdio.h>
#include <stdlib.h>
#include "drm-uapi/i915_drm.h"
#include "dev/intel_device_info.h"
#include "common/intel_gem.h"
@@ -74,7 +72,7 @@ struct aub_hw_context {
/* GEM context, as seen from userspace */
struct aub_context {
uint32_t id;
struct aub_hw_context hw_contexts[I915_ENGINE_CLASS_VIDEO + 1];
struct aub_hw_context hw_contexts[INTEL_ENGINE_CLASS_VIDEO + 1];
};
struct aub_file {
@@ -96,7 +94,7 @@ struct aub_file {
struct {
uint64_t hwsp_addr;
} engine_setup[I915_ENGINE_CLASS_VIDEO_ENHANCE + 1];
} engine_setup[INTEL_ENGINE_CLASS_VIDEO_ENHANCE + 1];
struct aub_context contexts[MAX_CONTEXT_COUNT];
int num_contexts;
@@ -131,9 +129,9 @@ void aub_write_trace_block(struct aub_file *aub,
uint32_t type, void *virtual,
uint32_t size, uint64_t gtt_offset);
void aub_write_exec(struct aub_file *aub, uint32_t ctx_id, uint64_t batch_addr,
uint64_t offset, enum drm_i915_gem_engine_class engine_class);
uint64_t offset, enum intel_engine_class engine_class);
void aub_write_context_execlists(struct aub_file *aub, uint64_t context_addr,
enum drm_i915_gem_engine_class engine_class);
enum intel_engine_class engine_class);
uint32_t aub_write_context_create(struct aub_file *aub, uint32_t *ctx_id);