diff --git a/src/freedreno/common/freedreno_dev_info.c b/src/freedreno/common/freedreno_dev_info.c
index 13e5b63881e..fdc17860a35 100644
--- a/src/freedreno/common/freedreno_dev_info.c
+++ b/src/freedreno/common/freedreno_dev_info.c
@@ -32,7 +32,7 @@ max_bitfield_val(unsigned high, unsigned low, unsigned shift)
 }
 
 void
-freedreno_dev_info_init(struct freedreno_dev_info *info, uint32_t gpu_id)
+fd_dev_info_init(struct fd_dev_info *info, uint32_t gpu_id)
 {
    if (gpu_id >= 600) {
       info->gmem_align_w = 16;
diff --git a/src/freedreno/common/freedreno_dev_info.h b/src/freedreno/common/freedreno_dev_info.h
index 2d06c269df7..f787e9a6ddb 100644
--- a/src/freedreno/common/freedreno_dev_info.h
+++ b/src/freedreno/common/freedreno_dev_info.h
@@ -36,7 +36,7 @@ extern "C" {
  * Freedreno hardware description and quirks
  */
 
-struct freedreno_dev_info {
+struct fd_dev_info {
    /* alignment for size of tiles */
    uint32_t tile_align_w, tile_align_h;
    /* gmem load/store granularity */
@@ -83,7 +83,7 @@ struct freedreno_dev_info {
  */
 #define A6XX_CCU_GMEM_COLOR_SIZE (16 * 1024)
 
-void freedreno_dev_info_init(struct freedreno_dev_info *info, uint32_t gpu_id);
+void fd_dev_info_init(struct fd_dev_info *info, uint32_t gpu_id);
 
 #ifdef __cplusplus
 } /* end of extern "C" */
diff --git a/src/freedreno/ds/fd_pps_driver.cc b/src/freedreno/ds/fd_pps_driver.cc
index 2f28c0cbb14..7c7adec623a 100644
--- a/src/freedreno/ds/fd_pps_driver.cc
+++ b/src/freedreno/ds/fd_pps_driver.cc
@@ -177,7 +177,7 @@ FreedrenoDriver::init_perfcnt()
    for (auto countable : countables)
       countable.resolve();
 
-   freedreno_dev_info_init(&info, gpu_id);
+   fd_dev_info_init(&info, gpu_id);
 
    io = fd_dt_find_io();
    if (!io) {
diff --git a/src/freedreno/ds/fd_pps_driver.h b/src/freedreno/ds/fd_pps_driver.h
index 2281af897ff..e8f5c246b6f 100644
--- a/src/freedreno/ds/fd_pps_driver.h
+++ b/src/freedreno/ds/fd_pps_driver.h
@@ -42,7 +42,7 @@ private:
    bool has_suspend_count;
    uint32_t suspend_count;
 
-   struct freedreno_dev_info info;
+   struct fd_dev_info info;
 
    /**
     * The memory mapped i/o space for counter readback:
diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c
index c8e24496c86..cb35f71f954 100644
--- a/src/freedreno/vulkan/tu_device.c
+++ b/src/freedreno/vulkan/tu_device.c
@@ -201,7 +201,7 @@ tu_physical_device_init(struct tu_physical_device *device,
    case 630:
    case 640:
    case 650:
-      freedreno_dev_info_init(&device->info, device->gpu_id);
+      fd_dev_info_init(&device->info, device->gpu_id);
       device->ccu_offset_bypass = device->info.num_ccu * A6XX_CCU_DEPTH_SIZE;
       device->ccu_offset_gmem = (device->gmem_size -
          device->info.num_ccu * A6XX_CCU_GMEM_COLOR_SIZE);
diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h
index fd164a6f7d2..a395099cb87 100644
--- a/src/freedreno/vulkan/tu_private.h
+++ b/src/freedreno/vulkan/tu_private.h
@@ -210,7 +210,7 @@ struct tu_physical_device
    uint32_t ccu_offset_gmem;
    uint32_t ccu_offset_bypass;
 
-   struct freedreno_dev_info info;
+   struct fd_dev_info info;
 
    int msm_major_version;
    int msm_minor_version;
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index a0af7241de7..7fa9ceb874e 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -1065,7 +1065,7 @@ fd_screen_create(struct fd_device *dev, struct renderonly *ro)
       goto fail;
    }
 
-   freedreno_dev_info_init(&screen->info, screen->gpu_id);
+   fd_dev_info_init(&screen->info, screen->gpu_id);
 
    if (is_a6xx(screen)) {
       screen->ccu_offset_bypass = screen->info.num_ccu * A6XX_CCU_DEPTH_SIZE;
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.h b/src/gallium/drivers/freedreno/freedreno_screen.h
index b0e70e3b1a5..fc42983abe0 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.h
+++ b/src/gallium/drivers/freedreno/freedreno_screen.h
@@ -91,7 +91,7 @@ struct fd_screen {
    bool has_robustness;
    bool has_syncobj;
 
-   struct freedreno_dev_info info;
+   struct fd_dev_info info;
    uint32_t ccu_offset_gmem;
    uint32_t ccu_offset_bypass;
 
diff --git a/src/gallium/drivers/freedreno/gmemtool.c b/src/gallium/drivers/freedreno/gmemtool.c
index ecdd470794b..c39af1702d4 100644
--- a/src/gallium/drivers/freedreno/gmemtool.c
+++ b/src/gallium/drivers/freedreno/gmemtool.c
@@ -167,7 +167,7 @@ main(int argc, char **argv)
       .gmemsize_bytes = gpu_info->gmemsize_bytes,
    };
 
-   freedreno_dev_info_init(&screen.info, gpu_info->gpu_id);
+   fd_dev_info_init(&screen.info, gpu_info->gpu_id);
 
    /* And finally run thru all the GMEM keys: */
    for (int i = 0; i < ARRAY_SIZE(keys); i++) {