diff --git a/src/render_program/Makefile.am b/src/render_program/Makefile.am
index dc58138f356e..e7592a627e11 100644
--- a/src/render_program/Makefile.am
+++ b/src/render_program/Makefile.am
@@ -15,8 +15,8 @@ INTEL_G4A =				\
 	exa_wm_ca.g4a			\
 	exa_wm_ca_srcalpha.g4a		\
 	exa_wm_write.g4a 		\
-	exa_wm_yuv_rgb_bt601.g4a	\
-	exa_wm_yuv_rgb_bt709.g4a	\
+	exa_wm_yuv_rgb_bt601_limited.g4a	\
+	exa_wm_yuv_rgb_bt709_limited.g4a	\
 	exa_wm_xy.g4a			\
 	$(NULL)
 
@@ -46,8 +46,8 @@ INTEL_G4B = 				\
 	exa_wm_ca.g4b			\
 	exa_wm_ca_srcalpha.g4b		\
 	exa_wm_write.g4b 		\
-	exa_wm_yuv_rgb_bt601.g4b	\
-	exa_wm_yuv_rgb_bt709.g4b	\
+	exa_wm_yuv_rgb_bt601_limited.g4b	\
+	exa_wm_yuv_rgb_bt709_limited.g4b	\
 	exa_wm_xy.g4b			\
 	$(NULL)
 
@@ -69,8 +69,8 @@ INTEL_G4B_GEN5 = 				\
 	exa_wm_ca.g4b.gen5			\
 	exa_wm_ca_srcalpha.g4b.gen5		\
 	exa_wm_write.g4b.gen5 			\
-	exa_wm_yuv_rgb_bt601.g4b.gen5		\
-	exa_wm_yuv_rgb_bt709.g4b.gen5		\
+	exa_wm_yuv_rgb_bt601_limited.g4b.gen5		\
+	exa_wm_yuv_rgb_bt709_limited.g4b.gen5		\
 	exa_wm_xy.g4b.gen5			\
 	$(NULL)
 
@@ -91,8 +91,8 @@ INTEL_G5A =				\
 	exa_wm_ca.g5a			\
 	exa_wm_ca_srcalpha.g5a		\
 	exa_wm_write.g5a 		\
-	exa_wm_yuv_rgb_bt601.g5a	\
-	exa_wm_yuv_rgb_bt709.g5a	\
+	exa_wm_yuv_rgb_bt601_limited.g5a	\
+	exa_wm_yuv_rgb_bt709_limited.g5a	\
 	exa_wm_xy.g5a			\
 	$(NULL)
 
@@ -113,8 +113,8 @@ INTEL_G5B = 				\
 	exa_wm_ca.g5b			\
 	exa_wm_ca_srcalpha.g5b		\
 	exa_wm_write.g5b 		\
-	exa_wm_yuv_rgb_bt601.g5b	\
-	exa_wm_yuv_rgb_bt709.g5b	\
+	exa_wm_yuv_rgb_bt601_limited.g5b	\
+	exa_wm_yuv_rgb_bt709_limited.g5b	\
 	exa_wm_xy.g5b			\
 	$(NULL)
 
@@ -138,8 +138,8 @@ INTEL_G6A =				\
 	exa_wm_ca_srcalpha.g6a		\
 	exa_wm_noca.g6a			\
 	exa_wm_write.g6a 		\
-	exa_wm_yuv_rgb_bt601.g6a	\
-	exa_wm_yuv_rgb_bt709.g6a	\
+	exa_wm_yuv_rgb_bt601_limited.g6a	\
+	exa_wm_yuv_rgb_bt709_limited.g6a	\
 	$(NULL)
 
 INTEL_G6B =				\
@@ -157,8 +157,8 @@ INTEL_G6B =				\
 	exa_wm_ca_srcalpha.g6b		\
 	exa_wm_noca.g6b			\
 	exa_wm_write.g6b 		\
-	exa_wm_yuv_rgb_bt601.g6b	\
-	exa_wm_yuv_rgb_bt709.g6b	\
+	exa_wm_yuv_rgb_bt601_limited.g6b	\
+	exa_wm_yuv_rgb_bt709_limited.g6b	\
 	$(NULL)
 
 INTEL_G7A =				\
@@ -173,8 +173,8 @@ INTEL_G7A =				\
 	exa_wm_src_sample_nv12.g7a 	\
 	exa_wm_src_sample_planar.g7a 	\
 	exa_wm_write.g7a 		\
-	exa_wm_yuv_rgb_bt601.g7a	\
-	exa_wm_yuv_rgb_bt709.g7a	\
+	exa_wm_yuv_rgb_bt601_limited.g7a	\
+	exa_wm_yuv_rgb_bt709_limited.g7a	\
 	$(NULL)
 
 INTEL_G7B =				\
@@ -189,8 +189,8 @@ INTEL_G7B =				\
 	exa_wm_src_sample_nv12.g7b 	\
 	exa_wm_src_sample_planar.g7b 	\
 	exa_wm_write.g7b 		\
-	exa_wm_yuv_rgb_bt601.g7b	\
-	exa_wm_yuv_rgb_bt709.g7b	\
+	exa_wm_yuv_rgb_bt601_limited.g7b	\
+	exa_wm_yuv_rgb_bt709_limited.g7b	\
 	$(NULL)
 
 INTEL_G8A =				\
@@ -199,8 +199,8 @@ INTEL_G8A =				\
 	exa_wm_src_sample_nv12.g8a 	\
 	exa_wm_src_sample_planar.g8a 	\
 	exa_wm_write.g8a 		\
-	exa_wm_yuv_rgb_bt601.g8a	\
-	exa_wm_yuv_rgb_bt709.g8a	\
+	exa_wm_yuv_rgb_bt601_limited.g8a	\
+	exa_wm_yuv_rgb_bt709_limited.g8a	\
 	$(NULL)
 
 INTEL_G8B =				\
@@ -209,8 +209,8 @@ INTEL_G8B =				\
 	exa_wm_src_sample_nv12.g8b 	\
 	exa_wm_src_sample_planar.g8b 	\
 	exa_wm_write.g8b 		\
