Skip to content

Commit 7593164

Browse files
srishanmalexdeucher
authored andcommitted
drm/amdgpu: Fix no new typedefs for enum _AMDGPU_DOORBELL_*
Fixes the following: WARNING: do not add new typedefs Cc: Christian König <[email protected]> Cc: Alex Deucher <[email protected]> Signed-off-by: Srinivasan Shanmugam <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Reviewed-by: Guchun Chen <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent b8920e1 commit 7593164

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ struct amdgpu_doorbell_index {
9090
uint32_t xcc_doorbell_range;
9191
};
9292

93-
typedef enum _AMDGPU_DOORBELL_ASSIGNMENT
94-
{
93+
enum AMDGPU_DOORBELL_ASSIGNMENT {
9594
AMDGPU_DOORBELL_KIQ = 0x000,
9695
AMDGPU_DOORBELL_HIQ = 0x001,
9796
AMDGPU_DOORBELL_DIQ = 0x002,
@@ -109,10 +108,10 @@ typedef enum _AMDGPU_DOORBELL_ASSIGNMENT
109108
AMDGPU_DOORBELL_IH = 0x1E8,
110109
AMDGPU_DOORBELL_MAX_ASSIGNMENT = 0x3FF,
111110
AMDGPU_DOORBELL_INVALID = 0xFFFF
112-
} AMDGPU_DOORBELL_ASSIGNMENT;
111+
};
112+
113+
enum AMDGPU_VEGA20_DOORBELL_ASSIGNMENT {
113114

114-
typedef enum _AMDGPU_VEGA20_DOORBELL_ASSIGNMENT
115-
{
116115
/* Compute + GFX: 0~255 */
117116
AMDGPU_VEGA20_DOORBELL_KIQ = 0x000,
118117
AMDGPU_VEGA20_DOORBELL_HIQ = 0x001,
@@ -176,10 +175,10 @@ typedef enum _AMDGPU_VEGA20_DOORBELL_ASSIGNMENT
176175

177176
AMDGPU_VEGA20_DOORBELL_MAX_ASSIGNMENT = 0x1F7,
178177
AMDGPU_VEGA20_DOORBELL_INVALID = 0xFFFF
179-
} AMDGPU_VEGA20_DOORBELL_ASSIGNMENT;
178+
};
179+
180+
enum AMDGPU_NAVI10_DOORBELL_ASSIGNMENT {
180181

181-
typedef enum _AMDGPU_NAVI10_DOORBELL_ASSIGNMENT
182-
{
183182
/* Compute + GFX: 0~255 */
184183
AMDGPU_NAVI10_DOORBELL_KIQ = 0x000,
185184
AMDGPU_NAVI10_DOORBELL_HIQ = 0x001,
@@ -227,13 +226,12 @@ typedef enum _AMDGPU_NAVI10_DOORBELL_ASSIGNMENT
227226

228227
AMDGPU_NAVI10_DOORBELL_MAX_ASSIGNMENT = 0x18F,
229228
AMDGPU_NAVI10_DOORBELL_INVALID = 0xFFFF
230-
} AMDGPU_NAVI10_DOORBELL_ASSIGNMENT;
229+
};
231230

232231
/*
233232
* 64bit doorbell, offset are in QWORD, occupy 2KB doorbell space
234233
*/
235-
typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT
236-
{
234+
enum AMDGPU_DOORBELL64_ASSIGNMENT {
237235
/*
238236
* All compute related doorbells: kiq, hiq, diq, traditional compute queue, user queue, should locate in
239237
* a continues range so that programming CP_MEC_DOORBELL_RANGE_LOWER/UPPER can cover this range.
@@ -309,9 +307,10 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT
309307

310308
AMDGPU_DOORBELL64_MAX_ASSIGNMENT = 0xFF,
311309
AMDGPU_DOORBELL64_INVALID = 0xFFFF
312-
} AMDGPU_DOORBELL64_ASSIGNMENT;
310+
};
311+
312+
enum AMDGPU_DOORBELL_ASSIGNMENT_LAYOUT1 {
313313

314-
typedef enum _AMDGPU_DOORBELL_ASSIGNMENT_LAYOUT1 {
315314
/* XCC0: 0x00 ~20, XCC1: 20 ~ 2F ... */
316315

317316
/* KIQ/HIQ/DIQ */
@@ -339,7 +338,7 @@ typedef enum _AMDGPU_DOORBELL_ASSIGNMENT_LAYOUT1 {
339338

340339
AMDGPU_DOORBELL_LAYOUT1_MAX_ASSIGNMENT = 0x1D4,
341340
AMDGPU_DOORBELL_LAYOUT1_INVALID = 0xFFFF
342-
} AMDGPU_DOORBELL_ASSIGNMENT_LAYOUT1;
341+
};
343342

344343
u32 amdgpu_mm_rdoorbell(struct amdgpu_device *adev, u32 index);
345344
void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v);

0 commit comments

Comments
 (0)