diff --git a/src/imagination/common/device_info/axe-1-16m.h b/src/imagination/common/device_info/axe-1-16m.h index bc381e7cf60..d54a882067b 100644 --- a/src/imagination/common/device_info/axe-1-16m.h +++ b/src/imagination/common/device_info/axe-1-16m.h @@ -30,7 +30,8 @@ #define PVR_DEVICE_IDENT_33_V_11_3 \ .device_id = 0x33011003, .series_name = "A-Series", \ - .public_name = "AXE-1-16M" + .public_name = "AXE-1-16M", .arch = PVR_DEVICE_ARCH_ROGUE + static const struct pvr_device_features pvr_device_features_33_V_11_3 = { .has_common_store_size_in_dwords = true, diff --git a/src/imagination/common/device_info/bxe-2-32.h b/src/imagination/common/device_info/bxe-2-32.h index 25c9fcaeb0f..531e9761bf6 100644 --- a/src/imagination/common/device_info/bxe-2-32.h +++ b/src/imagination/common/device_info/bxe-2-32.h @@ -12,7 +12,8 @@ #include "pvr_device_info.h" #define PVR_DEVICE_IDENT_36_V_52_182 \ - .device_id = 0x36052182, .series_name = "B-Series", .public_name = "BXE-2-32" + .device_id = 0x36052182, .series_name = "B-Series", \ + .public_name = "BXE-2-32", .arch = PVR_DEVICE_ARCH_ROGUE static const struct pvr_device_features pvr_device_features_36_V_52_182 = { .has_astc = true, diff --git a/src/imagination/common/device_info/bxe-4-32.h b/src/imagination/common/device_info/bxe-4-32.h index 0f103ea293d..861c0dfc213 100644 --- a/src/imagination/common/device_info/bxe-4-32.h +++ b/src/imagination/common/device_info/bxe-4-32.h @@ -12,7 +12,8 @@ #include "pvr_device_info.h" #define PVR_DEVICE_IDENT_36_V_54_182 \ - .device_id = 0x36054182, .series_name = "B-Series", .public_name = "BXE-4-32" + .device_id = 0x36054182, .series_name = "B-Series", \ + .public_name = "BXE-4-32", .arch = PVR_DEVICE_ARCH_ROGUE static const struct pvr_device_features pvr_device_features_36_V_54_182 = { .has_astc = true, diff --git a/src/imagination/common/device_info/bxm-4-64.h b/src/imagination/common/device_info/bxm-4-64.h index 970ccc0690d..85a32d384e9 100644 --- a/src/imagination/common/device_info/bxm-4-64.h +++ b/src/imagination/common/device_info/bxm-4-64.h @@ -12,7 +12,8 @@ #include "pvr_device_info.h" #define PVR_DEVICE_IDENT_36_V_104_182 \ - .device_id = 0x36104182, .series_name = "B-Series", .public_name = "BXM-4-64" + .device_id = 0x36104182, .series_name = "B-Series", \ + .public_name = "BXM-4-64", .arch = PVR_DEVICE_ARCH_ROGUE static const struct pvr_device_features pvr_device_features_36_V_104_182 = { .has_astc = true, diff --git a/src/imagination/common/device_info/bxs-4-64.h b/src/imagination/common/device_info/bxs-4-64.h index 73ad3c58375..fa60bbb08e1 100644 --- a/src/imagination/common/device_info/bxs-4-64.h +++ b/src/imagination/common/device_info/bxs-4-64.h @@ -29,7 +29,8 @@ #include "pvr_device_info.h" #define PVR_DEVICE_IDENT_36_V_104_796 \ - .device_id = 0x36104796, .series_name = "B-Series", .public_name = "BXS-4-64" + .device_id = 0x36104796, .series_name = "B-Series", \ + .public_name = "BXS-4-64", .arch = PVR_DEVICE_ARCH_ROGUE static const struct pvr_device_features pvr_device_features_36_V_104_796 = { .has_astc = true, diff --git a/src/imagination/common/device_info/g6110.h b/src/imagination/common/device_info/g6110.h index c7464749eb7..ca1b0f23cd3 100644 --- a/src/imagination/common/device_info/g6110.h +++ b/src/imagination/common/device_info/g6110.h @@ -12,7 +12,8 @@ #include "pvr_device_info.h" #define PVR_DEVICE_IDENT_5_V_1_46 \ - .device_id = 0x6110, .series_name = "Rogue", .public_name = "GX6110" + .device_id = 0x6110, .series_name = "Rogue", \ + .public_name = "GX6110", .arch = PVR_DEVICE_ARCH_ROGUE static const struct pvr_device_features pvr_device_features_5_V_1_46 = { .has_common_store_size_in_dwords = true, diff --git a/src/imagination/common/device_info/ge7800.h b/src/imagination/common/device_info/ge7800.h index 3e831ed8961..f6635a3e52e 100644 --- a/src/imagination/common/device_info/ge7800.h +++ b/src/imagination/common/device_info/ge7800.h @@ -12,7 +12,8 @@ #include "pvr_device_info.h" #define PVR_DEVICE_IDENT_15_V_1_64 \ - .device_id = 0x15001064, .series_name = "Rogue", .public_name = "GE7800" + .device_id = 0x15001064, .series_name = "Rogue", \ + .public_name = "GE7800", .arch = PVR_DEVICE_ARCH_ROGUE static const struct pvr_device_features pvr_device_features_15_V_1_64 = { .has_astc = true, diff --git a/src/imagination/common/device_info/ge8300.h b/src/imagination/common/device_info/ge8300.h index 2f83adab67d..1cd1d6ed6be 100644 --- a/src/imagination/common/device_info/ge8300.h +++ b/src/imagination/common/device_info/ge8300.h @@ -12,7 +12,8 @@ #include "pvr_device_info.h" #define PVR_DEVICE_IDENT_22_V_54_30 \ - .device_id = 0x22054030, .series_name = "Rogue", .public_name = "GE8300" + .device_id = 0x22054030, .series_name = "Rogue", \ + .public_name = "GE8300", .arch = PVR_DEVICE_ARCH_ROGUE static const struct pvr_device_features pvr_device_features_22_V_54_30 = { .has_astc = true, diff --git a/src/imagination/common/device_info/gx6250.h b/src/imagination/common/device_info/gx6250.h index ecaff64db98..ea9a918f4b6 100644 --- a/src/imagination/common/device_info/gx6250.h +++ b/src/imagination/common/device_info/gx6250.h @@ -29,7 +29,8 @@ #include "pvr_device_info.h" #define PVR_DEVICE_IDENT_4_V_2_51 \ - .device_id = 0x6250, .series_name = "Rogue", .public_name = "GX6250" + .device_id = 0x6250, .series_name = "Rogue", \ + .public_name = "GX6250", .arch = PVR_DEVICE_ARCH_ROGUE static const struct pvr_device_features pvr_device_features_4_V_2_51 = { .has_astc = true, diff --git a/src/imagination/common/device_info/gx6650.h b/src/imagination/common/device_info/gx6650.h index 26174dcf44b..dcb796a6f47 100644 --- a/src/imagination/common/device_info/gx6650.h +++ b/src/imagination/common/device_info/gx6650.h @@ -12,7 +12,8 @@ #include "pvr_device_info.h" #define PVR_DEVICE_IDENT_4_V_6_62 \ - .device_id = 0x6650, .series_name = "Rogue", .public_name = "GX6650" + .device_id = 0x6650, .series_name = "Rogue", \ + .public_name = "GX6650", .arch = PVR_DEVICE_ARCH_ROGUE static const struct pvr_device_features pvr_device_features_4_V_6_62 = { .has_astc = true, diff --git a/src/imagination/common/pvr_device_info.h b/src/imagination/common/pvr_device_info.h index 7e6657fb59c..9ae5283938e 100644 --- a/src/imagination/common/pvr_device_info.h +++ b/src/imagination/common/pvr_device_info.h @@ -46,6 +46,10 @@ #define PVR_BVNC_PACK_MASK_N UINT64_C(0x00000000FFFF0000) #define PVR_BVNC_PACK_MASK_C UINT64_C(0x000000000000FFFF) +enum pvr_device_arch { + PVR_DEVICE_ARCH_ROGUE, +}; + /** * Packs B, V, N and C values into a 64-bit unsigned integer. * @@ -241,6 +245,7 @@ #define PVR_HAS_QUIRK(dev_info, number) ((dev_info)->quirks.has_brn##number) struct pvr_device_ident { + enum pvr_device_arch arch; uint16_t b, v, n, c; uint32_t device_id; const char *series_name;