diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index 73f659f2..9ea98da3 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -267,6 +267,7 @@ static const struct formatinfo {
 	{PICT_r8g8b8, GEN4_SURFACEFORMAT_R8G8B8_UNORM},
 	{PICT_r5g6b5, GEN4_SURFACEFORMAT_B5G6R5_UNORM},
 	{PICT_a1r5g5b5, GEN4_SURFACEFORMAT_B5G5R5A1_UNORM},
+	{PICT_x1r5g5b5, GEN4_SURFACEFORMAT_B5G5R5X1_UNORM},
 	{PICT_a2r10g10b10, GEN4_SURFACEFORMAT_B10G10R10A2_UNORM},
 	{PICT_x2r10g10b10, GEN4_SURFACEFORMAT_B10G10R10X2_UNORM},
 	{PICT_a2b10g10r10, GEN4_SURFACEFORMAT_R10G10B10A2_UNORM},
@@ -2174,6 +2175,7 @@ static uint32_t gen4_get_dest_format_for_depth(int depth)
 	default: return GEN4_SURFACEFORMAT_B8G8R8A8_UNORM;
 	case 30: return GEN4_SURFACEFORMAT_B10G10R10A2_UNORM;
 	case 16: return GEN4_SURFACEFORMAT_B5G6R5_UNORM;
+	case 15: return GEN4_SURFACEFORMAT_B5G5R5A1_UNORM;
 	case 8:  return GEN4_SURFACEFORMAT_A8_UNORM;
 	}
 }
@@ -2183,9 +2185,10 @@ static uint32_t gen4_get_card_format_for_depth(int depth)
 	switch (depth) {
 	case 32:
 	default: return GEN4_SURFACEFORMAT_B8G8R8A8_UNORM;
-	case 30: return GEN4_SURFACEFORMAT_B10G10R10A2_UNORM;
+	case 30: return GEN4_SURFACEFORMAT_B10G10R10X2_UNORM;
 	case 24: return GEN4_SURFACEFORMAT_B8G8R8X8_UNORM;
 	case 16: return GEN4_SURFACEFORMAT_B5G6R5_UNORM;
+	case 15: return GEN4_SURFACEFORMAT_B5G5R5X1_UNORM;
 	case 8:  return GEN4_SURFACEFORMAT_A8_UNORM;
 	}
 }
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index d09d6bc5..99a8f7cc 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -255,6 +255,7 @@ static const struct formatinfo {
 	{PICT_r8g8b8, GEN5_SURFACEFORMAT_R8G8B8_UNORM},
 	{PICT_r5g6b5, GEN5_SURFACEFORMAT_B5G6R5_UNORM},
 	{PICT_a1r5g5b5, GEN5_SURFACEFORMAT_B5G5R5A1_UNORM},
+	{PICT_x1r5g5b5, GEN5_SURFACEFORMAT_B5G5R5X1_UNORM},
 	{PICT_a2r10g10b10, GEN5_SURFACEFORMAT_B10G10R10A2_UNORM},
 	{PICT_x2r10g10b10, GEN5_SURFACEFORMAT_B10G10R10X2_UNORM},
 	{PICT_a2b10g10r10, GEN5_SURFACEFORMAT_R10G10B10A2_UNORM},
@@ -493,6 +494,7 @@ static uint32_t gen5_get_dest_format_for_depth(int depth)
 	default: return GEN5_SURFACEFORMAT_B8G8R8A8_UNORM;
 	case 30: return GEN5_SURFACEFORMAT_B10G10R10A2_UNORM;
 	case 16: return GEN5_SURFACEFORMAT_B5G6R5_UNORM;
+	case 15: return GEN5_SURFACEFORMAT_B5G5R5A1_UNORM;
 	case 8:  return GEN5_SURFACEFORMAT_A8_UNORM;
 	}
 }