-	exa_wm_yuv_rgb_bt601.g8b	\
-	exa_wm_yuv_rgb_bt709.g8b	\
+	exa_wm_yuv_rgb_bt601_limited.g8b	\
+	exa_wm_yuv_rgb_bt709_limited.g8b	\
 	$(NULL)
 
 EXTRA_DIST = 		\
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g5a b/src/render_program/exa_wm_yuv_rgb_bt601.g5a
deleted file mode 120000
index 8c98e82d0f02..000000000000
--- a/src/render_program/exa_wm_yuv_rgb_bt601.g5a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_yuv_rgb_bt601.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g6a b/src/render_program/exa_wm_yuv_rgb_bt601.g6a
deleted file mode 120000
index 8c98e82d0f02..000000000000
--- a/src/render_program/exa_wm_yuv_rgb_bt601.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_yuv_rgb_bt601.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g7a b/src/render_program/exa_wm_yuv_rgb_bt601.g7a
deleted file mode 120000
index 8c98e82d0f02..000000000000
--- a/src/render_program/exa_wm_yuv_rgb_bt601.g7a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_yuv_rgb_bt601.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g4a b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g4a
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt601.g4a
rename to src/render_program/exa_wm_yuv_rgb_bt601_limited.g4a
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g4b b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g4b
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt601.g4b
rename to src/render_program/exa_wm_yuv_rgb_bt601_limited.g4b
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g4b.gen5 b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g4b.gen5
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt601.g4b.gen5
rename to src/render_program/exa_wm_yuv_rgb_bt601_limited.g4b.gen5
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601_limited.g5a b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g5a
new file mode 120000
index 000000000000..536b052ccecc
--- /dev/null
+++ b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g5a
@@ -0,0 +1 @@
+exa_wm_yuv_rgb_bt601_limited.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g5b b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g5b
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt601.g5b
rename to src/render_program/exa_wm_yuv_rgb_bt601_limited.g5b
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601_limited.g6a b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g6a
new file mode 120000
index 000000000000..536b052ccecc
--- /dev/null
+++ b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g6a
@@ -0,0 +1 @@
+exa_wm_yuv_rgb_bt601_limited.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g6b b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g6b
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt601.g6b
rename to src/render_program/exa_wm_yuv_rgb_bt601_limited.g6b
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601_limited.g7a b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g7a
new file mode 120000
index 000000000000..536b052ccecc
--- /dev/null
+++ b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g7a
@@ -0,0 +1 @@
+exa_wm_yuv_rgb_bt601_limited.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g7b b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g7b
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt601.g7b
rename to src/render_program/exa_wm_yuv_rgb_bt601_limited.g7b
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g8a b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g8a
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt601.g8a
rename to src/render_program/exa_wm_yuv_rgb_bt601_limited.g8a
diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g8b b/src/render_program/exa_wm_yuv_rgb_bt601_limited.g8b
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt601.g8b
rename to src/render_program/exa_wm_yuv_rgb_bt601_limited.g8b
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g5a b/src/render_program/exa_wm_yuv_rgb_bt709.g5a
deleted file mode 120000
index 9b4ca31203c3..000000000000
--- a/src/render_program/exa_wm_yuv_rgb_bt709.g5a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_yuv_rgb_bt709.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g6a b/src/render_program/exa_wm_yuv_rgb_bt709.g6a
deleted file mode 120000
index 9b4ca31203c3..000000000000
--- a/src/render_program/exa_wm_yuv_rgb_bt709.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_yuv_rgb_bt709.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g7a b/src/render_program/exa_wm_yuv_rgb_bt709.g7a
deleted file mode 120000
index 9b4ca31203c3..000000000000
--- a/src/render_program/exa_wm_yuv_rgb_bt709.g7a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_yuv_rgb_bt709.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g4a b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g4a
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt709.g4a
rename to src/render_program/exa_wm_yuv_rgb_bt709_limited.g4a
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g4b b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g4b
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt709.g4b
rename to src/render_program/exa_wm_yuv_rgb_bt709_limited.g4b
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g4b.gen5 b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g4b.gen5
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt709.g4b.gen5
rename to src/render_program/exa_wm_yuv_rgb_bt709_limited.g4b.gen5
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709_limited.g5a b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g5a
new file mode 120000
index 000000000000..7ec690d6ab1f
--- /dev/null
+++ b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g5a
@@ -0,0 +1 @@
+exa_wm_yuv_rgb_bt709_limited.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g5b b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g5b
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt709.g5b
rename to src/render_program/exa_wm_yuv_rgb_bt709_limited.g5b
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709_limited.g6a b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g6a
new file mode 120000
index 000000000000..7ec690d6ab1f
--- /dev/null
+++ b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g6a
@@ -0,0 +1 @@
+exa_wm_yuv_rgb_bt709_limited.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g6b b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g6b
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt709.g6b
rename to src/render_program/exa_wm_yuv_rgb_bt709_limited.g6b
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709_limited.g7a b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g7a
new file mode 120000
index 000000000000..7ec690d6ab1f
--- /dev/null
+++ b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g7a
@@ -0,0 +1 @@
+exa_wm_yuv_rgb_bt709_limited.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g7b b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g7b
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt709.g7b
rename to src/render_program/exa_wm_yuv_rgb_bt709_limited.g7b
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g8a b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g8a
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt709.g8a
rename to src/render_program/exa_wm_yuv_rgb_bt709_limited.g8a
diff --git a/src/render_program/exa_wm_yuv_rgb_bt709.g8b b/src/render_program/exa_wm_yuv_rgb_bt709_limited.g8b
similarity index 100%
rename from src/render_program/exa_wm_yuv_rgb_bt709.g8b
rename to src/render_program/exa_wm_yuv_rgb_bt709_limited.g8b
diff --git a/src/sna/brw/brw_test_gen4.c b/src/sna/brw/brw_test_gen4.c
index 78ff74653b63..bf2d2e2d9916 100644
--- a/src/sna/brw/brw_test_gen4.c
+++ b/src/sna/brw/brw_test_gen4.c
@@ -115,7 +115,7 @@ static const uint32_t ps_kernel_packed_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_argb.g4b"
-#include "exa_wm_yuv_rgb_bt601.g4b"
+#include "exa_wm_yuv_rgb_bt601_limited.g4b"
 #include "exa_wm_write.g4b"
 };
 
@@ -123,7 +123,7 @@ static const uint32_t ps_kernel_planar_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_planar.g4b"
-#include "exa_wm_yuv_rgb_bt601.g4b"
+#include "exa_wm_yuv_rgb_bt601_limited.g4b"
 #include "exa_wm_write.g4b"
 };
 
diff --git a/src/sna/brw/brw_test_gen5.c b/src/sna/brw/brw_test_gen5.c
index e821ce8bb814..2a4e408efdaf 100644
--- a/src/sna/brw/brw_test_gen5.c
+++ b/src/sna/brw/brw_test_gen5.c
@@ -115,7 +115,7 @@ static const uint32_t ps_kernel_packed_static[][4] = {
 #include "exa_wm_xy.g5b"
 #include "exa_wm_src_affine.g5b"
 #include "exa_wm_src_sample_argb.g5b"
-#include "exa_wm_yuv_rgb_bt601.g5b"
+#include "exa_wm_yuv_rgb_bt601_limited.g5b"
 #include "exa_wm_write.g5b"
 };
 
@@ -123,7 +123,7 @@ static const uint32_t ps_kernel_planar_static[][4] = {
 #include "exa_wm_xy.g5b"
 #include "exa_wm_src_affine.g5b"
 #include "exa_wm_src_sample_planar.g5b"
-#include "exa_wm_yuv_rgb_bt601.g5b"
+#include "exa_wm_yuv_rgb_bt601_limited.g5b"
 #include "exa_wm_write.g5b"
 };
 
