diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2017-07-27 15:10:50 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-08-15 14:45:59 -0400 |
| commit | eacf3e149ea64c550925b4635f854062bb535005 (patch) | |
| tree | 2b43002481be21775af5e9eb133471fcab967125 /drivers/gpu | |
| parent | 51ac7eec620b8ec705955ad2c845a5b5fed6b40f (diff) | |
drm/amdgpu: make wb 256bit function names consistent
Use a lower case b to be consistent with the other wb functions.
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index db6f153cf1ee..87afe8785bb2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
| @@ -1132,7 +1132,7 @@ struct amdgpu_wb { | |||
| 1132 | int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb); | 1132 | int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb); |
| 1133 | void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb); | 1133 | void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb); |
| 1134 | int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb); | 1134 | int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb); |
| 1135 | int amdgpu_wb_get_256Bit(struct amdgpu_device *adev, u32 *wb); | 1135 | int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb); |
| 1136 | void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb); | 1136 | void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb); |
| 1137 | void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb); | 1137 | void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb); |
| 1138 | 1138 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index ce10ca1cdec3..d33e1061e04b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
| @@ -567,7 +567,7 @@ int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb) | |||
| 567 | } | 567 | } |
| 568 | } | 568 | } |
| 569 | 569 | ||
| 570 | int amdgpu_wb_get_256Bit(struct amdgpu_device *adev, u32 *wb) | 570 | int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb) |
| 571 | { | 571 | { |
| 572 | int i = 0; | 572 | int i = 0; |
| 573 | unsigned long offset = bitmap_find_next_zero_area_off(adev->wb.used, | 573 | unsigned long offset = bitmap_find_next_zero_area_off(adev->wb.used, |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 15b7149d1204..3874be83de10 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |||
| @@ -213,7 +213,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, | |||
| 213 | } | 213 | } |
| 214 | 214 | ||
| 215 | if (amdgpu_sriov_vf(adev) && ring->funcs->type == AMDGPU_RING_TYPE_GFX) { | 215 | if (amdgpu_sriov_vf(adev) && ring->funcs->type == AMDGPU_RING_TYPE_GFX) { |
| 216 | r = amdgpu_wb_get_256Bit(adev, &ring->fence_offs); | 216 | r = amdgpu_wb_get_256bit(adev, &ring->fence_offs); |
| 217 | if (r) { | 217 | if (r) { |
| 218 | dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r); | 218 | dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r); |
| 219 | return r; | 219 | return r; |
