intel: s/brw_device_info/gen_device_info/

Generated by:

sed -i -e 's/brw_device_info/gen_device_info/g' src/intel/**/*.c
sed -i -e 's/brw_device_info/gen_device_info/g' src/intel/**/*.h
sed -i -e 's/brw_device_info/gen_device_info/g' **/i965/*.c
sed -i -e 's/brw_device_info/gen_device_info/g' **/i965/*.cpp
sed -i -e 's/brw_device_info/gen_device_info/g' **/i965/*.h

Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>

19 files changed, 92 insertions, 92 deletions

diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 97f2328fefe..af4174fc5c0 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -7,8 +7,8 @@ BLORP_FILES = \
 	blorp/blorp_priv.h
 
 COMMON_FILES = \
-	common/brw_device_info.c \
-	common/brw_device_info.h
+	common/gen_device_info.c \
+	common/gen_device_info.h
 
 GENXML_GENERATED_FILES = \
 	genxml/gen4_pack.h \
diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c
index 170c3816e38..f5cb16a2c2a 100644
--- a/src/intel/blorp/blorp_blit.c
+++ b/src/intel/blorp/blorp_blit.c
@@ -984,7 +984,7 @@ static nir_shader *
 brw_blorp_build_nir_shader(struct blorp_context *blorp,
                            const struct brw_blorp_blit_prog_key *key)
 {
-   const struct brw_device_info *devinfo = blorp->isl_dev->info;
+   const struct gen_device_info *devinfo = blorp->isl_dev->info;
    nir_ssa_def *src_pos, *dst_pos, *color;
 
    /* Sanity checks */
