diff --git a/src/intel/compiler/elk/elk_disasm.c b/src/intel/compiler/elk/elk_disasm.c
index 628cca0f469..fe5bd126cdd 100644
--- a/src/intel/compiler/elk/elk_disasm.c
+++ b/src/intel/compiler/elk/elk_disasm.c
@@ -449,8 +449,8 @@ static const char *const dp_dc1_msg_type_hsw[32] = {
    [GFX9_DATAPORT_DC_PORT1_A64_SCATTERED_READ] = "DC A64 scattered read",
    [GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_SURFACE_READ] = "DC A64 untyped surface read",
    [GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_ATOMIC_OP] = "DC A64 untyped atomic op",
-   [GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ] = "DC A64 oword block read",
-   [GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE] = "DC A64 oword block write",
+   [GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ] = "DC A64 oword block read",
+   [GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE] = "DC A64 oword block write",
    [GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_SURFACE_WRITE] = "DC A64 untyped surface write",
    [GFX8_DATAPORT_DC_PORT1_A64_SCATTERED_WRITE] = "DC A64 scattered write",
    [GFX9_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_FLOAT_OP] =
@@ -2105,8 +2105,8 @@ elk_disassemble_inst(FILE *file, const struct elk_isa_info *isa,
                   control(file, "atomic float op", aop_float, msg_ctrl & 0xf,
                           &space);
                   break;
-               case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE:
-               case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ:
+               case GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE:
+               case GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ:
                   assert(dp_oword_block_rw[msg_ctrl & 7]);
                   format(file, "owords = %s, aligned = %d",
                         dp_oword_block_rw[msg_ctrl & 7], (msg_ctrl >> 3) & 3);
diff --git a/src/intel/compiler/elk/elk_eu.h b/src/intel/compiler/elk/elk_eu.h
index a19a274e56f..8bdd78aa522 100644
--- a/src/intel/compiler/elk/elk_eu.h
+++ b/src/intel/compiler/elk/elk_eu.h
@@ -878,8 +878,8 @@ elk_dp_a64_oword_block_rw_desc(const struct intel_device_info *devinfo,
    assert(!write || align_16B);
 
    unsigned msg_type =
-      write ? GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE :
-              GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ;
+      write ? GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE :
+              GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ;
 
    unsigned msg_control =
       SET_BITS(!align_16B, 4, 3) |
diff --git a/src/intel/compiler/elk/elk_eu_defines.h b/src/intel/compiler/elk/elk_eu_defines.h
index 7297a578d83..3601673e863 100644
--- a/src/intel/compiler/elk/elk_eu_defines.h
+++ b/src/intel/compiler/elk/elk_eu_defines.h
@@ -720,8 +720,8 @@ enum elk_message_target {
 #define GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_SURFACE_READ             0x11
 #define GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_ATOMIC_OP                0x12
 #define GFX12_DATAPORT_DC_PORT1_A64_UNTYPED_ATOMIC_HALF_INT_OP      0x13
-#define GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ                 0x14
-#define GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE                0x15
+#define GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ                 0x14
+#define GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE                0x15
 #define GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_SURFACE_WRITE            0x19
 #define GFX8_DATAPORT_DC_PORT1_A64_SCATTERED_WRITE                  0x1a
 #define GFX9_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_FLOAT_OP              0x1b
diff --git a/src/intel/compiler/elk/elk_schedule_instructions.cpp b/src/intel/compiler/elk/elk_schedule_instructions.cpp
index 3db06a4eaed..b68b5cfcee8 100644
--- a/src/intel/compiler/elk/elk_schedule_instructions.cpp
+++ b/src/intel/compiler/elk/elk_schedule_instructions.cpp
@@ -543,8 +543,8 @@ elk_schedule_node::set_latency_gfx7(const struct elk_isa_info *isa)
          case GFX8_DATAPORT_DC_PORT1_A64_UNTYPED_SURFACE_READ:
          case GFX8_DATAPORT_DC_PORT1_A64_SCATTERED_WRITE:
          case GFX9_DATAPORT_DC_PORT1_A64_SCATTERED_READ:
-         case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ:
-         case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE:
+         case GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ:
+         case GFX8_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE:
             /* See also GFX7_DATAPORT_DC_UNTYPED_SURFACE_READ */
             latency = 300;
             break;