|
@@ -4003,6 +4003,12 @@ static void gfx_v9_0_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,
|
|
amdgpu_ring_write(ring, val);
|
|
amdgpu_ring_write(ring, val);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void gfx_v9_0_ring_emit_reg_wait(struct amdgpu_ring *ring, uint32_t reg,
|
|
|
|
+ uint32_t val, uint32_t mask)
|
|
|
|
+{
|
|
|
|
+ gfx_v9_0_wait_reg_mem(ring, 0, 0, 0, reg, 0, val, mask, 0x20);
|
|
|
|
+}
|
|
|
|
+
|
|
static void gfx_v9_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,
|
|
static void gfx_v9_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,
|
|
enum amdgpu_interrupt_state state)
|
|
enum amdgpu_interrupt_state state)
|
|
{
|
|
{
|
|
@@ -4321,6 +4327,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = {
|
|
.patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec,
|
|
.patch_cond_exec = gfx_v9_0_ring_emit_patch_cond_exec,
|
|
.emit_tmz = gfx_v9_0_ring_emit_tmz,
|
|
.emit_tmz = gfx_v9_0_ring_emit_tmz,
|
|
.emit_wreg = gfx_v9_0_ring_emit_wreg,
|
|
.emit_wreg = gfx_v9_0_ring_emit_wreg,
|
|
|
|
+ .emit_reg_wait = gfx_v9_0_ring_emit_reg_wait,
|
|
};
|
|
};
|
|
|
|
|
|
static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = {
|
|
static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = {
|
|
@@ -4352,6 +4359,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = {
|
|
.pad_ib = amdgpu_ring_generic_pad_ib,
|
|
.pad_ib = amdgpu_ring_generic_pad_ib,
|
|
.set_priority = gfx_v9_0_ring_set_priority_compute,
|
|
.set_priority = gfx_v9_0_ring_set_priority_compute,
|
|
.emit_wreg = gfx_v9_0_ring_emit_wreg,
|
|
.emit_wreg = gfx_v9_0_ring_emit_wreg,
|
|
|
|
+ .emit_reg_wait = gfx_v9_0_ring_emit_reg_wait,
|
|
};
|
|
};
|
|
|
|
|
|
static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = {
|
|
static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = {
|
|
@@ -4379,6 +4387,7 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = {
|
|
.pad_ib = amdgpu_ring_generic_pad_ib,
|
|
.pad_ib = amdgpu_ring_generic_pad_ib,
|
|
.emit_rreg = gfx_v9_0_ring_emit_rreg,
|
|
.emit_rreg = gfx_v9_0_ring_emit_rreg,
|
|
.emit_wreg = gfx_v9_0_ring_emit_wreg,
|
|
.emit_wreg = gfx_v9_0_ring_emit_wreg,
|
|
|
|
+ .emit_reg_wait = gfx_v9_0_ring_emit_reg_wait,
|
|
};
|
|
};
|
|
|
|
|
|
static void gfx_v9_0_set_ring_funcs(struct amdgpu_device *adev)
|
|
static void gfx_v9_0_set_ring_funcs(struct amdgpu_device *adev)
|