@@ -1393,7 +1393,7 @@ blorp_blit(struct blorp_batch *batch,
            float dst_x1, float dst_y1,
            GLenum filter, bool mirror_x, bool mirror_y)
 {
-   const struct brw_device_info *devinfo = batch->blorp->isl_dev->info;
+   const struct gen_device_info *devinfo = batch->blorp->isl_dev->info;
 
    struct blorp_params params;
    blorp_params_init(&params);
diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h
index 461cfe0abc8..d049eb0912e 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -22,7 +22,7 @@
  */
 
 #include "blorp_priv.h"
-#include "common/brw_device_info.h"
+#include "common/gen_device_info.h"
 #include "intel_aub.h"
 
 /**
diff --git a/src/intel/common/brw_device_info.c b/src/intel/common/gen_device_info.c
index fb224fae234..6ee55e187fc 100644
--- a/src/intel/common/brw_device_info.c
+++ b/src/intel/common/gen_device_info.c
@@ -23,9 +23,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "brw_device_info.h"
+#include "gen_device_info.h"
 
-static const struct brw_device_info brw_device_info_i965 = {
+static const struct gen_device_info gen_device_info_i965 = {
    .gen = 4,
    .has_negative_rhw_bug = true,
    .num_slices = 1,
@@ -37,7 +37,7 @@ static const struct brw_device_info brw_device_info_i965 = {
    },
 };
 
-static const struct brw_device_info brw_device_info_g4x = {
+static const struct gen_device_info gen_device_info_g4x = {
    .gen = 4,
    .has_pln = true,
    .has_compr4 = true,
@@ -52,7 +52,7 @@ static const struct brw_device_info brw_device_info_g4x = {
    },
 };
 
-static const struct brw_device_info brw_device_info_ilk = {
+static const struct gen_device_info gen_device_info_ilk = {
    .gen = 5,
    .has_pln = true,
    .has_compr4 = true,
@@ -66,7 +66,7 @@ static const struct brw_device_info brw_device_info_ilk = {
    },
 };
 
-static const struct brw_device_info brw_device_info_snb_gt1 = {
+static const struct gen_device_info gen_device_info_snb_gt1 = {
    .gen = 6,
    .gt = 1,
    .has_hiz_and_separate_stencil = true,
@@ -86,7 +86,7 @@ static const struct brw_device_info brw_device_info_snb_gt1 = {
    },
 };
 
-static const struct brw_device_info brw_device_info_snb_gt2 = {
+static const struct gen_device_info gen_device_info_snb_gt2 = {
    .gen = 6,
    .gt = 2,
    .has_hiz_and_separate_stencil = true,
@@ -114,7 +114,7 @@ static const struct brw_device_info brw_device_info_snb_gt2 = {
    .has_pln = true,                                 \
    .has_surface_tile_offset = true
 
-static const struct brw_device_info brw_device_info_ivb_gt1 = {
+static const struct gen_device_info gen_device_info_ivb_gt1 = {
    GEN7_FEATURES, .is_ivybridge = true, .gt = 1,
    .num_slices = 1,
    .max_vs_threads = 36,
@@ -134,7 +134,7 @@ static const struct brw_device_info brw_device_info_ivb_gt1 = {
    },
 };
 
-static const struct brw_device_info brw_device_info_ivb_gt2 = {
+static const struct gen_device_info gen_device_info_ivb_gt2 = {
    GEN7_FEATURES, .is_ivybridge = true, .gt = 2,
    .num_slices = 1,
    .max_vs_threads = 128,
@@ -154,7 +154,7 @@ static const struct brw_device_info brw_device_info_ivb_gt2 = {
    },
 };
 
-static const struct brw_device_info brw_device_info_byt = {
+static const struct gen_device_info gen_device_info_byt = {
    GEN7_FEATURES, .is_baytrail = true, .gt = 1,
    .num_slices = 1,
    .has_llc = false,
@@ -181,7 +181,7 @@ static const struct brw_device_info brw_device_info_byt = {
    .supports_simd16_3src = true, \
    .has_resource_streamer = true
 
-static const struct brw_device_info brw_device_info_hsw_gt1 = {
+static const struct gen_device_info gen_device_info_hsw_gt1 = {
    HSW_FEATURES, .gt = 1,
    .num_slices = 1,
    .max_vs_threads = 70,
@@ -201,7 +201,7 @@ static const struct brw_device_info brw_device_info_hsw_gt1 = {
    },
 };
 
-static const struct brw_device_info brw_device_info_hsw_gt2 = {
+static const struct gen_device_info gen_device_info_hsw_gt2 = {
    HSW_FEATURES, .gt = 2,
    .num_slices = 1,
    .max_vs_threads = 280,
@@ -221,7 +221,7 @@ static const struct brw_device_info brw_device_info_hsw_gt2 = {
    },
 };
 
-static const struct brw_device_info brw_device_info_hsw_gt3 = {
+static const struct gen_device_info gen_device_info_hsw_gt3 = {
    HSW_FEATURES, .gt = 3,
    .num_slices = 2,
    .max_vs_threads = 280,
@@ -256,7 +256,7 @@ static const struct brw_device_info brw_device_info_hsw_gt3 = {
    .max_gs_threads = 504,                           \
    .max_wm_threads = 384
 
-static const struct brw_device_info brw_device_info_bdw_gt1 = {
+static const struct gen_device_info gen_device_info_bdw_gt1 = {
    GEN8_FEATURES, .gt = 1,
    .num_slices = 1,
    .max_cs_threads = 42,
@@ -271,7 +271,7 @@ static const struct brw_device_info brw_device_info_bdw_gt1 = {
    }
 };
 
-static const struct brw_device_info brw_device_info_bdw_gt2 = {
+static const struct gen_device_info gen_device_info_bdw_gt2 = {
    GEN8_FEATURES, .gt = 2,
    .num_slices = 1,
    .max_cs_threads = 56,
@@ -286,7 +286,7 @@ static const struct brw_device_info brw_device_info_bdw_gt2 = {
    }
 };
 
-static const struct brw_device_info brw_device_info_bdw_gt3 = {
+static const struct gen_device_info gen_device_info_bdw_gt3 = {
    GEN8_FEATURES, .gt = 3,
    .num_slices = 2,
    .max_cs_threads = 56,
@@ -301,7 +301,7 @@ static const struct brw_device_info brw_device_info_bdw_gt3 = {
    }
 };
 
-static const struct brw_device_info brw_device_info_chv = {
+static const struct gen_device_info gen_device_info_chv = {
    GEN8_FEATURES, .is_cherryview = 1, .gt = 1,
    .has_llc = false,
    .num_slices = 1,
@@ -347,23 +347,23 @@ static const struct brw_device_info brw_device_info_chv = {
       .max_gs_entries = 640,                        \
    }
 
-static const struct brw_device_info brw_device_info_skl_gt1 = {
+static const struct gen_device_info gen_device_info_skl_gt1 = {
    GEN9_FEATURES, .gt = 1,
    .num_slices = 1,
    .urb.size = 192,
 };
 
-static const struct brw_device_info brw_device_info_skl_gt2 = {
+static const struct gen_device_info gen_device_info_skl_gt2 = {
    GEN9_FEATURES, .gt = 2,
    .num_slices = 1,
 };
 
-static const struct brw_device_info brw_device_info_skl_gt3 = {
+static const struct gen_device_info gen_device_info_skl_gt3 = {
    GEN9_FEATURES, .gt = 3,
    .num_slices = 2,
 };
 
-static const struct brw_device_info brw_device_info_skl_gt4 = {
+static const struct gen_device_info gen_device_info_skl_gt4 = {
    GEN9_FEATURES, .gt = 4,
    .num_slices = 3,
    /* From the "L3 Allocation and Programming" documentation:
@@ -377,7 +377,7 @@ static const struct brw_device_info brw_device_info_skl_gt4 = {
    .urb.size = 1008 / 3,
 };
 
-static const struct brw_device_info brw_device_info_bxt = {
+static const struct gen_device_info gen_device_info_bxt = {
    GEN9_FEATURES,
    .is_broxton = 1,
    .gt = 1,
@@ -400,7 +400,7 @@ static const struct brw_device_info brw_device_info_bxt = {
    }
 };
 
-static const struct brw_device_info brw_device_info_bxt_2x6 = {
+static const struct gen_device_info gen_device_info_bxt_2x6 = {
    GEN9_FEATURES,
    .is_broxton = 1,
    .gt = 1,
@@ -433,7 +433,7 @@ static const struct brw_device_info brw_device_info_bxt_2x6 = {
  */
 #define  KBL_MAX_THREADS_PER_PSD 64
 
-static const struct brw_device_info brw_device_info_kbl_gt1 = {
+static const struct gen_device_info gen_device_info_kbl_gt1 = {
    GEN9_FEATURES,
    .gt = 1,
 
@@ -443,7 +443,7 @@ static const struct brw_device_info brw_device_info_kbl_gt1 = {
    .num_slices = 1,
 };
 
-static const struct brw_device_info brw_device_info_kbl_gt1_5 = {
+static const struct gen_device_info gen_device_info_kbl_gt1_5 = {
    GEN9_FEATURES,
    .gt = 1,
 
@@ -452,7 +452,7 @@ static const struct brw_device_info brw_device_info_kbl_gt1_5 = {
    .num_slices = 1,
 };
 
-static const struct brw_device_info brw_device_info_kbl_gt2 = {
+static const struct gen_device_info gen_device_info_kbl_gt2 = {
    GEN9_FEATURES,
    .gt = 2,
 
@@ -460,7 +460,7 @@ static const struct brw_device_info brw_device_info_kbl_gt2 = {
    .num_slices = 1,
 };
 
-static const struct brw_device_info brw_device_info_kbl_gt3 = {
+static const struct gen_device_info gen_device_info_kbl_gt3 = {
    GEN9_FEATURES,
    .gt = 3,
 
@@ -468,7 +468,7 @@ static const struct brw_device_info brw_device_info_kbl_gt3 = {
    .num_slices = 2,
 };
 
-static const struct brw_device_info brw_device_info_kbl_gt4 = {
+static const struct gen_device_info gen_device_info_kbl_gt4 = {
    GEN9_FEATURES,
    .gt = 4,
 
@@ -487,14 +487,14 @@ static const struct brw_device_info brw_device_info_kbl_gt4 = {
    .num_slices = 3,
 };
 
-const struct brw_device_info *
+const struct gen_device_info *
 brw_get_device_info(int devid)
 {
-   const struct brw_device_info *devinfo;
+   const struct gen_device_info *devinfo;
    switch (devid) {
 #undef CHIPSET
 #define CHIPSET(id, family, name) \
-   case id: devinfo = &brw_device_info_##family; break;
+   case id: devinfo = &gen_device_info_##family; break;
 #include "pci_ids/i965_pci_ids.h"
    default:
       fprintf(stderr, "i965_dri.so does not support the 0x%x PCI ID.\n", devid);
diff --git a/src/intel/common/brw_device_info.h b/src/intel/common/gen_device_info.h
index 0869063df32..ea1b75068cc 100644
--- a/src/intel/common/brw_device_info.h
+++ b/src/intel/common/gen_device_info.h
@@ -28,7 +28,7 @@
 /**
  * Intel hardware information and quirks
  */
-struct brw_device_info
+struct gen_device_info
 {
    int gen; /**< Generation number: 4, 5, 6, 7, ... */
    int gt;
@@ -143,5 +143,5 @@ struct brw_device_info
    /** @} */
 };
 
-const struct brw_device_info *brw_get_device_info(int devid);
+const struct gen_device_info *brw_get_device_info(int devid);
 const char *brw_get_device_name(int devid);
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 0487515d1d6..c7639d0164e 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -48,7 +48,7 @@ __isl_finishme(const char *file, int line, const char *fmt, ...)
 
 void
 isl_device_init(struct isl_device *dev,
-                const struct brw_device_info *info,
+                const struct gen_device_info *info,
                 bool has_bit6_swizzling)
 {
    dev->info = info;
diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index 5e56f28545e..bb20d1772d1 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -48,7 +48,7 @@
 extern "C" {
 #endif
 
-struct brw_device_info;
+struct gen_device_info;
 struct brw_image_param;
 
 #ifndef ISL_DEV_GEN
@@ -667,7 +667,7 @@ enum isl_msaa_layout {
 
 
 struct isl_device {
-   const struct brw_device_info *info;
+   const struct gen_device_info *info;
    bool use_separate_stencil;
    bool has_bit6_swizzling;
 };
@@ -959,7 +959,7 @@ extern const struct isl_format_layout isl_format_layouts[];
 
 void
 isl_device_init(struct isl_device *dev,
-                const struct brw_device_info *info,
+                const struct gen_device_info *info,
                 bool has_bit6_swizzling);
 
 isl_sample_count_mask_t ATTRIBUTE_CONST
@@ -977,17 +977,17 @@ isl_format_get_name(enum isl_format fmt)
    return isl_format_layouts[fmt].name;
 }
 
-bool isl_format_supports_rendering(const struct brw_device_info *devinfo,
+bool isl_format_supports_rendering(const struct gen_device_info *devinfo,
                                    enum isl_format format);
-bool isl_format_supports_alpha_blending(const struct brw_device_info *devinfo,
+bool isl_format_supports_alpha_blending(const struct gen_device_info *devinfo,
                                         enum isl_format format);
-bool isl_format_supports_sampling(const struct brw_device_info *devinfo,
+bool isl_format_supports_sampling(const struct gen_device_info *devinfo,
                                   enum isl_format format);
-bool isl_format_supports_filtering(const struct brw_device_info *devinfo,
+bool isl_format_supports_filtering(const struct gen_device_info *devinfo,
                                    enum isl_format format);
-bool isl_format_supports_vertex_fetch(const struct brw_device_info *devinfo,
+bool isl_format_supports_vertex_fetch(const struct gen_device_info *devinfo,
                                       enum isl_format format);
-bool isl_format_supports_lossless_compression(const struct brw_device_info *devinfo,
+bool isl_format_supports_lossless_compression(const struct gen_device_info *devinfo,
                                               enum isl_format format);
 
 bool isl_format_has_unorm_channel(enum isl_format fmt) ATTRIBUTE_CONST;
@@ -1089,14 +1089,14 @@ enum isl_format isl_format_rgb_to_rgbx(enum isl_format rgb) ATTRIBUTE_CONST;
 bool isl_is_storage_image_format(enum isl_format fmt);
 
 enum isl_format
-isl_lower_storage_image_format(const struct brw_device_info *devinfo,
+isl_lower_storage_image_format(const struct gen_device_info *devinfo,
                                enum isl_format fmt);
 
 /* Returns true if this hardware supports typed load/store on a format with
  * the same size as the given format.
  */
 bool
-isl_has_matching_typed_storage_image_format(const struct brw_device_info *devinfo,
+isl_has_matching_typed_storage_image_format(const struct gen_device_info *devinfo,
                                             enum isl_format fmt);
 
 static inline bool
diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
index c41a0bfcced..2804463b127 100644
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 
 #include "isl.h"
-#include "common/brw_device_info.h"
+#include "common/gen_device_info.h"
 
 struct surface_format_info {
    bool exists;
@@ -340,13 +340,13 @@ static const struct surface_format_info format_info[] = {
 #undef Y
 
 static unsigned
-format_gen(const struct brw_device_info *devinfo)
+format_gen(const struct gen_device_info *devinfo)
 {
    return devinfo->gen * 10 + (devinfo->is_g4x || devinfo->is_haswell) * 5;
 }
 
 bool
-isl_format_supports_rendering(const struct brw_device_info *devinfo,
+isl_format_supports_rendering(const struct gen_device_info *devinfo,
                               enum isl_format format)
 {
    if (!format_info[format].exists)
@@ -356,7 +356,7 @@ isl_format_supports_rendering(const struct brw_device_info *devinfo,
 }
 
 bool
-isl_format_supports_alpha_blending(const struct brw_device_info *devinfo,
+isl_format_supports_alpha_blending(const struct gen_device_info *devinfo,
                                    enum isl_format format)
 {
    if (!format_info[format].exists)
@@ -366,7 +366,7 @@ isl_format_supports_alpha_blending(const struct brw_device_info *devinfo,
 }
 
 bool
-isl_format_supports_sampling(const struct brw_device_info *devinfo,
+isl_format_supports_sampling(const struct gen_device_info *devinfo,
                              enum isl_format format)
 {
    if (!format_info[format].exists)
@@ -385,7 +385,7 @@ isl_format_supports_sampling(const struct brw_device_info *devinfo,
 }
 
 bool
-isl_format_supports_filtering(const struct brw_device_info *devinfo,
+isl_format_supports_filtering(const struct gen_device_info *devinfo,
                               enum isl_format format)
 {
    if (!format_info[format].exists)
@@ -404,7 +404,7 @@ isl_format_supports_filtering(const struct brw_device_info *devinfo,
 }
 
 bool
-isl_format_supports_vertex_fetch(const struct brw_device_info *devinfo,
+isl_format_supports_vertex_fetch(const struct gen_device_info *devinfo,
                                  enum isl_format format)
 {
    if (!format_info[format].exists)
@@ -420,7 +420,7 @@ isl_format_supports_vertex_fetch(const struct brw_device_info *devinfo,
 }
 
 bool
-isl_format_supports_lossless_compression(const struct brw_device_info *devinfo,
+isl_format_supports_lossless_compression(const struct gen_device_info *devinfo,
                                          enum isl_format format)
 {
    if (!format_info[format].exists)
diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h
index 0c2ac2553fb..b539f10638d 100644
--- a/src/intel/isl/isl_priv.h
+++ b/src/intel/isl/isl_priv.h
@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <strings.h>
 
-#include "common/brw_device_info.h"
+#include "common/gen_device_info.h"
 #include "util/macros.h"
 
 #include "isl.h"
diff --git a/src/intel/isl/isl_storage_image.c b/src/intel/isl/isl_storage_image.c
index 01d388180d6..ffd03e4ad01 100644
--- a/src/intel/isl/isl_storage_image.c
+++ b/src/intel/isl/isl_storage_image.c
@@ -76,7 +76,7 @@ isl_is_storage_image_format(enum isl_format format)
 }
 
 enum isl_format
-isl_lower_storage_image_format(const struct brw_device_info *devinfo,
+isl_lower_storage_image_format(const struct gen_device_info *devinfo,
                                enum isl_format format)
 {
    switch (format) {
@@ -188,7 +188,7 @@ isl_lower_storage_image_format(const struct brw_device_info *devinfo,
 }
 
 bool
-isl_has_matching_typed_storage_image_format(const struct brw_device_info *devinfo,
+isl_has_matching_typed_storage_image_format(const struct gen_device_info *devinfo,
                                             enum isl_format fmt)
 {
    if (devinfo->gen >= 9) {
diff --git a/src/intel/isl/tests/isl_surf_get_image_offset_test.c b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
index 0c9173deab4..8c44b37dc06 100644
--- a/src/intel/isl/tests/isl_surf_get_image_offset_test.c
+++ b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common/brw_device_info.h"
+#include "common/gen_device_info.h"
 #include "isl/isl.h"
 #include "isl/isl_priv.h"
 
diff --git a/src/intel/tools/disasm.c b/src/intel/tools/disasm.c
index fcb61c44acb..29c06413ab9 100644
--- a/src/intel/tools/disasm.c
+++ b/src/intel/tools/disasm.c
@@ -32,14 +32,14 @@
 uint64_t INTEL_DEBUG;
 
 struct gen_disasm {
-    struct brw_device_info devinfo;
+    struct gen_device_info devinfo;
 };
 
 void
 gen_disasm_disassemble(struct gen_disasm *disasm, void *assembly, int start,
                        int end, FILE *out)
 {
-   struct brw_device_info *devinfo = &disasm->devinfo;
+   struct gen_device_info *devinfo = &disasm->devinfo;
    bool dump_hex = false;
 
    for (int offset = start; offset < end;) {
@@ -89,7 +89,7 @@ struct gen_disasm *
 gen_disasm_create(int pciid)
 {
    struct gen_disasm *gd;
-   const struct brw_device_info *dev_info = NULL;
+   const struct gen_device_info *dev_info = NULL;
 
    gd = malloc(sizeof *gd);
    if (gd == NULL)
diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c
index f268e721fa8..457a88ff0cd 100644
--- a/src/intel/vulkan/anv_allocator.c
+++ b/src/intel/vulkan/anv_allocator.c
@@ -922,7 +922,7 @@ anv_scratch_pool_alloc(struct anv_device *device, struct anv_scratch_pool *pool,
    if (size == 0) {
       /* We own the lock.  Allocate a buffer */
 
-      struct brw_device_info *devinfo = &device->info;
+      struct gen_device_info *devinfo = &device->info;
       uint32_t max_threads[] = {
          [MESA_SHADER_VERTEX]                  = devinfo->max_vs_threads,
          [MESA_SHADER_TESS_CTRL]               = devinfo->max_hs_threads,
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index cf6399364c5..08dfa18defe 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -438,7 +438,7 @@ void anv_GetPhysicalDeviceProperties(
     VkPhysicalDeviceProperties*                 pProperties)
 {
    ANV_FROM_HANDLE(anv_physical_device, pdevice, physicalDevice);
-   const struct brw_device_info *devinfo = pdevice->info;
+   const struct gen_device_info *devinfo = pdevice->info;
 
    const float time_stamp_base = devinfo->gen >= 9 ? 83.333 : 80.0;
 
diff --git a/src/intel/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py
index dcf25ee76c6..b0264950d62 100644
--- a/src/intel/vulkan/anv_entrypoints_gen.py
+++ b/src/intel/vulkan/anv_entrypoints_gen.py
@@ -125,7 +125,7 @@ if opt_header:
     print "   };\n"
     print "};\n"
 
-    print "void anv_set_dispatch_devinfo(const struct brw_device_info *info);\n"
+    print "void anv_set_dispatch_devinfo(const struct gen_device_info *info);\n"
 
     for type, name, args, num, h in entrypoints:
         print_guard_start(name)
@@ -214,10 +214,10 @@ for layer in [ "anv", "gen7", "gen75", "gen8", "gen9" ]:
     print "};\n"
 
 print """
-static const struct brw_device_info *dispatch_devinfo;
+static const struct gen_device_info *dispatch_devinfo;
 
 void
-anv_set_dispatch_devinfo(const struct brw_device_info *devinfo)
+anv_set_dispatch_devinfo(const struct gen_device_info *devinfo)
 {
    dispatch_devinfo = devinfo;
 }
diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index bbfb2925d77..a746cd3545b 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -245,7 +245,7 @@ static const struct anv_format anv_formats[] = {
  * Exactly one bit must be set in \a aspect.
  */
 struct anv_format
-anv_get_format(const struct brw_device_info *devinfo, VkFormat vk_format,
+anv_get_format(const struct gen_device_info *devinfo, VkFormat vk_format,
                VkImageAspectFlags aspect, VkImageTiling tiling)
 {
    struct anv_format format = anv_formats[vk_format];
@@ -303,7 +303,7 @@ anv_get_format(const struct brw_device_info *devinfo, VkFormat vk_format,
 // Format capabilities
 
 static VkFormatFeatureFlags
-get_image_format_properties(const struct brw_device_info *devinfo,
+get_image_format_properties(const struct gen_device_info *devinfo,
                             enum isl_format base, struct anv_format format)
 {
    if (format.isl_format == ISL_FORMAT_UNSUPPORTED)
@@ -344,7 +344,7 @@ get_image_format_properties(const struct brw_device_info *devinfo,
 }
 
 static VkFormatFeatureFlags
-get_buffer_format_properties(const struct brw_device_info *devinfo,
+get_buffer_format_properties(const struct gen_device_info *devinfo,
                              enum isl_format format)
 {
    if (format == ISL_FORMAT_UNSUPPORTED)
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 52ab7d0bf2d..151073eee5c 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -229,7 +229,7 @@ static const uint32_t vk_to_gen_primitive_type[] = {
 };
 
 static void
-populate_sampler_prog_key(const struct brw_device_info *devinfo,
+populate_sampler_prog_key(const struct gen_device_info *devinfo,
                           struct brw_sampler_prog_key_data *key)
 {
    /* XXX: Handle texture swizzle on HSW- */
@@ -240,7 +240,7 @@ populate_sampler_prog_key(const struct brw_device_info *devinfo,
 }
 
 static void
-populate_vs_prog_key(const struct brw_device_info *devinfo,
+populate_vs_prog_key(const struct gen_device_info *devinfo,
                      struct brw_vs_prog_key *key)
 {
    memset(key, 0, sizeof(*key));
@@ -253,7 +253,7 @@ populate_vs_prog_key(const struct brw_device_info *devinfo,
 }
 
 static void
-populate_gs_prog_key(const struct brw_device_info *devinfo,
+populate_gs_prog_key(const struct gen_device_info *devinfo,
                      struct brw_gs_prog_key *key)
 {
    memset(key, 0, sizeof(*key));
@@ -262,7 +262,7 @@ populate_gs_prog_key(const struct brw_device_info *devinfo,
 }
 
 static void
-populate_wm_prog_key(const struct brw_device_info *devinfo,
+populate_wm_prog_key(const struct gen_device_info *devinfo,
                      const VkGraphicsPipelineCreateInfo *info,
                      const struct anv_graphics_pipeline_create_info *extra,
                      struct brw_wm_prog_key *key)
@@ -304,7 +304,7 @@ populate_wm_prog_key(const struct brw_device_info *devinfo,
 }
 
 static void
-populate_cs_prog_key(const struct brw_device_info *devinfo,
+populate_cs_prog_key(const struct gen_device_info *devinfo,
                      struct brw_cs_prog_key *key)
 {
    memset(key, 0, sizeof(*key));
@@ -806,7 +806,7 @@ anv_pipeline_compile_cs(struct anv_pipeline *pipeline,
 void
 anv_setup_pipeline_l3_config(struct anv_pipeline *pipeline)
 {
-   const struct brw_device_info *devinfo = &pipeline->device->info;
+   const struct gen_device_info *devinfo = &pipeline->device->info;
    switch (devinfo->gen) {
    case 7:
       if (devinfo->is_haswell)
@@ -828,7 +828,7 @@ anv_setup_pipeline_l3_config(struct anv_pipeline *pipeline)
 void
 anv_compute_urb_partition(struct anv_pipeline *pipeline)
 {
-   const struct brw_device_info *devinfo = &pipeline->device->info;
+   const struct gen_device_info *devinfo = &pipeline->device->info;
 
    bool vs_present = pipeline->active_stages & VK_SHADER_STAGE_VERTEX_BIT;
    unsigned vs_size = vs_present ?
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 74c1e5ba65f..7cab99e952b 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -40,7 +40,7 @@
 #define VG(x)
 #endif
 
-#include "common/brw_device_info.h"
+#include "common/gen_device_info.h"
 #include "brw_compiler.h"
 #include "util/macros.h"
 #include "util/list.h"
@@ -563,7 +563,7 @@ struct anv_physical_device {
     uint32_t                                    chipset_id;
     char                                        path[20];
     const char *                                name;
-    const struct brw_device_info *              info;
+    const struct gen_device_info *              info;
     uint64_t                                    aperture_size;
     struct brw_compiler *                       compiler;
     struct isl_device                           isl_dev;
@@ -687,7 +687,7 @@ struct anv_device {
 
     struct anv_instance *                       instance;
     uint32_t                                    chipset_id;
-    struct brw_device_info                      info;
+    struct gen_device_info                      info;
     struct isl_device                           isl_dev;
     int                                         context_id;
     int                                         fd;
@@ -1634,11 +1634,11 @@ struct anv_format {
 };
 
 struct anv_format
-anv_get_format(const struct brw_device_info *devinfo, VkFormat format,
+anv_get_format(const struct gen_device_info *devinfo, VkFormat format,
                VkImageAspectFlags aspect, VkImageTiling tiling);
 
 static inline enum isl_format
-anv_get_isl_format(const struct brw_device_info *devinfo, VkFormat vk_format,
+anv_get_isl_format(const struct gen_device_info *devinfo, VkFormat vk_format,
                    VkImageAspectFlags aspect, VkImageTiling tiling)
 {
    return anv_get_format(devinfo, vk_format, aspect, tiling).isl_format;
diff --git a/src/intel/vulkan/genX_l3.c b/src/intel/vulkan/genX_l3.c
index a74071cf124..36bf57c35b9 100644
--- a/src/intel/vulkan/genX_l3.c
+++ b/src/intel/vulkan/genX_l3.c
@@ -151,7 +151,7 @@ static const struct anv_l3_config chv_l3_configs[] = {
  * specified device.
  */
 static inline const struct anv_l3_config *
-get_l3_configs(const struct brw_device_info *devinfo)
+get_l3_configs(const struct gen_device_info *devinfo)
 {
    assert(devinfo->gen == GEN_GEN);
 #if GEN_IS_HASWELL
@@ -171,7 +171,7 @@ get_l3_configs(const struct brw_device_info *devinfo)
  * Return the size of an L3 way in KB.
  */
 static unsigned
-get_l3_way_size(const struct brw_device_info *devinfo)
+get_l3_way_size(const struct gen_device_info *devinfo)
 {
    if (devinfo->is_baytrail)
       return 2;
@@ -260,7 +260,7 @@ diff_l3_weights(struct anv_l3_weights w0, struct anv_l3_weights w1)
  * weight vector.
  */
 static const struct anv_l3_config *
-get_l3_config(const struct brw_device_info *devinfo, struct anv_l3_weights w0)
+get_l3_config(const struct gen_device_info *devinfo, struct anv_l3_weights w0)
 {
    const struct anv_l3_config *const cfgs = get_l3_configs(devinfo);
    const struct anv_l3_config *cfg_best = NULL;
@@ -284,7 +284,7 @@ get_l3_config(const struct brw_device_info *devinfo, struct anv_l3_weights w0)
  * is intended to approximately resemble the hardware defaults.
  */
 static struct anv_l3_weights
-get_default_l3_weights(const struct brw_device_info *devinfo,
+get_default_l3_weights(const struct gen_device_info *devinfo,
                        bool needs_dc, bool needs_slm)
 {
    struct anv_l3_weights w = {{ 0 }};
@@ -418,7 +418,7 @@ setup_l3_config(struct anv_cmd_buffer *cmd_buffer/*, struct brw_context *brw*/,
     * client (URB for all validated configurations) set to the
     * lower-bandwidth 2-bank address hashing mode.
     */
-   const struct brw_device_info *devinfo = &cmd_buffer->device->info;
+   const struct gen_device_info *devinfo = &cmd_buffer->device->info;
    const bool urb_low_bw = has_slm && !devinfo->is_baytrail;
    assert(!urb_low_bw || cfg->n[L3P_URB] == cfg->n[L3P_SLM]);
 
@@ -481,10 +481,10 @@ setup_l3_config(struct anv_cmd_buffer *cmd_buffer/*, struct brw_context *brw*/,
 
 /**
  * Return the unit brw_context::urb::size is expressed in, in KB.  \sa
- * brw_device_info::urb::size.
+ * gen_device_info::urb::size.
  */
 static unsigned
-get_urb_size_scale(const struct brw_device_info *devinfo)
+get_urb_size_scale(const struct gen_device_info *devinfo)
 {
    return (devinfo->gen >= 8 ? devinfo->num_slices : 1);
 }
@@ -493,7 +493,7 @@ void
 genX(setup_pipeline_l3_config)(struct anv_pipeline *pipeline)
 {
    const struct anv_l3_weights w = get_pipeline_state_l3_weights(pipeline);
-   const struct brw_device_info *devinfo = &pipeline->device->info;
+   const struct gen_device_info *devinfo = &pipeline->device->info;
    const struct anv_l3_config *const cfg = get_l3_config(devinfo, w);
    pipeline->urb.l3_config = cfg;