From 631756db56bedffc7d0ff5fced711a3464c2b78a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Wed, 7 Dec 2022 12:30:45 -0800 Subject: [PATCH] iris: Drop usage of i915 EXEC_OBJECT_WRITE MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The whole usage of this flag is to call iris_use_pinned_bo() with writable argument, for that we don't need any i915_drm.h specific type. IRIS_BLORP_RELOC_FLAGS_EXEC_OBJECT_WRITE could have any other value but keeping the same as i915_drm.h. With this we can drop 2 i915_drm.h imports from generic Iris code. Signed-off-by: José Roberto de Souza Reviewed-by: Lionel Landwerlin Part-of: --- src/gallium/drivers/iris/iris_batch.c | 2 -- src/gallium/drivers/iris/iris_batch.h | 3 --- src/gallium/drivers/iris/iris_blit.c | 6 +++--- src/gallium/drivers/iris/iris_blorp.c | 3 ++- src/gallium/drivers/iris/iris_context.h | 2 ++ 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c index 2ef56d6..1b2b5cf 100644 --- a/src/gallium/drivers/iris/iris_batch.c +++ b/src/gallium/drivers/iris/iris_batch.c @@ -44,8 +44,6 @@ #include "iris_kmd_backend.h" #include "iris_utrace.h" -#include "drm-uapi/i915_drm.h" - #include "common/intel_aux_map.h" #include "intel/common/intel_gem.h" #include "intel/ds/intel_tracepoints.h" diff --git a/src/gallium/drivers/iris/iris_batch.h b/src/gallium/drivers/iris/iris_batch.h index 4fde6ac..414740a 100644 --- a/src/gallium/drivers/iris/iris_batch.h +++ b/src/gallium/drivers/iris/iris_batch.h @@ -31,7 +31,6 @@ #include "util/u_dynarray.h" #include "util/perf/u_trace.h" -#include "drm-uapi/i915_drm.h" #include "common/intel_decoder.h" #include "ds/intel_driver_ds.h" #include "ds/intel_tracepoints.h" @@ -222,8 +221,6 @@ bool iris_batch_references(struct iris_batch *batch, struct iris_bo *bo); bool iris_batch_prepare_noop(struct iris_batch *batch, bool noop_enable); -#define RELOC_WRITE EXEC_OBJECT_WRITE - void iris_use_pinned_bo(struct iris_batch *batch, struct iris_bo *bo, bool writable, enum iris_domain access); diff --git a/src/gallium/drivers/iris/iris_blit.c b/src/gallium/drivers/iris/iris_blit.c index a6a798a..35a3946 100644 --- a/src/gallium/drivers/iris/iris_blit.c +++ b/src/gallium/drivers/iris/iris_blit.c @@ -245,7 +245,7 @@ iris_blorp_surf_for_resource(struct isl_device *isl_dev, .addr = (struct blorp_address) { .buffer = res->bo, .offset = res->offset, - .reloc_flags = is_dest ? EXEC_OBJECT_WRITE : 0, + .reloc_flags = is_dest ? IRIS_BLORP_RELOC_FLAGS_EXEC_OBJECT_WRITE : 0, .mocs = iris_mocs(res->bo, isl_dev, is_dest ? ISL_SURF_USAGE_RENDER_TARGET_BIT : ISL_SURF_USAGE_TEXTURE_BIT), @@ -259,7 +259,7 @@ iris_blorp_surf_for_resource(struct isl_device *isl_dev, surf->aux_addr = (struct blorp_address) { .buffer = res->aux.bo, .offset = res->aux.offset, - .reloc_flags = is_dest ? EXEC_OBJECT_WRITE : 0, + .reloc_flags = is_dest ? IRIS_BLORP_RELOC_FLAGS_EXEC_OBJECT_WRITE : 0, .mocs = iris_mocs(res->bo, isl_dev, 0), .local_hint = devinfo->has_flat_ccs || iris_bo_likely_local(res->aux.bo), @@ -705,7 +705,7 @@ iris_copy_region(struct blorp_context *blorp, }; struct blorp_address dst_addr = { .buffer = dst_res->bo, .offset = dst_res->offset + dstx, - .reloc_flags = EXEC_OBJECT_WRITE, + .reloc_flags = IRIS_BLORP_RELOC_FLAGS_EXEC_OBJECT_WRITE, .mocs = iris_mocs(dst_res->bo, &screen->isl_dev, ISL_SURF_USAGE_RENDER_TARGET_BIT), .local_hint = iris_bo_likely_local(dst_res->bo), diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c index 33c2acf..902fabe 100644 --- a/src/gallium/drivers/iris/iris_blorp.c +++ b/src/gallium/drivers/iris/iris_blorp.c @@ -92,7 +92,8 @@ combine_and_pin_address(struct blorp_batch *blorp_batch, struct iris_batch *batch = blorp_batch->driver_batch; struct iris_bo *bo = addr.buffer; - iris_use_pinned_bo(batch, bo, addr.reloc_flags & RELOC_WRITE, + iris_use_pinned_bo(batch, bo, + addr.reloc_flags & IRIS_BLORP_RELOC_FLAGS_EXEC_OBJECT_WRITE, IRIS_DOMAIN_NONE); /* Assume this is a general address, not relative to a base. */ diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index 1a9638d..046a8ab 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -916,6 +916,8 @@ void iris_fill_cs_push_const_buffer(struct brw_cs_prog_data *cs_prog_data, /* iris_blit.c */ +#define IRIS_BLORP_RELOC_FLAGS_EXEC_OBJECT_WRITE (1 << 2) + void iris_blorp_surf_for_resource(struct isl_device *isl_dev, struct blorp_surf *surf, struct pipe_resource *p_res, -- 2.7.4