From 8acf361db4190aa5f7c788019d1e42d1df031b81 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Tue, 20 Apr 2021 16:06:13 -0700 Subject: [PATCH] intel: Fix GEN_GEN macro checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 9da8a55b08f - intel: Rename GEN_GEN macro to GFX_VER Signed-off-by: Anuj Phogat Reviewed-by: Tapani Pälli Reviewed-by: Lionel Landwerlin Part-of: --- src/gallium/drivers/iris/iris_state.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index e00c6890d2a..c5d376cb3f5 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -3502,7 +3502,7 @@ iris_set_vertex_buffers(struct pipe_context *ctx, ro_bo(NULL, res->bo->gtt_offset + (int) buffer->buffer_offset); vb.MOCS = iris_mocs(res->bo, &screen->isl_dev, ISL_SURF_USAGE_VERTEX_BUFFER_BIT); -#if GEN_GEN >= 12 +#if GFX_VER >= 12 vb.L3BypassDisable = true; #endif } else { @@ -3751,7 +3751,7 @@ iris_set_stream_output_targets(struct pipe_context *ctx, iris_dirty_for_history(ice, res); } } -#if GEN_GEN >= 12 +#if GFX_VER >= 12 /* SO draws require flushing of const cache to make SO data * observable when VB/IB are cached in L3. */ @@ -6324,7 +6324,7 @@ iris_upload_dirty_render_state(struct iris_context *ice, (int) ice->draw.draw_params.offset); vb.MOCS = iris_mocs(res->bo, &batch->screen->isl_dev, ISL_SURF_USAGE_VERTEX_BUFFER_BIT); -#if GEN_GEN >= 12 +#if GFX_VER >= 12 vb.L3BypassDisable = true; #endif } @@ -6350,7 +6350,7 @@ iris_upload_dirty_render_state(struct iris_context *ice, (int) ice->draw.derived_draw_params.offset); vb.MOCS = iris_mocs(res->bo, &batch->screen->isl_dev, ISL_SURF_USAGE_VERTEX_BUFFER_BIT); -#if GEN_GEN >= 12 +#if GFX_VER >= 12 vb.L3BypassDisable = true; #endif } @@ -6637,7 +6637,7 @@ iris_upload_render_state(struct iris_context *ice, ISL_SURF_USAGE_INDEX_BUFFER_BIT); ib.BufferSize = bo->size - offset; ib.BufferStartingAddress = ro_bo(NULL, bo->gtt_offset + offset); -#if GEN_GEN >= 12 +#if GFX_VER >= 12 ib.L3BypassDisable = true; #endif }