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

Revert "anv: Refactor anv_pipeline to use the anv_pipeline_type"

Browse Source 
This reverts commit b1126abb38.

This breaks all hell at least on DG2, as there are several cases left
where current_pipeline gets checked against GPGPU to decide what to do,
and the value doesn't match that of ANV_HW_PIPELINE_STATE_COMPUTE.
On top of that, it also misses checking for
ANV_HW_PIPELINE_STATE_RAYTRACING.

Then there's the fact that in some cases, current_pipeline will be
UINT32_MAX, because it's the original undefined state and also used
after executing a secondary command buffer because we are not tracking
on which pipeline did the secondary left us.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7910
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20349>
This commit is contained in:
Iván Briano
2022-12-15 21:25:13 -08:00
committed by Marge Bot
parent 94f2619b7d
commit 766508f56a
5 changed files with 39 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/vulkan/genX_cmd_buffer.c
+10 -25
View File
@@ -56,7 +56,7 @@
#include "genX_cmd_draw_helpers.h"
static void genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer,
enum anv_hw_pipeline_state pipeline);
uint32_t pipeline);
static enum anv_pipe_bits
convert_pc_to_bits(struct GENX(PIPE_CONTROL) *pc) {
@@ -156,8 +156,7 @@ genX(cmd_buffer_emit_state_base_address)(struct anv_cmd_buffer *cmd_buffer)
* Workaround the non pipelined state not applying in MEDIA/GPGPU pipeline
* mode by putting the pipeline temporarily in 3D mode.
*/
enum anv_hw_pipeline_state gfx12_wa_pipeline =
cmd_buffer->state.current_pipeline;
uint32_t gfx12_wa_pipeline = cmd_buffer->state.current_pipeline;
genX(flush_pipeline_select_3d)(cmd_buffer);
#endif
@@ -1518,7 +1517,7 @@ genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer,
ALWAYS_INLINE enum anv_pipe_bits
genX(emit_apply_pipe_flushes)(struct anv_batch *batch,
struct anv_device *device,
enum anv_hw_pipeline_state current_pipeline,
uint32_t current_pipeline,
enum anv_pipe_bits bits)
{
#if GFX_VER >= 12
@@ -1619,7 +1618,7 @@ genX(emit_apply_pipe_flushes)(struct anv_batch *batch,
* The same text exists a few rows below for Post Sync Op.
*/
if (bits & ANV_PIPE_POST_SYNC_BIT) {
if (GFX_VER == 9 && current_pipeline == ANV_HW_PIPELINE_STATE_COMPUTE)
if (GFX_VER == 9 && current_pipeline == GPGPU)
bits |= ANV_PIPE_CS_STALL_BIT;
bits &= ~ANV_PIPE_POST_SYNC_BIT;
}
@@ -6146,23 +6145,9 @@ genX(CmdTraceRaysIndirect2KHR)(
#endif /* GFX_VERx10 >= 125 */
static uint32_t
anv_pipeline_selection_from_type(enum anv_hw_pipeline_state pipeline)
{
switch (pipeline) {
case ANV_HW_PIPELINE_STATE_GRAPHICS:
return _3D;
case ANV_HW_PIPELINE_STATE_COMPUTE:
case ANV_HW_PIPELINE_STATE_RAY_TRACING:
return GPGPU;
default:
unreachable("Unsupported pipeline");
}
}
static void
genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer,
enum anv_hw_pipeline_state pipeline)
uint32_t pipeline)
{
UNUSED const struct intel_device_info *devinfo = cmd_buffer->device->info;
@@ -6179,10 +6164,10 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer,
* The internal hardware docs recommend the same workaround for Gfx9
* hardware too.
*/
if (pipeline == ANV_HW_PIPELINE_STATE_COMPUTE)
if (pipeline == GPGPU)
anv_batch_emit(&cmd_buffer->batch, GENX(3DSTATE_CC_STATE_POINTERS), t);
if (pipeline == ANV_HW_PIPELINE_STATE_GRAPHICS) {
if (pipeline == _3D) {
/* There is a mid-object preemption workaround which requires you to
* re-emit MEDIA_VFE_STATE after switching from GPGPU to 3D. However,
* even without preemption, we have issues with geometry flickering when
@@ -6234,7 +6219,7 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer,
anv_batch_emit(&cmd_buffer->batch, GENX(PIPELINE_SELECT), ps) {
ps.MaskBits = GFX_VER >= 12 ? 0x13 : 3;
ps.MediaSamplerDOPClockGateEnable = GFX_VER >= 12;
ps.PipelineSelection = anv_pipeline_selection_from_type(pipeline);
ps.PipelineSelection = pipeline;
}
#if GFX_VER == 9
@@ -6260,13 +6245,13 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer,
void
genX(flush_pipeline_select_3d)(struct anv_cmd_buffer *cmd_buffer)
{
genX(flush_pipeline_select)(cmd_buffer, ANV_HW_PIPELINE_STATE_GRAPHICS);
genX(flush_pipeline_select)(cmd_buffer, _3D);
}
void
genX(flush_pipeline_select_gpgpu)(struct anv_cmd_buffer *cmd_buffer)
{
genX(flush_pipeline_select)(cmd_buffer, ANV_HW_PIPELINE_STATE_COMPUTE);
genX(flush_pipeline_select)(cmd_buffer, GPGPU);
}
void