From 7239b3edbe754c6e85a6c3774d484e42a6253058 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 20 Jan 2018 15:57:08 -0800 Subject: [PATCH] broadcom/vc5: Rename the UIFCFG register in the UAPI. This matches the naming of the other hub regs we get, and I don't know for sure if UIFCFG will be the same register between the hub and the cores on all versions. --- src/gallium/drivers/vc5/v3dx_simulator.c | 2 +- src/gallium/drivers/vc5/vc5_drm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/vc5/v3dx_simulator.c b/src/gallium/drivers/vc5/v3dx_simulator.c index 90fafaee1e2..aed4aab204e 100644 --- a/src/gallium/drivers/vc5/v3dx_simulator.c +++ b/src/gallium/drivers/vc5/v3dx_simulator.c @@ -103,7 +103,7 @@ v3dX(simulator_get_param_ioctl)(struct v3d_hw *v3d, struct drm_vc5_get_param *args) { static const uint32_t reg_map[] = { - [DRM_VC5_PARAM_V3D_UIFCFG] = V3D_HUB_CTL_UIFCFG, + [DRM_VC5_PARAM_V3D_HUB_UIFCFG] = V3D_HUB_CTL_UIFCFG, [DRM_VC5_PARAM_V3D_HUB_IDENT1] = V3D_HUB_CTL_IDENT1, [DRM_VC5_PARAM_V3D_HUB_IDENT2] = V3D_HUB_CTL_IDENT2, [DRM_VC5_PARAM_V3D_HUB_IDENT3] = V3D_HUB_CTL_IDENT3, diff --git a/src/gallium/drivers/vc5/vc5_drm.h b/src/gallium/drivers/vc5/vc5_drm.h index 2c21ee77a13..cd7e43ad47f 100644 --- a/src/gallium/drivers/vc5/vc5_drm.h +++ b/src/gallium/drivers/vc5/vc5_drm.h @@ -172,7 +172,7 @@ struct drm_vc5_mmap_bo { }; enum drm_vc5_param { - DRM_VC5_PARAM_V3D_UIFCFG, + DRM_VC5_PARAM_V3D_HUB_UIFCFG, DRM_VC5_PARAM_V3D_HUB_IDENT1, DRM_VC5_PARAM_V3D_HUB_IDENT2, DRM_VC5_PARAM_V3D_HUB_IDENT3, -- 2.30.2