Am 07.03.2018 um 21:34 schrieb Marek Olšák:
From: Marek Olšák <marek.ol...@amd.com>

---
  src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 4 ++++
  1 file changed, 4 insertions(+)

diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c 
b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
index d9a95c0..9cd3343 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
@@ -1531,20 +1531,24 @@ static int amdgpu_cs_flush(struct radeon_winsys_cs *rcs,
        /* pad GFX ring to 8 DWs to meet CP fetch alignment requirements */
        if (ws->info.gfx_ib_pad_with_type2) {
           while (rcs->current.cdw & 7)
              radeon_emit(rcs, 0x80000000); /* type2 nop packet */
        } else {
           while (rcs->current.cdw & 7)
              radeon_emit(rcs, 0xffff1000); /* type3 nop packet */
        }
        ws->gfx_ib_size_counter += (rcs->prev_dw + rcs->current.cdw) * 4;
        break;
+   case RING_COMPUTE:
+      while (rcs->current.cdw & 7)
+         radeon_emit(rcs, 0xffff1000); /* type3 nop packet */
+      break;

Not 100% sure, but I think we need to handle this like GFX ring as well.

E.g. only pad with 0xffff1000 when the firmware supports it, otherwise we need to use 0x80000000.

Christian.

     case RING_UVD:
     case RING_UVD_ENC:
        while (rcs->current.cdw & 15)
           radeon_emit(rcs, 0x80000000); /* type2 nop packet */
        break;
     case RING_VCN_DEC:
        while (rcs->current.cdw & 15)
           radeon_emit(rcs, 0x81ff); /* nop packet */
        break;
     default:

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to