diff --git a/src/sna/brw/brw_test_gen6.c b/src/sna/brw/brw_test_gen6.c
index 9603b9d99ceb..dc10b1c4af92 100644
--- a/src/sna/brw/brw_test_gen6.c
+++ b/src/sna/brw/brw_test_gen6.c
@@ -98,14 +98,14 @@ static const uint32_t ps_kernel_masknoca_projective[][4] = {
 static const uint32_t ps_kernel_packed[][4] = {
 #include "exa_wm_src_affine.g6b"
 #include "exa_wm_src_sample_argb.g6b"
-#include "exa_wm_yuv_rgb_bt601.g6b"
+#include "exa_wm_yuv_rgb_bt601_limited.g6b"
 #include "exa_wm_write.g6b"
 };
 
 static const uint32_t ps_kernel_planar[][4] = {
 #include "exa_wm_src_affine.g6b"
 #include "exa_wm_src_sample_planar.g6b"
-#include "exa_wm_yuv_rgb_bt601.g6b"
+#include "exa_wm_yuv_rgb_bt601_limited.g6b"
 #include "exa_wm_write.g6b"
 };
 
diff --git a/src/sna/brw/brw_test_gen7.c b/src/sna/brw/brw_test_gen7.c
index 658b6699594a..e5af6f9909ae 100644
--- a/src/sna/brw/brw_test_gen7.c
+++ b/src/sna/brw/brw_test_gen7.c
@@ -98,14 +98,14 @@ static const uint32_t ps_kernel_masknoca_projective[][4] = {
 static const uint32_t ps_kernel_packed[][4] = {
 #include "exa_wm_src_affine.g7b"
 #include "exa_wm_src_sample_argb.g7b"
-#include "exa_wm_yuv_rgb_bt601.g7b"
+#include "exa_wm_yuv_rgb_bt601_limited.g7b"
 #include "exa_wm_write.g7b"
 };
 
 static const uint32_t ps_kernel_planar[][4] = {
 #include "exa_wm_src_affine.g7b"
 #include "exa_wm_src_sample_planar.g7b"
-#include "exa_wm_yuv_rgb_bt601.g7b"
+#include "exa_wm_yuv_rgb_bt601_limited.g7b"
 #include "exa_wm_write.g7b"
 };
 
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index b6a496ca7825..50be5120e4e9 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -99,51 +99,51 @@
 #define GEN4_MAX_WM_THREADS 32
 #define G4X_MAX_WM_THREADS 50
 
-static const uint32_t ps_kernel_packed_bt601_static[][4] = {
+static const uint32_t ps_kernel_packed_bt601_limited_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_argb.g4b"
-#include "exa_wm_yuv_rgb_bt601.g4b"
+#include "exa_wm_yuv_rgb_bt601_limited.g4b"
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_planar_bt601_static[][4] = {
+static const uint32_t ps_kernel_planar_bt601_limited_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_planar.g4b"
-#include "exa_wm_yuv_rgb_bt601.g4b"
+#include "exa_wm_yuv_rgb_bt601_limited.g4b"
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_nv12_bt601_static[][4] = {
+static const uint32_t ps_kernel_nv12_bt601_limited_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_nv12.g4b"
-#include "exa_wm_yuv_rgb_bt601.g4b"
+#include "exa_wm_yuv_rgb_bt601_limited.g4b"
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_packed_bt709_static[][4] = {
+static const uint32_t ps_kernel_packed_bt709_limited_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_argb.g4b"
-#include "exa_wm_yuv_rgb_bt709.g4b"
+#include "exa_wm_yuv_rgb_bt709_limited.g4b"
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_planar_bt709_static[][4] = {
+static const uint32_t ps_kernel_planar_bt709_limited_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_planar.g4b"
-#include "exa_wm_yuv_rgb_bt709.g4b"
+#include "exa_wm_yuv_rgb_bt709_limited.g4b"
 #include "exa_wm_write.g4b"
 };
 
-static const uint32_t ps_kernel_nv12_bt709_static[][4] = {
+static const uint32_t ps_kernel_nv12_bt709_limited_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_nv12.g4b"
-#include "exa_wm_yuv_rgb_bt709.g4b"
+#include "exa_wm_yuv_rgb_bt709_limited.g4b"
 #include "exa_wm_write.g4b"
 };
 
@@ -171,13 +171,13 @@ static const struct wm_kernel_info {
 	NOKERNEL(WM_KERNEL_OPACITY, brw_wm_kernel__affine_opacity, true),
 	NOKERNEL(WM_KERNEL_OPACITY_P, brw_wm_kernel__projective_opacity, true),
 
-	KERNEL(WM_KERNEL_VIDEO_PLANAR_BT601, ps_kernel_planar_bt601_static, false),
-	KERNEL(WM_KERNEL_VIDEO_NV12_BT601, ps_kernel_nv12_bt601_static, false),
-	KERNEL(WM_KERNEL_VIDEO_PACKED_BT601, ps_kernel_packed_bt601_static, false),
+	KERNEL(WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED, ps_kernel_planar_bt601_limited_static, false),
+	KERNEL(WM_KERNEL_VIDEO_NV12_BT601_LIMITED, ps_kernel_nv12_bt601_limited_static, false),
+	KERNEL(WM_KERNEL_VIDEO_PACKED_BT601_LIMITED, ps_kernel_packed_bt601_limited_static, false),
 
-	KERNEL(WM_KERNEL_VIDEO_PLANAR_BT709, ps_kernel_planar_bt709_static, false),
-	KERNEL(WM_KERNEL_VIDEO_NV12_BT709, ps_kernel_nv12_bt709_static, false),
-	KERNEL(WM_KERNEL_VIDEO_PACKED_BT709, ps_kernel_packed_bt709_static, false),
+	KERNEL(WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED, ps_kernel_planar_bt709_limited_static, false),
+	KERNEL(WM_KERNEL_VIDEO_NV12_BT709_LIMITED, ps_kernel_nv12_bt709_limited_static, false),
+	KERNEL(WM_KERNEL_VIDEO_PACKED_BT709_LIMITED, ps_kernel_packed_bt709_limited_static, false),
 };
 #undef KERNEL
 
@@ -1440,18 +1440,18 @@ static unsigned select_video_kernel(const struct sna_video *video,
 	case FOURCC_I420:
 	case FOURCC_XVMC:
 		return video->colorspace ?
-			WM_KERNEL_VIDEO_PLANAR_BT709 :
-			WM_KERNEL_VIDEO_PLANAR_BT601;
+			WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED :
+			WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED;
 
 	case FOURCC_NV12:
 		return video->colorspace ?
-			WM_KERNEL_VIDEO_NV12_BT709 :
-			WM_KERNEL_VIDEO_NV12_BT601;
+			WM_KERNEL_VIDEO_NV12_BT709_LIMITED :
+			WM_KERNEL_VIDEO_NV12_BT601_LIMITED;
 
 	default:
 		return video->colorspace ?
-			WM_KERNEL_VIDEO_PACKED_BT709 :
-			WM_KERNEL_VIDEO_PACKED_BT601;
+			WM_KERNEL_VIDEO_PACKED_BT709_LIMITED :
+			WM_KERNEL_VIDEO_PACKED_BT601_LIMITED;
 	}
 }
 
diff --git a/src/sna/gen4_render.h b/src/sna/gen4_render.h
index f516c316c096..645226dd81ab 100644
--- a/src/sna/gen4_render.h
+++ b/src/sna/gen4_render.h
@@ -2685,13 +2685,13 @@ typedef enum {
 	WM_KERNEL_OPACITY,
 	WM_KERNEL_OPACITY_P,
 
-	WM_KERNEL_VIDEO_PLANAR_BT601,
-	WM_KERNEL_VIDEO_NV12_BT601,
-	WM_KERNEL_VIDEO_PACKED_BT601,
+	WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED,
+	WM_KERNEL_VIDEO_NV12_BT601_LIMITED,
+	WM_KERNEL_VIDEO_PACKED_BT601_LIMITED,
 
-	WM_KERNEL_VIDEO_PLANAR_BT709,
-	WM_KERNEL_VIDEO_NV12_BT709,
-	WM_KERNEL_VIDEO_PACKED_BT709,
+	WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED,
+	WM_KERNEL_VIDEO_NV12_BT709_LIMITED,
+	WM_KERNEL_VIDEO_PACKED_BT709_LIMITED,
 
 	KERNEL_COUNT
 } wm_kernel_t;
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 3d9d35f113aa..b131715764c4 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -89,51 +89,51 @@
 #define PS_KERNEL_NUM_GRF   32
 #define PS_MAX_THREADS	    72
 
-static const uint32_t ps_kernel_packed_bt601_static[][4] = {
+static const uint32_t ps_kernel_packed_bt601_limited_static[][4] = {
 #include "exa_wm_xy.g5b"
 #include "exa_wm_src_affine.g5b"
 #include "exa_wm_src_sample_argb.g5b"
-#include "exa_wm_yuv_rgb_bt601.g5b"
+#include "exa_wm_yuv_rgb_bt601_limited.g5b"
 #include "exa_wm_write.g5b"
 };
 
-static const uint32_t ps_kernel_planar_bt601_static[][4] = {
+static const uint32_t ps_kernel_planar_bt601_limited_static[][4] = {
 #include "exa_wm_xy.g5b"
 #include "exa_wm_src_affine.g5b"
 #include "exa_wm_src_sample_planar.g5b"
-#include "exa_wm_yuv_rgb_bt601.g5b"
+#include "exa_wm_yuv_rgb_bt601_limited.g5b"
 #include "exa_wm_write.g5b"
 };
 
-static const uint32_t ps_kernel_nv12_bt601_static[][4] = {
+static const uint32_t ps_kernel_nv12_bt601_limited_static[][4] = {
 #include "exa_wm_xy.g5b"
 #include "exa_wm_src_affine.g5b"
 #include "exa_wm_src_sample_nv12.g5b"
-#include "exa_wm_yuv_rgb_bt601.g5b"
+#include "exa_wm_yuv_rgb_bt601_limited.g5b"
 #include "exa_wm_write.g5b"
 };
 
-static const uint32_t ps_kernel_packed_bt709_static[][4] = {
+static const uint32_t ps_kernel_packed_bt709_limited_static[][4] = {
 #include "exa_wm_xy.g5b"
 #include "exa_wm_src_affine.g5b"
 #include "exa_wm_src_sample_argb.g5b"
-#include "exa_wm_yuv_rgb_bt709.g5b"
+#include "exa_wm_yuv_rgb_bt709_limited.g5b"
 #include "exa_wm_write.g5b"
 };
 
-static const uint32_t ps_kernel_planar_bt709_static[][4] = {
+static const uint32_t ps_kernel_planar_bt709_limited_static[][4] = {
 #include "exa_wm_xy.g5b"
 #include "exa_wm_src_affine.g5b"
 #include "exa_wm_src_sample_planar.g5b"
-#include "exa_wm_yuv_rgb_bt709.g5b"
+#include "exa_wm_yuv_rgb_bt709_limited.g5b"
 #include "exa_wm_write.g5b"
 };
 
-static const uint32_t ps_kernel_nv12_bt709_static[][4] = {
+static const uint32_t ps_kernel_nv12_bt709_limited_static[][4] = {
 #include "exa_wm_xy.g5b"
 #include "exa_wm_src_affine.g5b"
 #include "exa_wm_src_sample_nv12.g5b"
-#include "exa_wm_yuv_rgb_bt709.g5b"
+#include "exa_wm_yuv_rgb_bt709_limited.g5b"
 #include "exa_wm_write.g5b"
 };
 
@@ -161,13 +161,13 @@ static const struct wm_kernel_info {
 	NOKERNEL(WM_KERNEL_OPACITY, brw_wm_kernel__affine_opacity, true),
 	NOKERNEL(WM_KERNEL_OPACITY_P, brw_wm_kernel__projective_opacity, true),
 
-	KERNEL(WM_KERNEL_VIDEO_PLANAR_BT601, ps_kernel_planar_bt601_static, false),
-	KERNEL(WM_KERNEL_VIDEO_NV12_BT601, ps_kernel_nv12_bt601_static, false),
-	KERNEL(WM_KERNEL_VIDEO_PACKED_BT601, ps_kernel_packed_bt601_static, false),
+	KERNEL(WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED, ps_kernel_planar_bt601_limited_static, false),
+	KERNEL(WM_KERNEL_VIDEO_NV12_BT601_LIMITED, ps_kernel_nv12_bt601_limited_static, false),
+	KERNEL(WM_KERNEL_VIDEO_PACKED_BT601_LIMITED, ps_kernel_packed_bt601_limited_static, false),
 
-	KERNEL(WM_KERNEL_VIDEO_PLANAR_BT709, ps_kernel_planar_bt709_static, false),
-	KERNEL(WM_KERNEL_VIDEO_NV12_BT709, ps_kernel_nv12_bt709_static, false),
-	KERNEL(WM_KERNEL_VIDEO_PACKED_BT709, ps_kernel_packed_bt709_static, false),
+	KERNEL(WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED, ps_kernel_planar_bt709_limited_static, false),
+	KERNEL(WM_KERNEL_VIDEO_NV12_BT709_LIMITED, ps_kernel_nv12_bt709_limited_static, false),
+	KERNEL(WM_KERNEL_VIDEO_PACKED_BT709_LIMITED, ps_kernel_packed_bt709_limited_static, false),
 };
 #undef KERNEL
 
@@ -1390,18 +1390,18 @@ static unsigned select_video_kernel(const struct sna_video *video,
 	case FOURCC_I420:
 	case FOURCC_XVMC:
 		return video->colorspace ?
-			WM_KERNEL_VIDEO_PLANAR_BT709 :
-			WM_KERNEL_VIDEO_PLANAR_BT601;
+			WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED :
+			WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED;
 
 	case FOURCC_NV12:
 		return video->colorspace ?
-			WM_KERNEL_VIDEO_NV12_BT709 :
-			WM_KERNEL_VIDEO_NV12_BT601;
+			WM_KERNEL_VIDEO_NV12_BT709_LIMITED :
+			WM_KERNEL_VIDEO_NV12_BT601_LIMITED;
 
 	default:
 		return video->colorspace ?
-			WM_KERNEL_VIDEO_PACKED_BT709 :
-			WM_KERNEL_VIDEO_PACKED_BT601;
+			WM_KERNEL_VIDEO_PACKED_BT709_LIMITED :
+			WM_KERNEL_VIDEO_PACKED_BT601_LIMITED;
 	}
 }
 
diff --git a/src/sna/gen5_render.h b/src/sna/gen5_render.h
index 8901480a6d0f..04ff6366bb97 100644
--- a/src/sna/gen5_render.h
+++ b/src/sna/gen5_render.h
@@ -2765,13 +2765,13 @@ typedef enum {
 	WM_KERNEL_OPACITY,
 	WM_KERNEL_OPACITY_P,
 
-	WM_KERNEL_VIDEO_PLANAR_BT601,
-	WM_KERNEL_VIDEO_NV12_BT601,
-	WM_KERNEL_VIDEO_PACKED_BT601,
+	WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED,
+	WM_KERNEL_VIDEO_NV12_BT601_LIMITED,
+	WM_KERNEL_VIDEO_PACKED_BT601_LIMITED,
 
-	WM_KERNEL_VIDEO_PLANAR_BT709,
-	WM_KERNEL_VIDEO_NV12_BT709,
-	WM_KERNEL_VIDEO_PACKED_BT709,
+	WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED,
+	WM_KERNEL_VIDEO_NV12_BT709_LIMITED,
+	WM_KERNEL_VIDEO_PACKED_BT709_LIMITED,
 
 	KERNEL_COUNT
 } wm_kernel_t;
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 99cc4b0ecb5c..b9c713332e20 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -101,45 +101,45 @@ static const struct gt_info gt2_info = {
 	.gt = 2,
 };
 
-static const uint32_t ps_kernel_packed_bt601[][4] = {
+static const uint32_t ps_kernel_packed_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g6b"
 #include "exa_wm_src_sample_argb.g6b"
-#include "exa_wm_yuv_rgb_bt601.g6b"
+#include "exa_wm_yuv_rgb_bt601_limited.g6b"
 #include "exa_wm_write.g6b"
 };
 
-static const uint32_t ps_kernel_planar_bt601[][4] = {
+static const uint32_t ps_kernel_planar_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g6b"
 #include "exa_wm_src_sample_planar.g6b"
-#include "exa_wm_yuv_rgb_bt601.g6b"
+#include "exa_wm_yuv_rgb_bt601_limited.g6b"
 #include "exa_wm_write.g6b"
 };
 
-static const uint32_t ps_kernel_nv12_bt601[][4] = {
+static const uint32_t ps_kernel_nv12_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g6b"
 #include "exa_wm_src_sample_nv12.g6b"
-#include "exa_wm_yuv_rgb_bt601.g6b"
+#include "exa_wm_yuv_rgb_bt601_limited.g6b"
 #include "exa_wm_write.g6b"
 };
 
-static const uint32_t ps_kernel_packed_bt709[][4] = {
+static const uint32_t ps_kernel_packed_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g6b"
 #include "exa_wm_src_sample_argb.g6b"
-#include "exa_wm_yuv_rgb_bt709.g6b"
+#include "exa_wm_yuv_rgb_bt709_limited.g6b"
 #include "exa_wm_write.g6b"
 };
 
-static const uint32_t ps_kernel_planar_bt709[][4] = {
+static const uint32_t ps_kernel_planar_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g6b"
 #include "exa_wm_src_sample_planar.g6b"
-#include "exa_wm_yuv_rgb_bt709.g6b"
+#include "exa_wm_yuv_rgb_bt709_limited.g6b"
 #include "exa_wm_write.g6b"
 };
 
-static const uint32_t ps_kernel_nv12_bt709[][4] = {
+static const uint32_t ps_kernel_nv12_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g6b"
 #include "exa_wm_src_sample_nv12.g6b"
-#include "exa_wm_yuv_rgb_bt709.g6b"
+#include "exa_wm_yuv_rgb_bt709_limited.g6b"
 #include "exa_wm_write.g6b"
 };
 
@@ -170,13 +170,13 @@ static const struct wm_kernel_info {
 	NOKERNEL(OPACITY_P, brw_wm_kernel__projective_opacity, 2),
 
 
-	KERNEL(VIDEO_PLANAR_BT601, ps_kernel_planar_bt601, 7),
-	KERNEL(VIDEO_NV12_BT601, ps_kernel_nv12_bt601, 7),
-	KERNEL(VIDEO_PACKED_BT601, ps_kernel_packed_bt601, 2),
+	KERNEL(VIDEO_PLANAR_BT601_LIMITED, ps_kernel_planar_bt601_limited, 7),
+	KERNEL(VIDEO_NV12_BT601_LIMITED, ps_kernel_nv12_bt601_limited, 7),
+	KERNEL(VIDEO_PACKED_BT601_LIMITED, ps_kernel_packed_bt601_limited, 2),
 
-	KERNEL(VIDEO_PLANAR_BT709, ps_kernel_planar_bt709, 7),
-	KERNEL(VIDEO_NV12_BT709, ps_kernel_nv12_bt709, 7),
-	KERNEL(VIDEO_PACKED_BT709, ps_kernel_packed_bt709, 2),
+	KERNEL(VIDEO_PLANAR_BT709_LIMITED, ps_kernel_planar_bt709_limited, 7),
+	KERNEL(VIDEO_NV12_BT709_LIMITED, ps_kernel_nv12_bt709_limited, 7),
+	KERNEL(VIDEO_PACKED_BT709_LIMITED, ps_kernel_packed_bt709_limited, 2),
 };
 #undef KERNEL
 
@@ -1664,18 +1664,18 @@ static unsigned select_video_kernel(const struct sna_video *video,
 	case FOURCC_I420:
 	case FOURCC_XVMC:
 		return video->colorspace ?
-			GEN6_WM_KERNEL_VIDEO_PLANAR_BT709 :
-			GEN6_WM_KERNEL_VIDEO_PLANAR_BT601;
+			GEN6_WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED :
+			GEN6_WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED;
 
 	case FOURCC_NV12:
 		return video->colorspace ?
-			GEN6_WM_KERNEL_VIDEO_NV12_BT709 :
-			GEN6_WM_KERNEL_VIDEO_NV12_BT601;
+			GEN6_WM_KERNEL_VIDEO_NV12_BT709_LIMITED :
+			GEN6_WM_KERNEL_VIDEO_NV12_BT601_LIMITED;
 
 	default:
 		return video->colorspace ?
-			GEN6_WM_KERNEL_VIDEO_PACKED_BT709 :
-			GEN6_WM_KERNEL_VIDEO_PACKED_BT601;
+			GEN6_WM_KERNEL_VIDEO_PACKED_BT709_LIMITED :
+			GEN6_WM_KERNEL_VIDEO_PACKED_BT601_LIMITED;
 	}
 }
 
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index cffe17de6d0d..a1bbe3ca888e 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -193,45 +193,45 @@ inline static bool is_hsw(struct sna *sna)
 	return sna->kgem.gen == 075;
 }
 
-static const uint32_t ps_kernel_packed_bt601[][4] = {
+static const uint32_t ps_kernel_packed_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g7b"
 #include "exa_wm_src_sample_argb.g7b"
-#include "exa_wm_yuv_rgb_bt601.g7b"
+#include "exa_wm_yuv_rgb_bt601_limited.g7b"
 #include "exa_wm_write.g7b"
 };
 
-static const uint32_t ps_kernel_planar_bt601[][4] = {
+static const uint32_t ps_kernel_planar_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g7b"
 #include "exa_wm_src_sample_planar.g7b"
-#include "exa_wm_yuv_rgb_bt601.g7b"
+#include "exa_wm_yuv_rgb_bt601_limited.g7b"
 #include "exa_wm_write.g7b"
 };
 
-static const uint32_t ps_kernel_nv12_bt601[][4] = {
+static const uint32_t ps_kernel_nv12_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g7b"
 #include "exa_wm_src_sample_nv12.g7b"
-#include "exa_wm_yuv_rgb_bt601.g7b"
+#include "exa_wm_yuv_rgb_bt601_limited.g7b"
 #include "exa_wm_write.g7b"
 };
 
-static const uint32_t ps_kernel_packed_bt709[][4] = {
+static const uint32_t ps_kernel_packed_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g7b"
 #include "exa_wm_src_sample_argb.g7b"
-#include "exa_wm_yuv_rgb_bt709.g7b"
+#include "exa_wm_yuv_rgb_bt709_limited.g7b"
 #include "exa_wm_write.g7b"
 };
 
-static const uint32_t ps_kernel_planar_bt709[][4] = {
+static const uint32_t ps_kernel_planar_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g7b"
 #include "exa_wm_src_sample_planar.g7b"
-#include "exa_wm_yuv_rgb_bt709.g7b"
+#include "exa_wm_yuv_rgb_bt709_limited.g7b"
 #include "exa_wm_write.g7b"
 };
 
-static const uint32_t ps_kernel_nv12_bt709[][4] = {
+static const uint32_t ps_kernel_nv12_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g7b"
 #include "exa_wm_src_sample_nv12.g7b"
-#include "exa_wm_yuv_rgb_bt709.g7b"
+#include "exa_wm_yuv_rgb_bt709_limited.g7b"
 #include "exa_wm_write.g7b"
 };
 
@@ -266,12 +266,12 @@ static const struct wm_kernel_info {
 	NOKERNEL(OPACITY, brw_wm_kernel__affine_opacity, 2),
 	NOKERNEL(OPACITY_P, brw_wm_kernel__projective_opacity, 2),
 
-	KERNEL(VIDEO_PLANAR_BT601, ps_kernel_planar_bt601, 7),
-	KERNEL(VIDEO_NV12_BT601, ps_kernel_nv12_bt601, 7),
-	KERNEL(VIDEO_PACKED_BT601, ps_kernel_packed_bt601, 2),
-	KERNEL(VIDEO_PLANAR_BT709, ps_kernel_planar_bt709, 7),
-	KERNEL(VIDEO_NV12_BT709, ps_kernel_nv12_bt709, 7),
-	KERNEL(VIDEO_PACKED_BT709, ps_kernel_packed_bt709, 2),
+	KERNEL(VIDEO_PLANAR_BT601_LIMITED, ps_kernel_planar_bt601_limited, 7),
+	KERNEL(VIDEO_NV12_BT601_LIMITED, ps_kernel_nv12_bt601_limited, 7),
+	KERNEL(VIDEO_PACKED_BT601_LIMITED, ps_kernel_packed_bt601_limited, 2),
+	KERNEL(VIDEO_PLANAR_BT709_LIMITED, ps_kernel_planar_bt709_limited, 7),
+	KERNEL(VIDEO_NV12_BT709_LIMITED, ps_kernel_nv12_bt709_limited, 7),
+	KERNEL(VIDEO_PACKED_BT709_LIMITED, ps_kernel_packed_bt709_limited, 2),
 	KERNEL(VIDEO_RGB, ps_kernel_rgb, 2),
 };
 #undef KERNEL
@@ -1877,13 +1877,13 @@ static unsigned select_video_kernel(const struct sna_video *video,
 	case FOURCC_I420:
 	case FOURCC_XVMC:
 		return video->colorspace ?
-			GEN7_WM_KERNEL_VIDEO_PLANAR_BT709 :
-			GEN7_WM_KERNEL_VIDEO_PLANAR_BT601;
+			GEN7_WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED :
+			GEN7_WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED;
 
 	case FOURCC_NV12:
 		return video->colorspace ?
-			GEN7_WM_KERNEL_VIDEO_NV12_BT709 :
-			GEN7_WM_KERNEL_VIDEO_NV12_BT601;
+			GEN7_WM_KERNEL_VIDEO_NV12_BT709_LIMITED :
+			GEN7_WM_KERNEL_VIDEO_NV12_BT601_LIMITED;
 
 	case FOURCC_RGB888:
 	case FOURCC_RGB565:
@@ -1891,8 +1891,8 @@ static unsigned select_video_kernel(const struct sna_video *video,
 
 	default:
 		return video->colorspace ?
-			GEN7_WM_KERNEL_VIDEO_PACKED_BT709 :
-			GEN7_WM_KERNEL_VIDEO_PACKED_BT601;
+			GEN7_WM_KERNEL_VIDEO_PACKED_BT709_LIMITED :
+			GEN7_WM_KERNEL_VIDEO_PACKED_BT601_LIMITED;
 	}
 }
 
diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
index 9bac9b8bb6be..caa89d95c50c 100644
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
@@ -93,45 +93,45 @@
  */
 
 #if !NO_VIDEO
-static const uint32_t ps_kernel_packed_bt601[][4] = {
+static const uint32_t ps_kernel_packed_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_argb.g8b"
-#include "exa_wm_yuv_rgb_bt601.g8b"
+#include "exa_wm_yuv_rgb_bt601_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
-static const uint32_t ps_kernel_planar_bt601[][4] = {
+static const uint32_t ps_kernel_planar_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_planar.g8b"
-#include "exa_wm_yuv_rgb_bt601.g8b"
+#include "exa_wm_yuv_rgb_bt601_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
-static const uint32_t ps_kernel_nv12_bt601[][4] = {
+static const uint32_t ps_kernel_nv12_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_nv12.g8b"
-#include "exa_wm_yuv_rgb_bt601.g8b"
+#include "exa_wm_yuv_rgb_bt601_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
-static const uint32_t ps_kernel_packed_bt709[][4] = {
+static const uint32_t ps_kernel_packed_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_argb.g8b"
-#include "exa_wm_yuv_rgb_bt709.g8b"
+#include "exa_wm_yuv_rgb_bt709_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
-static const uint32_t ps_kernel_planar_bt709[][4] = {
+static const uint32_t ps_kernel_planar_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_planar.g8b"
-#include "exa_wm_yuv_rgb_bt709.g8b"
+#include "exa_wm_yuv_rgb_bt709_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
-static const uint32_t ps_kernel_nv12_bt709[][4] = {
+static const uint32_t ps_kernel_nv12_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_nv12.g8b"
-#include "exa_wm_yuv_rgb_bt709.g8b"
+#include "exa_wm_yuv_rgb_bt709_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
@@ -170,12 +170,12 @@ static const struct wm_kernel_info {
 	NOKERNEL(OPACITY_P, gen8_wm_kernel__projective_opacity, 2),
 
 #if !NO_VIDEO
-	KERNEL(VIDEO_PLANAR_BT601, ps_kernel_planar_bt601, 7),
-	KERNEL(VIDEO_NV12_BT601, ps_kernel_nv12_bt601, 7),
-	KERNEL(VIDEO_PACKED_BT601, ps_kernel_packed_bt601, 2),
-	KERNEL(VIDEO_PLANAR_BT709, ps_kernel_planar_bt709, 7),
-	KERNEL(VIDEO_NV12_BT709, ps_kernel_nv12_bt709, 7),
-	KERNEL(VIDEO_PACKED_BT709, ps_kernel_packed_bt709, 2),
+	KERNEL(VIDEO_PLANAR_BT601_LIMITED, ps_kernel_planar_bt601_limited, 7),
+	KERNEL(VIDEO_NV12_BT601_LIMITED, ps_kernel_nv12_bt601_limited, 7),
+	KERNEL(VIDEO_PACKED_BT601_LIMITED, ps_kernel_packed_bt601_limited, 2),
+	KERNEL(VIDEO_PLANAR_BT709_LIMITED, ps_kernel_planar_bt709_limited, 7),
+	KERNEL(VIDEO_NV12_BT709_LIMITED, ps_kernel_nv12_bt709_limited, 7),
+	KERNEL(VIDEO_PACKED_BT709_LIMITED, ps_kernel_packed_bt709_limited, 2),
 	KERNEL(VIDEO_RGB, ps_kernel_rgb, 2),
 #endif
 };
@@ -3828,13 +3828,13 @@ static unsigned select_video_kernel(const struct sna_video *video,
 	case FOURCC_I420:
 	case FOURCC_XVMC:
 		return video->colorspace ?
-			GEN8_WM_KERNEL_VIDEO_PLANAR_BT709 :
-			GEN8_WM_KERNEL_VIDEO_PLANAR_BT601;
+			GEN8_WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED :
+			GEN8_WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED;
 
 	case FOURCC_NV12:
 		return video->colorspace ?
-			GEN8_WM_KERNEL_VIDEO_NV12_BT709 :
-			GEN8_WM_KERNEL_VIDEO_NV12_BT601;
+			GEN8_WM_KERNEL_VIDEO_NV12_BT709_LIMITED :
+			GEN8_WM_KERNEL_VIDEO_NV12_BT601_LIMITED;
 
 	case FOURCC_RGB888:
 	case FOURCC_RGB565:
@@ -3842,8 +3842,8 @@ static unsigned select_video_kernel(const struct sna_video *video,
 
 	default:
 		return video->colorspace ?
-			GEN8_WM_KERNEL_VIDEO_PACKED_BT709 :
-			GEN8_WM_KERNEL_VIDEO_PACKED_BT601;
+			GEN8_WM_KERNEL_VIDEO_PACKED_BT709_LIMITED :
+			GEN8_WM_KERNEL_VIDEO_PACKED_BT601_LIMITED;
 	}
 }
 
diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c
index eb22b642ffa1..b7a1137ff8cb 100644
--- a/src/sna/gen9_render.c
+++ b/src/sna/gen9_render.c
@@ -94,45 +94,45 @@
  */
 
 #if !NO_VIDEO
-static const uint32_t ps_kernel_packed_bt601[][4] = {
+static const uint32_t ps_kernel_packed_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_argb.g8b"
-#include "exa_wm_yuv_rgb_bt601.g8b"
+#include "exa_wm_yuv_rgb_bt601_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
-static const uint32_t ps_kernel_planar_bt601[][4] = {
+static const uint32_t ps_kernel_planar_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_planar.g8b"
-#include "exa_wm_yuv_rgb_bt601.g8b"
+#include "exa_wm_yuv_rgb_bt601_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
-static const uint32_t ps_kernel_nv12_bt601[][4] = {
+static const uint32_t ps_kernel_nv12_bt601_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_nv12.g8b"
-#include "exa_wm_yuv_rgb_bt601.g8b"
+#include "exa_wm_yuv_rgb_bt601_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
-static const uint32_t ps_kernel_packed_bt709[][4] = {
+static const uint32_t ps_kernel_packed_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_argb.g8b"
-#include "exa_wm_yuv_rgb_bt709.g8b"
+#include "exa_wm_yuv_rgb_bt709_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
-static const uint32_t ps_kernel_planar_bt709[][4] = {
+static const uint32_t ps_kernel_planar_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_planar.g8b"
-#include "exa_wm_yuv_rgb_bt709.g8b"
+#include "exa_wm_yuv_rgb_bt709_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
-static const uint32_t ps_kernel_nv12_bt709[][4] = {
+static const uint32_t ps_kernel_nv12_bt709_limited[][4] = {
 #include "exa_wm_src_affine.g8b"
 #include "exa_wm_src_sample_nv12.g8b"
-#include "exa_wm_yuv_rgb_bt709.g8b"
+#include "exa_wm_yuv_rgb_bt709_limited.g8b"
 #include "exa_wm_write.g8b"
 };
 
@@ -171,12 +171,12 @@ static const struct wm_kernel_info {
 	NOKERNEL(OPACITY_P, gen8_wm_kernel__projective_opacity, 2),
 
 #if !NO_VIDEO
-	KERNEL(VIDEO_PLANAR_BT601, ps_kernel_planar_bt601, 7),
-	KERNEL(VIDEO_NV12_BT601, ps_kernel_nv12_bt601, 7),
-	KERNEL(VIDEO_PACKED_BT601, ps_kernel_packed_bt601, 2),
-	KERNEL(VIDEO_PLANAR_BT709, ps_kernel_planar_bt709, 7),
-	KERNEL(VIDEO_NV12_BT709, ps_kernel_nv12_bt709, 7),
-	KERNEL(VIDEO_PACKED_BT709, ps_kernel_packed_bt709, 2),
+	KERNEL(VIDEO_PLANAR_BT601_LIMITED, ps_kernel_planar_bt601_limited, 7),
+	KERNEL(VIDEO_NV12_BT601_LIMITED, ps_kernel_nv12_bt601_limited, 7),
+	KERNEL(VIDEO_PACKED_BT601_LIMITED, ps_kernel_packed_bt601_limited, 2),
+	KERNEL(VIDEO_PLANAR_BT709_LIMITED, ps_kernel_planar_bt709_limited, 7),
+	KERNEL(VIDEO_NV12_BT709_LIMITED, ps_kernel_nv12_bt709_limited, 7),
+	KERNEL(VIDEO_PACKED_BT709_LIMITED, ps_kernel_packed_bt709_limited, 2),
 	KERNEL(VIDEO_RGB, ps_kernel_rgb, 2),
 #endif
 };
@@ -3891,13 +3891,13 @@ static unsigned select_video_kernel(const struct sna_video *video,
 	case FOURCC_I420:
 	case FOURCC_XVMC:
 		return video->colorspace ?
-			GEN9_WM_KERNEL_VIDEO_PLANAR_BT709 :
-			GEN9_WM_KERNEL_VIDEO_PLANAR_BT601;
+			GEN9_WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED :
+			GEN9_WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED;
 
 	case FOURCC_NV12:
 		return video->colorspace ?
-			GEN9_WM_KERNEL_VIDEO_NV12_BT709 :
-			GEN9_WM_KERNEL_VIDEO_NV12_BT601;
+			GEN9_WM_KERNEL_VIDEO_NV12_BT709_LIMITED :
+			GEN9_WM_KERNEL_VIDEO_NV12_BT601_LIMITED;
 
 	case FOURCC_RGB888:
 	case FOURCC_RGB565:
@@ -3905,8 +3905,8 @@ static unsigned select_video_kernel(const struct sna_video *video,
 
 	default:
 		return video->colorspace ?
-			GEN9_WM_KERNEL_VIDEO_PACKED_BT709 :
-			GEN9_WM_KERNEL_VIDEO_PACKED_BT601;
+			GEN9_WM_KERNEL_VIDEO_PACKED_BT709_LIMITED :
+			GEN9_WM_KERNEL_VIDEO_PACKED_BT601_LIMITED;
 	}
 }
 
diff --git a/src/sna/sna_render.h b/src/sna/sna_render.h
index 442a6ec50191..6013feac936d 100644
--- a/src/sna/sna_render.h
+++ b/src/sna/sna_render.h
@@ -440,13 +440,13 @@ enum {
 	GEN6_WM_KERNEL_OPACITY,
 	GEN6_WM_KERNEL_OPACITY_P,
 
-	GEN6_WM_KERNEL_VIDEO_PLANAR_BT601,
-	GEN6_WM_KERNEL_VIDEO_NV12_BT601,
-	GEN6_WM_KERNEL_VIDEO_PACKED_BT601,
+	GEN6_WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED,
+	GEN6_WM_KERNEL_VIDEO_NV12_BT601_LIMITED,
+	GEN6_WM_KERNEL_VIDEO_PACKED_BT601_LIMITED,
 
-	GEN6_WM_KERNEL_VIDEO_PLANAR_BT709,
-	GEN6_WM_KERNEL_VIDEO_NV12_BT709,
-	GEN6_WM_KERNEL_VIDEO_PACKED_BT709,
+	GEN6_WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED,
+	GEN6_WM_KERNEL_VIDEO_NV12_BT709_LIMITED,
+	GEN6_WM_KERNEL_VIDEO_PACKED_BT709_LIMITED,
 
 	GEN6_KERNEL_COUNT
 };
@@ -496,13 +496,13 @@ enum {
 	GEN7_WM_KERNEL_OPACITY,
 	GEN7_WM_KERNEL_OPACITY_P,
 
-	GEN7_WM_KERNEL_VIDEO_PLANAR_BT601,
-	GEN7_WM_KERNEL_VIDEO_NV12_BT601,
-	GEN7_WM_KERNEL_VIDEO_PACKED_BT601,
+	GEN7_WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED,
+	GEN7_WM_KERNEL_VIDEO_NV12_BT601_LIMITED,
+	GEN7_WM_KERNEL_VIDEO_PACKED_BT601_LIMITED,
 
-	GEN7_WM_KERNEL_VIDEO_PLANAR_BT709,
-	GEN7_WM_KERNEL_VIDEO_NV12_BT709,
-	GEN7_WM_KERNEL_VIDEO_PACKED_BT709,
+	GEN7_WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED,
+	GEN7_WM_KERNEL_VIDEO_NV12_BT709_LIMITED,
+	GEN7_WM_KERNEL_VIDEO_PACKED_BT709_LIMITED,
 
 	GEN7_WM_KERNEL_VIDEO_RGB,
 	GEN7_WM_KERNEL_COUNT
@@ -555,13 +555,13 @@ enum {
 	GEN8_WM_KERNEL_OPACITY,
 	GEN8_WM_KERNEL_OPACITY_P,
 
-	GEN8_WM_KERNEL_VIDEO_PLANAR_BT601,
-	GEN8_WM_KERNEL_VIDEO_NV12_BT601,
-	GEN8_WM_KERNEL_VIDEO_PACKED_BT601,
+	GEN8_WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED,
+	GEN8_WM_KERNEL_VIDEO_NV12_BT601_LIMITED,
+	GEN8_WM_KERNEL_VIDEO_PACKED_BT601_LIMITED,
 
-	GEN8_WM_KERNEL_VIDEO_PLANAR_BT709,
-	GEN8_WM_KERNEL_VIDEO_NV12_BT709,
-	GEN8_WM_KERNEL_VIDEO_PACKED_BT709,
+	GEN8_WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED,
+	GEN8_WM_KERNEL_VIDEO_NV12_BT709_LIMITED,
+	GEN8_WM_KERNEL_VIDEO_PACKED_BT709_LIMITED,
 
 	GEN8_WM_KERNEL_VIDEO_RGB,
 	GEN8_WM_KERNEL_COUNT
@@ -612,13 +612,13 @@ enum {
 	GEN9_WM_KERNEL_OPACITY,
 	GEN9_WM_KERNEL_OPACITY_P,
 
-	GEN9_WM_KERNEL_VIDEO_PLANAR_BT601,
-	GEN9_WM_KERNEL_VIDEO_NV12_BT601,
-	GEN9_WM_KERNEL_VIDEO_PACKED_BT601,
+	GEN9_WM_KERNEL_VIDEO_PLANAR_BT601_LIMITED,
+	GEN9_WM_KERNEL_VIDEO_NV12_BT601_LIMITED,
+	GEN9_WM_KERNEL_VIDEO_PACKED_BT601_LIMITED,
 
-	GEN9_WM_KERNEL_VIDEO_PLANAR_BT709,
-	GEN9_WM_KERNEL_VIDEO_NV12_BT709,
-	GEN9_WM_KERNEL_VIDEO_PACKED_BT709,
+	GEN9_WM_KERNEL_VIDEO_PLANAR_BT709_LIMITED,
+	GEN9_WM_KERNEL_VIDEO_NV12_BT709_LIMITED,
+	GEN9_WM_KERNEL_VIDEO_PACKED_BT709_LIMITED,
 
 	GEN9_WM_KERNEL_VIDEO_RGB,
 	GEN9_WM_KERNEL_COUNT
diff --git a/src/uxa/i965_video.c b/src/uxa/i965_video.c
index 9b9203b66f25..1b62c835e5df 100644
--- a/src/uxa/i965_video.c
+++ b/src/uxa/i965_video.c
@@ -101,7 +101,7 @@ static const uint32_t ps_kernel_packed_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_argb.g4b"
-#include "exa_wm_yuv_rgb_bt601.g4b"
+#include "exa_wm_yuv_rgb_bt601_limited.g4b"
 #include "exa_wm_write.g4b"
 };
 
@@ -109,7 +109,7 @@ static const uint32_t ps_kernel_planar_static[][4] = {
 #include "exa_wm_xy.g4b"
 #include "exa_wm_src_affine.g4b"
 #include "exa_wm_src_sample_planar.g4b"
-#include "exa_wm_yuv_rgb_bt601.g4b"
+#include "exa_wm_yuv_rgb_bt601_limited.g4b"
 #include "exa_wm_write.g4b"
 };
 
@@ -122,7 +122,7 @@ static const uint32_t ps_kernel_packed_static_gen5[][4] = {
 #include "exa_wm_xy.g4b.gen5"
 #include "exa_wm_src_affine.g4b.gen5"
 #include "exa_wm_src_sample_argb.g4b.gen5"
-#include "exa_wm_yuv_rgb_bt601.g4b.gen5"
+#include "exa_wm_yuv_rgb_bt601_limited.g4b.gen5"
 #include "exa_wm_write.g4b.gen5"
 };
 
@@ -130,7 +130,7 @@ static const uint32_t ps_kernel_planar_static_gen5[][4] = {
 #include "exa_wm_xy.g4b.gen5"
 #include "exa_wm_src_affine.g4b.gen5"
 #include "exa_wm_src_sample_planar.g4b.gen5"
-#include "exa_wm_yuv_rgb_bt601.g4b.gen5"
+#include "exa_wm_yuv_rgb_bt601_limited.g4b.gen5"
 #include "exa_wm_write.g4b.gen5"
 };
 
@@ -138,14 +138,14 @@ static const uint32_t ps_kernel_planar_static_gen5[][4] = {
 static const uint32_t ps_kernel_packed_static_gen6[][4] = {
 #include "exa_wm_src_affine.g6b"
 #include "exa_wm_src_sample_argb.g6b"
-#include "exa_wm_yuv_rgb_bt601.g6b"
+#include "exa_wm_yuv_rgb_bt601_limited.g6b"
 #include "exa_wm_write.g6b"
 };
 
 static const uint32_t ps_kernel_planar_static_gen6[][4] = {
 #include "exa_wm_src_affine.g6b"
 #include "exa_wm_src_sample_planar.g6b"
-#include "exa_wm_yuv_rgb_bt601.g6b"
+#include "exa_wm_yuv_rgb_bt601_limited.g6b"
 #include "exa_wm_write.g6b"
 };
 
@@ -153,14 +153,14 @@ static const uint32_t ps_kernel_planar_static_gen6[][4] = {
 static const uint32_t ps_kernel_packed_static_gen7[][4] = {
 #include "exa_wm_src_affine.g7b"
 #include "exa_wm_src_sample_argb.g7b"
-#include "exa_wm_yuv_rgb_bt601.g7b"
+#include "exa_wm_yuv_rgb_bt601_limited.g7b"
 #include "exa_wm_write.g7b"
 };
 
 static const uint32_t ps_kernel_planar_static_gen7[][4] = {
 #include "exa_wm_src_affine.g7b"
 #include "exa_wm_src_sample_planar.g7b"
-#include "exa_wm_yuv_rgb_bt601.g7b"
+#include "exa_wm_yuv_rgb_bt601_limited.g7b"
 #include "exa_wm_write.g7b"
 };
 
