Merge remote branch 'korg/drm-vmware-staging' into drm-core-next

2026-05-01 15:00:59 -07:00 · 2009-12-18 09:53:50 +10:00
parent 5012f5063f fb1d9738ca
commit cbc8cc049a
28 changed files with 11394 additions and 1 deletions
@@ -7,5 +7,6 @@ unifdef-y += r128_drm.h
 unifdef-y += radeon_drm.h
 unifdef-y += sis_drm.h
 unifdef-y += savage_drm.h
+unifdef-y += vmwgfx_drm.h
 unifdef-y += via_drm.h
 unifdef-y += nouveau_drm.h
@@ -77,7 +77,11 @@ enum ttm_object_type {
 	ttm_buffer_type,
 	ttm_lock_type,
 	ttm_driver_type0 = 256,
-	ttm_driver_type1
+	ttm_driver_type1,
+	ttm_driver_type2,
+	ttm_driver_type3,
+	ttm_driver_type4,
+	ttm_driver_type5
 };

 struct ttm_object_file;