@@ -502,9 +504,10 @@ static uint32_t gen5_get_card_format_for_depth(int depth)
 	switch (depth) {
 	case 32:
 	default: return GEN5_SURFACEFORMAT_B8G8R8A8_UNORM;
-	case 30: return GEN5_SURFACEFORMAT_B10G10R10A2_UNORM;
+	case 30: return GEN5_SURFACEFORMAT_B10G10R10X2_UNORM;
 	case 24: return GEN5_SURFACEFORMAT_B8G8R8X8_UNORM;
 	case 16: return GEN5_SURFACEFORMAT_B5G6R5_UNORM;
+	case 15: return GEN5_SURFACEFORMAT_B5G5R5X1_UNORM;
 	case 8:  return GEN5_SURFACEFORMAT_A8_UNORM;
 	}
 }
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 3ef1c42f..117a6c3b 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -207,6 +207,7 @@ static const struct formatinfo {
 	{PICT_r8g8b8, GEN6_SURFACEFORMAT_R8G8B8_UNORM},
 	{PICT_r5g6b5, GEN6_SURFACEFORMAT_B5G6R5_UNORM},
 	{PICT_a1r5g5b5, GEN6_SURFACEFORMAT_B5G5R5A1_UNORM},
+	{PICT_x1r5g5b5, GEN6_SURFACEFORMAT_B5G5R5X1_UNORM},
 	{PICT_a2r10g10b10, GEN6_SURFACEFORMAT_B10G10R10A2_UNORM},
 	{PICT_x2r10g10b10, GEN6_SURFACEFORMAT_B10G10R10X2_UNORM},
 	{PICT_a2b10g10r10, GEN6_SURFACEFORMAT_R10G10B10A2_UNORM},
@@ -317,6 +318,7 @@ static uint32_t gen6_get_dest_format_for_depth(int depth)
 	case 24: return GEN6_SURFACEFORMAT_B8G8R8A8_UNORM;
 	case 30: return GEN6_SURFACEFORMAT_B10G10R10A2_UNORM;
 	case 16: return GEN6_SURFACEFORMAT_B5G6R5_UNORM;
+	case 15: return GEN6_SURFACEFORMAT_B5G5R5A1_UNORM;
 	case 8:  return GEN6_SURFACEFORMAT_A8_UNORM;
 	}
 }
@@ -326,9 +328,10 @@ static uint32_t gen6_get_card_format_for_depth(int depth)
 	switch (depth) {
 	default: assert(0);
 	case 32: return GEN6_SURFACEFORMAT_B8G8R8A8_UNORM;
-	case 30: return GEN6_SURFACEFORMAT_B10G10R10A2_UNORM;
+	case 30: return GEN6_SURFACEFORMAT_B10G10R10X2_UNORM;
 	case 24: return GEN6_SURFACEFORMAT_B8G8R8X8_UNORM;
 	case 16: return GEN6_SURFACEFORMAT_B5G6R5_UNORM;
+	case 15: return GEN6_SURFACEFORMAT_B5G5R5X1_UNORM;
 	case 8:  return GEN6_SURFACEFORMAT_A8_UNORM;
 	}
 }
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index a45814eb..25851dad 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -215,6 +215,7 @@ static const struct formatinfo {
 	{PICT_r8g8b8, GEN7_SURFACEFORMAT_R8G8B8_UNORM},
 	{PICT_r5g6b5, GEN7_SURFACEFORMAT_B5G6R5_UNORM},
 	{PICT_a1r5g5b5, GEN7_SURFACEFORMAT_B5G5R5A1_UNORM},
+	{PICT_x1r5g5b5, GEN7_SURFACEFORMAT_B5G5R5X1_UNORM},
 	{PICT_a2r10g10b10, GEN7_SURFACEFORMAT_B10G10R10A2_UNORM},
 	{PICT_x2r10g10b10, GEN7_SURFACEFORMAT_B10G10R10X2_UNORM},
 	{PICT_a2b10g10r10, GEN7_SURFACEFORMAT_R10G10B10A2_UNORM},
@@ -325,6 +326,7 @@ static uint32_t gen7_get_dest_format_for_depth(int depth)
 	case 24: return GEN7_SURFACEFORMAT_B8G8R8A8_UNORM;
 	case 30: return GEN7_SURFACEFORMAT_B10G10R10A2_UNORM;
 	case 16: return GEN7_SURFACEFORMAT_B5G6R5_UNORM;
+	case 15: return GEN7_SURFACEFORMAT_B5G5R5A1_UNORM;
 	case 8:  return GEN7_SURFACEFORMAT_A8_UNORM;
 	}
 }
@@ -334,9 +336,10 @@ static uint32_t gen7_get_card_format_for_depth(int depth)
 	switch (depth) {
 	default: assert(0);
 	case 32: return GEN7_SURFACEFORMAT_B8G8R8A8_UNORM;
-	case 30: return GEN7_SURFACEFORMAT_B10G10R10A2_UNORM;
+	case 30: return GEN7_SURFACEFORMAT_B10G10R10X2_UNORM;
 	case 24: return GEN7_SURFACEFORMAT_B8G8R8X8_UNORM;
 	case 16: return GEN7_SURFACEFORMAT_B5G6R5_UNORM;
+	case 15: return GEN7_SURFACEFORMAT_B5G5R5X1_UNORM;
 	case 8:  return GEN7_SURFACEFORMAT_A8_UNORM;
 	}
 }