diff --git a/src/gallium/drivers/iris/iris_clear.c b/src/gallium/drivers/iris/iris_clear.c index 16387b43aa5a1fe3a306830ecc4cf0bbe86408d8..6391fdb504798e35915186670bcce7cc1a31505f 100644 --- a/src/gallium/drivers/iris/iris_clear.c +++ b/src/gallium/drivers/iris/iris_clear.c @@ -254,6 +254,11 @@ fast_clear_color(struct iris_context *ice, * and again afterwards to ensure that the resolve is complete before we * do any more regular drawing. */ + + /* Wa_14015264727, on DG2 we need to flush data cache before fast clear. */ + bool data_cache_flush_needed = + intel_device_info_is_dg2(&batch->screen->devinfo); + iris_emit_end_of_pipe_sync(batch, "fast clear: pre-flush", PIPE_CONTROL_RENDER_TARGET_FLUSH | @@ -262,6 +267,8 @@ fast_clear_color(struct iris_context *ice, PIPE_CONTROL_DEPTH_STALL : 0) | (devinfo->verx10 == 125 ? PIPE_CONTROL_FLUSH_HDC : 0) | + (data_cache_flush_needed ? + PIPE_CONTROL_DATA_CACHE_FLUSH : 0) | PIPE_CONTROL_PSS_STALL_SYNC); iris_batch_sync_region_start(batch); diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c index 6dab9036ea1df1d8685f5db5e9c8fa9b14df5256..7cc5e885d55689edf6e95ffd01dc60cfaca33347 100644 --- a/src/intel/vulkan/anv_blorp.c +++ b/src/intel/vulkan/anv_blorp.c @@ -1852,6 +1852,11 @@ anv_image_mcs_op(struct anv_cmd_buffer *cmd_buffer, * resolve and then use a second PIPE_CONTROL after the resolve to ensure * that it is completed before any additional drawing occurs. */ + + /* Wa_14015264727, on DG2 we need to flush data cache before fast clear. */ + bool data_cache_flush_needed = + intel_device_info_is_dg2(&cmd_buffer->device->info); + anv_add_pending_pipe_bits(cmd_buffer, ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT | ANV_PIPE_TILE_CACHE_FLUSH_BIT | @@ -1859,6 +1864,8 @@ anv_image_mcs_op(struct anv_cmd_buffer *cmd_buffer, ANV_PIPE_DEPTH_STALL_BIT : 0) | (devinfo->verx10 == 125 ? ANV_PIPE_HDC_PIPELINE_FLUSH_BIT : 0) | + (data_cache_flush_needed ? + ANV_PIPE_DATA_CACHE_FLUSH_BIT : 0) | ANV_PIPE_PSS_STALL_SYNC_BIT | ANV_PIPE_END_OF_PIPE_SYNC_BIT, "before fast clear mcs");