From 3b4636c76976d478269385b2e3f73c143dc7394c Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Mon, 28 Oct 2024 14:20:34 +0100 Subject: [PATCH] v3d: Move v3d_X(..) to src/broadcom/common MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It will be re-used by libbroadcom_perfcntrs Signed-off-by: Christian Gmeiner Reviewed-by: Maíra Canal Part-of: --- src/broadcom/common/v3d_util.h | 16 ++++++++++++++++ src/gallium/drivers/v3d/v3d_context.h | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/broadcom/common/v3d_util.h b/src/broadcom/common/v3d_util.h index 2dbc4b2c470..73dae0d95d7 100644 --- a/src/broadcom/common/v3d_util.h +++ b/src/broadcom/common/v3d_util.h @@ -35,6 +35,22 @@ # include "xf86drm.h" #endif +/* Helper to call hw ver specific functions */ +#define v3d_X(devinfo, thing) ({ \ + __typeof(&v3d42_##thing) v3d_X_thing; \ + switch (devinfo->ver) { \ + case 42: \ + v3d_X_thing = &v3d42_##thing; \ + break; \ + case 71: \ + v3d_X_thing = &v3d71_##thing; \ + break; \ + default: \ + unreachable("Unsupported hardware generation"); \ + } \ + v3d_X_thing; \ +}) + uint32_t v3d_csd_choose_workgroups_per_supergroup(struct v3d_device_info *devinfo, bool has_subgroups, diff --git a/src/gallium/drivers/v3d/v3d_context.h b/src/gallium/drivers/v3d/v3d_context.h index 6baf0fca5bc..cb8263f38cd 100644 --- a/src/gallium/drivers/v3d/v3d_context.h +++ b/src/gallium/drivers/v3d/v3d_context.h @@ -879,22 +879,6 @@ void v3d_disk_cache_store(struct v3d_context *v3d, uint32_t qpu_size); #endif /* ENABLE_SHADER_CACHE */ -/* Helper to call hw ver specific functions */ -#define v3d_X(devinfo, thing) ({ \ - __typeof(&v3d42_##thing) v3d_X_thing; \ - switch (devinfo->ver) { \ - case 42: \ - v3d_X_thing = &v3d42_##thing; \ - break; \ - case 71: \ - v3d_X_thing = &v3d71_##thing; \ - break; \ - default: \ - unreachable("Unsupported hardware generation"); \ - } \ - v3d_X_thing; \ -}) - #ifdef v3dX # include "v3dx_context.h" #else