diff --git a/i915.c b/i915.c
index fc638049..8ec6cdd1 100644
--- a/i915.c
+++ b/i915.c
@@ -377,27 +377,7 @@ static int i915_align_dimensions(struct bo *bo, uint32_t tiling, uint32_t *strid
 		vertical_alignment = 32;
 		break;
 	}
-	if (i915->genx10 >= 125) {
-		/*
-		 * The alignment calculated above is based on the full size luma plane and to have
-		 * chroma
-		 * planes properly aligned with subsampled formats, we need to multiply luma
-		 * alignment by
-		 * subsampling factor.
-		 */
-		switch (bo->meta.format) {
-		case DRM_FORMAT_YVU420_ANDROID:
-		case DRM_FORMAT_YVU420:
-			horizontal_alignment *= 2;
-
-		/* Fall through */
 
-		case DRM_FORMAT_NV12:
-			vertical_alignment *= 2;
-			break;
-		}
-		i915_private_align_dimensions(bo->meta.format, &vertical_alignment);
-	}
 	*aligned_height = ALIGN(*aligned_height, vertical_alignment);
 
 #ifdef USE_GRALLOC1
diff --git a/i915_private.c b/i915_private.c
index 72689468..13885900 100644
--- a/i915_private.c
+++ b/i915_private.c
@@ -134,15 +134,6 @@ int i915_private_add_combinations(struct driver *drv)
 	return 0;
 }
 
-void i915_private_align_dimensions(uint32_t format, uint32_t *vertical_alignment)
-{
-	switch (format) {
-	case DRM_FORMAT_NV12_Y_TILED_INTEL:
-		*vertical_alignment = 64;
-		break;
-	}
-}
-
 uint32_t i915_private_bpp_from_format(uint32_t format, size_t plane)
 {
 	assert(plane < drv_num_planes_from_format(format));
diff --git a/i915_private.h b/i915_private.h
index ff50744c..531e514b 100644
--- a/i915_private.h
+++ b/i915_private.h
@@ -49,8 +49,6 @@ int i915_private_init(struct driver *drv, uint64_t *cursor_width, uint64_t *curs
 
 int i915_private_add_combinations(struct driver *drv);
 
-void i915_private_align_dimensions(uint32_t format, uint32_t *vertical_alignment);
-
 uint32_t i915_private_bpp_from_format(uint32_t format, size_t plane);
 
 void i915_private_vertical_subsampling_from_format(uint32_t *vertical_subsampling, uint32_t format,