diff --git a/drivers/video/Intel-2D/i915_pciids.h b/contrib/sdk/sources/Intel-2D/i915_pciids.h
similarity index 100%
rename from drivers/video/Intel-2D/i915_pciids.h
rename to contrib/sdk/sources/Intel-2D/i915_pciids.h
diff --git a/drivers/video/Intel-2D/intel_driver.h b/contrib/sdk/sources/Intel-2D/intel_driver.h
similarity index 100%
rename from drivers/video/Intel-2D/intel_driver.h
rename to contrib/sdk/sources/Intel-2D/intel_driver.h
diff --git a/drivers/video/Intel-2D/intel_list.h b/contrib/sdk/sources/Intel-2D/intel_list.h
similarity index 100%
rename from drivers/video/Intel-2D/intel_list.h
rename to contrib/sdk/sources/Intel-2D/intel_list.h
diff --git a/drivers/video/Intel-2D/pciaccess.h b/contrib/sdk/sources/Intel-2D/pciaccess.h
similarity index 100%
rename from drivers/video/Intel-2D/pciaccess.h
rename to contrib/sdk/sources/Intel-2D/pciaccess.h
diff --git a/drivers/video/Intel-2D/picture.h b/contrib/sdk/sources/Intel-2D/picture.h
similarity index 100%
rename from drivers/video/Intel-2D/picture.h
rename to contrib/sdk/sources/Intel-2D/picture.h
diff --git a/drivers/video/Intel-2D/pixlib-sna.c b/contrib/sdk/sources/Intel-2D/pixlib-sna.c
similarity index 100%
rename from drivers/video/Intel-2D/pixlib-sna.c
rename to contrib/sdk/sources/Intel-2D/pixlib-sna.c
diff --git a/drivers/video/Intel-2D/pixlib-uxa.c b/contrib/sdk/sources/Intel-2D/pixlib-uxa.c
similarity index 100%
rename from drivers/video/Intel-2D/pixlib-uxa.c
rename to contrib/sdk/sources/Intel-2D/pixlib-uxa.c
diff --git a/drivers/video/Intel-2D/render_program/exa_sf.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_sf.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_sf.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_sf.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_sf.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_sf.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_sf.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_sf.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_sf.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_sf.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_sf.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_sf.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_sf_mask.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_sf_mask.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_sf_mask.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_sf_mask.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_sf_mask.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_sf_mask.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_sf_mask.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_sf_mask.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_sf_mask.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_sf_mask.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_sf_mask.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_sf_mask.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_ca.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_ca.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_ca.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_ca.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_ca.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_ca.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_ca.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_ca.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_ca_srcalpha.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca_srcalpha.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_ca_srcalpha.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca_srcalpha.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_ca_srcalpha.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca_srcalpha.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_ca_srcalpha.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca_srcalpha.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_ca_srcalpha.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca_srcalpha.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_ca_srcalpha.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca_srcalpha.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_ca_srcalpha.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca_srcalpha.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_ca_srcalpha.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_ca_srcalpha.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_affine.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_affine.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_affine.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_affine.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_affine.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_affine.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_affine.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_affine.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_affine.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_affine.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_affine.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_affine.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_affine.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_affine.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_affine.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_affine.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_affine.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_affine.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_affine.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_affine.g7b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_projective.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_projective.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_projective.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_projective.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_projective.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_projective.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_projective.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_projective.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_projective.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_projective.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_projective.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_projective.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_projective.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_projective.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_projective.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_projective.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_projective.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_projective.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_projective.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_projective.g7b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_sample_a.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_a.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_sample_a.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_a.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_sample_a.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_a.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_sample_a.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_a.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_sample_a.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_a.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_sample_a.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_a.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_sample_a.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_a.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_sample_a.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_a.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_sample_a.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_a.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_sample_a.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_a.g7b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_sample_argb.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_argb.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_sample_argb.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_argb.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_sample_argb.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_argb.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_sample_argb.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_argb.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_sample_argb.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_argb.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_sample_argb.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_argb.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_sample_argb.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_argb.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_sample_argb.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_argb.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_mask_sample_argb.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_argb.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_mask_sample_argb.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_mask_sample_argb.g7b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_noca.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_noca.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_noca.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_noca.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_noca.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_noca.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_noca.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_noca.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_noca.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_noca.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_noca.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_noca.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_noca.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_noca.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_noca.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_noca.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_affine.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_affine.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_affine.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_affine.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_affine.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_affine.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_affine.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_affine.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_affine.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_affine.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_affine.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_affine.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_affine.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_affine.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_affine.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_affine.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_affine.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_affine.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_affine.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_affine.g7b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_projective.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_projective.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_projective.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_projective.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_projective.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_projective.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_projective.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_projective.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_projective.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_projective.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_projective.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_projective.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_projective.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_projective.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_projective.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_projective.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_projective.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_projective.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_projective.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_projective.g7b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_a.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_a.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_a.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_a.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_a.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_a.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_a.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_a.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_a.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_a.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_a.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_a.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_a.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_a.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_a.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_a.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_a.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_a.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_a.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_a.g7b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_argb.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_argb.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_argb.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_argb.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_argb.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_argb.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_argb.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_argb.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_argb.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_argb.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_argb.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_argb.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_argb.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_argb.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_argb.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_argb.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_argb.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_argb.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_argb.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_argb.g7b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_planar.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_planar.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_planar.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_planar.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_planar.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_planar.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_planar.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_planar.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_planar.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_planar.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_planar.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_planar.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_planar.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_planar.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_planar.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_planar.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_src_sample_planar.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_planar.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_src_sample_planar.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_src_sample_planar.g7b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_write.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_write.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_write.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_write.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_write.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_write.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_write.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_write.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_write.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_write.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_write.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_write.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_write.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_write.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_write.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_write.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_write.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_write.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_write.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_write.g7b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_xy.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_xy.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_xy.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_xy.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_xy.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_xy.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_xy.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_xy.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_xy.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_xy.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_xy.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_xy.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_yuv_rgb.g4b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_yuv_rgb.g4b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_yuv_rgb.g4b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_yuv_rgb.g4b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_yuv_rgb.g4b.gen5 b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_yuv_rgb.g4b.gen5
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_yuv_rgb.g4b.gen5
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_yuv_rgb.g4b.gen5
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_yuv_rgb.g5b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_yuv_rgb.g5b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_yuv_rgb.g5b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_yuv_rgb.g5b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_yuv_rgb.g6b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_yuv_rgb.g6b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_yuv_rgb.g6b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_yuv_rgb.g6b
diff --git a/drivers/video/Intel-2D/render_program/exa_wm_yuv_rgb.g7b b/contrib/sdk/sources/Intel-2D/render_program/exa_wm_yuv_rgb.g7b
similarity index 100%
rename from drivers/video/Intel-2D/render_program/exa_wm_yuv_rgb.g7b
rename to contrib/sdk/sources/Intel-2D/render_program/exa_wm_yuv_rgb.g7b
diff --git a/drivers/video/Intel-2D/sna/brw/brw.h b/contrib/sdk/sources/Intel-2D/sna/brw/brw.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/brw/brw.h
rename to contrib/sdk/sources/Intel-2D/sna/brw/brw.h
diff --git a/drivers/video/Intel-2D/sna/brw/brw_eu.c b/contrib/sdk/sources/Intel-2D/sna/brw/brw_eu.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/brw/brw_eu.c
rename to contrib/sdk/sources/Intel-2D/sna/brw/brw_eu.c
diff --git a/drivers/video/Intel-2D/sna/brw/brw_eu.h b/contrib/sdk/sources/Intel-2D/sna/brw/brw_eu.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/brw/brw_eu.h
rename to contrib/sdk/sources/Intel-2D/sna/brw/brw_eu.h
diff --git a/drivers/video/Intel-2D/sna/brw/brw_eu_emit.c b/contrib/sdk/sources/Intel-2D/sna/brw/brw_eu_emit.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/brw/brw_eu_emit.c
rename to contrib/sdk/sources/Intel-2D/sna/brw/brw_eu_emit.c
diff --git a/drivers/video/Intel-2D/sna/brw/brw_sf.c b/contrib/sdk/sources/Intel-2D/sna/brw/brw_sf.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/brw/brw_sf.c
rename to contrib/sdk/sources/Intel-2D/sna/brw/brw_sf.c
diff --git a/drivers/video/Intel-2D/sna/brw/brw_wm.c b/contrib/sdk/sources/Intel-2D/sna/brw/brw_wm.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/brw/brw_wm.c
rename to contrib/sdk/sources/Intel-2D/sna/brw/brw_wm.c
diff --git a/drivers/video/Intel-2D/sna/compiler.h b/contrib/sdk/sources/Intel-2D/sna/compiler.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/compiler.h
rename to contrib/sdk/sources/Intel-2D/sna/compiler.h
diff --git a/drivers/video/Intel-2D/sna/gen3_render.c b/contrib/sdk/sources/Intel-2D/sna/gen3_render.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen3_render.c
rename to contrib/sdk/sources/Intel-2D/sna/gen3_render.c
diff --git a/drivers/video/Intel-2D/sna/gen3_render.h b/contrib/sdk/sources/Intel-2D/sna/gen3_render.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen3_render.h
rename to contrib/sdk/sources/Intel-2D/sna/gen3_render.h
diff --git a/drivers/video/Intel-2D/sna/gen4_render.c b/contrib/sdk/sources/Intel-2D/sna/gen4_render.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen4_render.c
rename to contrib/sdk/sources/Intel-2D/sna/gen4_render.c
diff --git a/drivers/video/Intel-2D/sna/gen4_render.h b/contrib/sdk/sources/Intel-2D/sna/gen4_render.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen4_render.h
rename to contrib/sdk/sources/Intel-2D/sna/gen4_render.h
diff --git a/drivers/video/Intel-2D/sna/gen4_source.h b/contrib/sdk/sources/Intel-2D/sna/gen4_source.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen4_source.h
rename to contrib/sdk/sources/Intel-2D/sna/gen4_source.h
diff --git a/drivers/video/Intel-2D/sna/gen4_vertex.c b/contrib/sdk/sources/Intel-2D/sna/gen4_vertex.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen4_vertex.c
rename to contrib/sdk/sources/Intel-2D/sna/gen4_vertex.c
diff --git a/drivers/video/Intel-2D/sna/gen4_vertex.h b/contrib/sdk/sources/Intel-2D/sna/gen4_vertex.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen4_vertex.h
rename to contrib/sdk/sources/Intel-2D/sna/gen4_vertex.h
diff --git a/drivers/video/Intel-2D/sna/gen5_render.c b/contrib/sdk/sources/Intel-2D/sna/gen5_render.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen5_render.c
rename to contrib/sdk/sources/Intel-2D/sna/gen5_render.c
diff --git a/drivers/video/Intel-2D/sna/gen5_render.h b/contrib/sdk/sources/Intel-2D/sna/gen5_render.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen5_render.h
rename to contrib/sdk/sources/Intel-2D/sna/gen5_render.h
diff --git a/drivers/video/Intel-2D/sna/gen6_render.c b/contrib/sdk/sources/Intel-2D/sna/gen6_render.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen6_render.c
rename to contrib/sdk/sources/Intel-2D/sna/gen6_render.c
diff --git a/drivers/video/Intel-2D/sna/gen6_render.h b/contrib/sdk/sources/Intel-2D/sna/gen6_render.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen6_render.h
rename to contrib/sdk/sources/Intel-2D/sna/gen6_render.h
diff --git a/drivers/video/Intel-2D/sna/gen7_render.c b/contrib/sdk/sources/Intel-2D/sna/gen7_render.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen7_render.c
rename to contrib/sdk/sources/Intel-2D/sna/gen7_render.c
diff --git a/drivers/video/Intel-2D/sna/gen7_render.h b/contrib/sdk/sources/Intel-2D/sna/gen7_render.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/gen7_render.h
rename to contrib/sdk/sources/Intel-2D/sna/gen7_render.h
diff --git a/drivers/video/Intel-2D/sna/kgem.c b/contrib/sdk/sources/Intel-2D/sna/kgem.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/kgem.c
rename to contrib/sdk/sources/Intel-2D/sna/kgem.c
diff --git a/drivers/video/Intel-2D/sna/kgem.h b/contrib/sdk/sources/Intel-2D/sna/kgem.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/kgem.h
rename to contrib/sdk/sources/Intel-2D/sna/kgem.h
diff --git a/drivers/video/Intel-2D/sna/kgem_debug.c b/contrib/sdk/sources/Intel-2D/sna/kgem_debug.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/kgem_debug.c
rename to contrib/sdk/sources/Intel-2D/sna/kgem_debug.c
diff --git a/drivers/video/Intel-2D/sna/kgem_debug.h b/contrib/sdk/sources/Intel-2D/sna/kgem_debug.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/kgem_debug.h
rename to contrib/sdk/sources/Intel-2D/sna/kgem_debug.h
diff --git a/drivers/video/Intel-2D/sna/kgem_debug_gen3.c b/contrib/sdk/sources/Intel-2D/sna/kgem_debug_gen3.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/kgem_debug_gen3.c
rename to contrib/sdk/sources/Intel-2D/sna/kgem_debug_gen3.c
diff --git a/drivers/video/Intel-2D/sna/kgem_debug_gen4.c b/contrib/sdk/sources/Intel-2D/sna/kgem_debug_gen4.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/kgem_debug_gen4.c
rename to contrib/sdk/sources/Intel-2D/sna/kgem_debug_gen4.c
diff --git a/drivers/video/Intel-2D/sna/kgem_debug_gen5.c b/contrib/sdk/sources/Intel-2D/sna/kgem_debug_gen5.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/kgem_debug_gen5.c
rename to contrib/sdk/sources/Intel-2D/sna/kgem_debug_gen5.c
diff --git a/drivers/video/Intel-2D/sna/kgem_debug_gen6.c b/contrib/sdk/sources/Intel-2D/sna/kgem_debug_gen6.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/kgem_debug_gen6.c
rename to contrib/sdk/sources/Intel-2D/sna/kgem_debug_gen6.c
diff --git a/drivers/video/Intel-2D/sna/kgem_debug_gen7.c b/contrib/sdk/sources/Intel-2D/sna/kgem_debug_gen7.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/kgem_debug_gen7.c
rename to contrib/sdk/sources/Intel-2D/sna/kgem_debug_gen7.c
diff --git a/drivers/video/Intel-2D/sna/render/exa_sf.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_sf.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_sf.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_sf.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_sf.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_sf.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_sf.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_sf.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_sf_mask.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_sf_mask.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_sf_mask.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_sf_mask.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_sf_mask.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_sf_mask.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_sf_mask.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_sf_mask.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_ca.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_ca.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_ca.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_ca.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_ca.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_ca.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_ca_srcalpha.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca_srcalpha.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_ca_srcalpha.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca_srcalpha.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_ca_srcalpha.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca_srcalpha.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_ca_srcalpha.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca_srcalpha.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_ca_srcalpha.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca_srcalpha.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_ca_srcalpha.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_ca_srcalpha.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_affine.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_affine.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_affine.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_affine.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_affine.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_affine.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_affine.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_affine.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_affine.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_affine.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_affine.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_affine.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_affine.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_affine.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_affine.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_affine.g7b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_projective.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_projective.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_projective.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_projective.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_projective.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_projective.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_projective.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_projective.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_projective.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_projective.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_projective.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_projective.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_projective.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_projective.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_projective.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_projective.g7b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_a.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_a.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_a.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_a.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_a.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_a.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_a.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_a.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_a.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_a.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_a.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_a.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_a.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_a.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_a.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_a.g7b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_argb.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_argb.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_argb.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_argb.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_argb.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_argb.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_argb.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_argb.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_argb.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_argb.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_argb.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_argb.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_argb.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_argb.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_mask_sample_argb.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_mask_sample_argb.g7b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_noca.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_noca.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_noca.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_noca.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_noca.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_noca.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_noca.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_noca.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_noca.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_noca.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_noca.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_noca.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_affine.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_affine.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_affine.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_affine.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_affine.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_affine.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_affine.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_affine.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_affine.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_affine.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_affine.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_affine.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_affine.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_affine.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_affine.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_affine.g7b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_projective.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_projective.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_projective.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_projective.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_projective.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_projective.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_projective.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_projective.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_projective.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_projective.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_projective.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_projective.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_projective.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_projective.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_projective.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_projective.g7b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_a.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_a.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_a.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_a.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_a.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_a.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_a.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_a.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_a.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_a.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_a.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_a.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_a.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_a.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_a.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_a.g7b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_argb.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_argb.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_argb.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_argb.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_argb.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_argb.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_argb.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_argb.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_argb.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_argb.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_argb.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_argb.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_argb.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_argb.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_argb.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_argb.g7b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_planar.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_planar.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_planar.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_planar.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_planar.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_planar.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_planar.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_planar.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_planar.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_planar.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_planar.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_planar.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_src_sample_planar.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_planar.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_src_sample_planar.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_src_sample_planar.g7b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_write.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_write.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_write.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_write.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_write.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_write.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_write.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_write.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_write.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_write.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_write.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_write.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_write.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_write.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_write.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_write.g7b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_xy.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_xy.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_xy.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_xy.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_xy.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_xy.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_xy.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_xy.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_yuv_rgb.g4b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_yuv_rgb.g4b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_yuv_rgb.g4b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_yuv_rgb.g4b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_yuv_rgb.g5b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_yuv_rgb.g5b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_yuv_rgb.g5b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_yuv_rgb.g5b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_yuv_rgb.g6b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_yuv_rgb.g6b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_yuv_rgb.g6b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_yuv_rgb.g6b
diff --git a/drivers/video/Intel-2D/sna/render/exa_wm_yuv_rgb.g7b b/contrib/sdk/sources/Intel-2D/sna/render/exa_wm_yuv_rgb.g7b
similarity index 100%
rename from drivers/video/Intel-2D/sna/render/exa_wm_yuv_rgb.g7b
rename to contrib/sdk/sources/Intel-2D/sna/render/exa_wm_yuv_rgb.g7b
diff --git a/drivers/video/Intel-2D/sna/sna.c b/contrib/sdk/sources/Intel-2D/sna/sna.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/sna.c
rename to contrib/sdk/sources/Intel-2D/sna/sna.c
diff --git a/drivers/video/Intel-2D/sna/sna.h b/contrib/sdk/sources/Intel-2D/sna/sna.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/sna.h
rename to contrib/sdk/sources/Intel-2D/sna/sna.h
diff --git a/drivers/video/Intel-2D/sna/sna_cpu.c b/contrib/sdk/sources/Intel-2D/sna/sna_cpu.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/sna_cpu.c
rename to contrib/sdk/sources/Intel-2D/sna/sna_cpu.c
diff --git a/drivers/video/Intel-2D/sna/sna_cpuid.h b/contrib/sdk/sources/Intel-2D/sna/sna_cpuid.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/sna_cpuid.h
rename to contrib/sdk/sources/Intel-2D/sna/sna_cpuid.h
diff --git a/drivers/video/Intel-2D/sna/sna_reg.h b/contrib/sdk/sources/Intel-2D/sna/sna_reg.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/sna_reg.h
rename to contrib/sdk/sources/Intel-2D/sna/sna_reg.h
diff --git a/drivers/video/Intel-2D/sna/sna_render.h b/contrib/sdk/sources/Intel-2D/sna/sna_render.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/sna_render.h
rename to contrib/sdk/sources/Intel-2D/sna/sna_render.h
diff --git a/drivers/video/Intel-2D/sna/sna_render_inline.h b/contrib/sdk/sources/Intel-2D/sna/sna_render_inline.h
similarity index 100%
rename from drivers/video/Intel-2D/sna/sna_render_inline.h
rename to contrib/sdk/sources/Intel-2D/sna/sna_render_inline.h
diff --git a/drivers/video/Intel-2D/sna/sna_stream.c b/contrib/sdk/sources/Intel-2D/sna/sna_stream.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/sna_stream.c
rename to contrib/sdk/sources/Intel-2D/sna/sna_stream.c
diff --git a/drivers/video/Intel-2D/sna/sna_transform.c b/contrib/sdk/sources/Intel-2D/sna/sna_transform.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/sna_transform.c
rename to contrib/sdk/sources/Intel-2D/sna/sna_transform.c
diff --git a/drivers/video/Intel-2D/sna/utils.c b/contrib/sdk/sources/Intel-2D/sna/utils.c
similarity index 100%
rename from drivers/video/Intel-2D/sna/utils.c
rename to contrib/sdk/sources/Intel-2D/sna/utils.c
diff --git a/drivers/video/Intel-2D/uxa/brw_defines.h b/contrib/sdk/sources/Intel-2D/uxa/brw_defines.h
similarity index 100%
rename from drivers/video/Intel-2D/uxa/brw_defines.h
rename to contrib/sdk/sources/Intel-2D/uxa/brw_defines.h
diff --git a/drivers/video/Intel-2D/uxa/brw_structs.h b/contrib/sdk/sources/Intel-2D/uxa/brw_structs.h
similarity index 100%
rename from drivers/video/Intel-2D/uxa/brw_structs.h
rename to contrib/sdk/sources/Intel-2D/uxa/brw_structs.h
diff --git a/drivers/video/Intel-2D/uxa/common.h b/contrib/sdk/sources/Intel-2D/uxa/common.h
similarity index 100%
rename from drivers/video/Intel-2D/uxa/common.h
rename to contrib/sdk/sources/Intel-2D/uxa/common.h
diff --git a/drivers/video/Intel-2D/uxa/i830_reg.h b/contrib/sdk/sources/Intel-2D/uxa/i830_reg.h
similarity index 100%
rename from drivers/video/Intel-2D/uxa/i830_reg.h
rename to contrib/sdk/sources/Intel-2D/uxa/i830_reg.h
diff --git a/drivers/video/Intel-2D/uxa/i965_3d.c b/contrib/sdk/sources/Intel-2D/uxa/i965_3d.c
similarity index 100%
rename from drivers/video/Intel-2D/uxa/i965_3d.c
rename to contrib/sdk/sources/Intel-2D/uxa/i965_3d.c
diff --git a/drivers/video/Intel-2D/uxa/i965_reg.h b/contrib/sdk/sources/Intel-2D/uxa/i965_reg.h
similarity index 100%
rename from drivers/video/Intel-2D/uxa/i965_reg.h
rename to contrib/sdk/sources/Intel-2D/uxa/i965_reg.h
diff --git a/drivers/video/Intel-2D/uxa/i965_render.c b/contrib/sdk/sources/Intel-2D/uxa/i965_render.c
similarity index 100%
rename from drivers/video/Intel-2D/uxa/i965_render.c
rename to contrib/sdk/sources/Intel-2D/uxa/i965_render.c
diff --git a/drivers/video/Intel-2D/uxa/intel.h b/contrib/sdk/sources/Intel-2D/uxa/intel.h
similarity index 100%
rename from drivers/video/Intel-2D/uxa/intel.h
rename to contrib/sdk/sources/Intel-2D/uxa/intel.h
diff --git a/drivers/video/Intel-2D/uxa/intel_batchbuffer.c b/contrib/sdk/sources/Intel-2D/uxa/intel_batchbuffer.c
similarity index 100%
rename from drivers/video/Intel-2D/uxa/intel_batchbuffer.c
rename to contrib/sdk/sources/Intel-2D/uxa/intel_batchbuffer.c
diff --git a/drivers/video/Intel-2D/uxa/intel_batchbuffer.h b/contrib/sdk/sources/Intel-2D/uxa/intel_batchbuffer.h
similarity index 100%
rename from drivers/video/Intel-2D/uxa/intel_batchbuffer.h
rename to contrib/sdk/sources/Intel-2D/uxa/intel_batchbuffer.h
diff --git a/drivers/video/Intel-2D/uxa/uxa.c b/contrib/sdk/sources/Intel-2D/uxa/uxa.c
similarity index 100%
rename from drivers/video/Intel-2D/uxa/uxa.c
rename to contrib/sdk/sources/Intel-2D/uxa/uxa.c