diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 8edfec65369..79d6169e638 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -611,7 +611,10 @@ fs_reg::component_size(unsigned width) const
       const unsigned vs = vstride ? 1 << (vstride - 1) : 0;
       const unsigned hs = hstride ? 1 << (hstride - 1) : 0;
       assert(w > 0);
-      return ((MAX2(1, h) - 1) * vs + (w - 1) * hs + 1) * brw_type_size_bytes(type);
+      /* Note this rounds up to next horizontal stride to be consistent with
+       * the VGRF case below.
+       */
+      return ((MAX2(1, h) - 1) * vs + MAX2(w * hs, 1)) * brw_type_size_bytes(type);
    } else {
       return MAX2(width * stride, 1) * brw_type_size_bytes(type);
    }
diff --git a/src/intel/compiler/test_fs_scoreboard.cpp b/src/intel/compiler/test_fs_scoreboard.cpp
index 141c94d1d8f..2a44f532bfc 100644
--- a/src/intel/compiler/test_fs_scoreboard.cpp
+++ b/src/intel/compiler/test_fs_scoreboard.cpp
@@ -892,7 +892,7 @@ TEST_F(scoreboard_test, gfx125_RaR_over_different_pipes)
    EXPECT_EQ(instruction(block0, 2)->sched, tgl_swsb_regdist(1));
 }
 
-TEST_F(scoreboard_test, DISABLED_gitlab_issue_from_mr_29723)
+TEST_F(scoreboard_test, gitlab_issue_from_mr_29723)
 {
    brw_init_isa_info(&compiler->isa, devinfo);
 
@@ -916,7 +916,7 @@ TEST_F(scoreboard_test, DISABLED_gitlab_issue_from_mr_29723)
    EXPECT_EQ(instruction(block0, 1)->sched, tgl_swsb_regdist(1));
 }
 
-TEST_F(scoreboard_test, DISABLED_gitlab_issue_11069)
+TEST_F(scoreboard_test, gitlab_issue_11069)
 {
    brw_init_isa_info(&compiler->isa, devinfo);