|
@@ -1373,6 +1373,12 @@ static int gfx_v8_0_kiq_init_ring(struct amdgpu_device *adev,
|
|
|
{
|
|
|
int r = 0;
|
|
|
|
|
|
+ if (amdgpu_sriov_vf(adev)) {
|
|
|
+ r = amdgpu_wb_get(adev, &adev->virt.reg_val_offs);
|
|
|
+ if (r)
|
|
|
+ return r;
|
|
|
+ }
|
|
|
+
|
|
|
ring->adev = NULL;
|
|
|
ring->ring_obj = NULL;
|
|
|
ring->use_doorbell = true;
|
|
@@ -1399,6 +1405,9 @@ static int gfx_v8_0_kiq_init_ring(struct amdgpu_device *adev,
|
|
|
static void gfx_v8_0_kiq_free_ring(struct amdgpu_ring *ring,
|
|
|
struct amdgpu_irq_src *irq)
|
|
|
{
|
|
|
+ if (amdgpu_sriov_vf(ring->adev))
|
|
|
+ amdgpu_wb_free(ring->adev, ring->adev->virt.reg_val_offs);
|
|
|
+
|
|
|
amdgpu_ring_fini(ring);
|
|
|
irq->data = NULL;
|
|
|
}
|
|
@@ -6720,6 +6729,32 @@ static void gfx_v8_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags)
|
|
|
amdgpu_ring_write(ring, 0);
|
|
|
}
|
|
|
|
|
|
+static void gfx_v8_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg)
|
|
|
+{
|
|
|
+ struct amdgpu_device *adev = ring->adev;
|
|
|
+
|
|
|
+ amdgpu_ring_write(ring, PACKET3(PACKET3_COPY_DATA, 4));
|
|
|
+ amdgpu_ring_write(ring, 0 | /* src: register*/
|
|
|
+ (5 << 8) | /* dst: memory */
|
|
|
+ (1 << 20)); /* write confirm */
|
|
|
+ amdgpu_ring_write(ring, reg);
|
|
|
+ amdgpu_ring_write(ring, 0);
|
|
|
+ amdgpu_ring_write(ring, lower_32_bits(adev->wb.gpu_addr +
|
|
|
+ adev->virt.reg_val_offs * 4));
|
|
|
+ amdgpu_ring_write(ring, upper_32_bits(adev->wb.gpu_addr +
|
|
|
+ adev->virt.reg_val_offs * 4));
|
|
|
+}
|
|
|
+
|
|
|
+static void gfx_v8_0_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,
|
|
|
+ uint32_t val)
|
|
|
+{
|
|
|
+ amdgpu_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
|
|
|
+ amdgpu_ring_write(ring, (1 << 16)); /* no inc addr */
|
|
|
+ amdgpu_ring_write(ring, reg);
|
|
|
+ amdgpu_ring_write(ring, 0);
|
|
|
+ amdgpu_ring_write(ring, val);
|
|
|
+}
|
|
|
+
|
|
|
static void gfx_v8_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,
|
|
|
enum amdgpu_interrupt_state state)
|
|
|
{
|
|
@@ -7035,6 +7070,8 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_kiq = {
|
|
|
.test_ib = gfx_v8_0_ring_test_ib,
|
|
|
.insert_nop = amdgpu_ring_insert_nop,
|
|
|
.pad_ib = amdgpu_ring_generic_pad_ib,
|
|
|
+ .emit_rreg = gfx_v8_0_ring_emit_rreg,
|
|
|
+ .emit_wreg = gfx_v8_0_ring_emit_wreg,
|
|
|
};
|
|
|
|
|
|
static void gfx_v8_0_set_ring_funcs(struct amdgpu_device *adev)
|