diff options
| author | Eric Anholt <eric@anholt.net> | 2018-01-20 15:57:08 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2018-02-01 11:02:29 -0800 |
| commit | 7239b3edbe754c6e85a6c3774d484e42a6253058 (patch) | |
| tree | 7f9472ad0d3a0dbaa178e09e1d84149b53df36b5 | |
| parent | 353b42ccc745453dffe742d766831248f77d6e39 (diff) | |
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.
| -rw-r--r-- | src/gallium/drivers/vc5/v3dx_simulator.c | 2 | ||||
| -rw-r--r-- | 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 90fafaee1e..aed4aab204 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 2c21ee77a1..cd7e43ad47 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, |