Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: Fix complex macros error

Fixes the below:

ERROR: Macros with complex values should be enclosed in parentheses

WARNING: macros should not use a trailing semicolon
+#define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter));

Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Srinivasan Shanmugam and committed by
Alex Deucher
2b6b29f3 dc427a47

+7 -5
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu.h
··· 1321 1321 ((adev)->asic_funcs->update_umd_stable_pstate ? (adev)->asic_funcs->update_umd_stable_pstate((adev), (enter)) : 0) 1322 1322 #define amdgpu_asic_query_video_codecs(adev, e, c) (adev)->asic_funcs->query_video_codecs((adev), (e), (c)) 1323 1323 1324 - #define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter)); 1324 + #define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter)) 1325 1325 1326 1326 #define BIT_MASK_UPPER(i) ((i) >= BITS_PER_LONG ? 0 : ~0UL << (i)) 1327 1327 #define for_each_inst(i, inst_mask) \
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
··· 149 149 RAS_TABLE_HEADER_SIZE - \ 150 150 RAS_TABLE_V2_1_INFO_SIZE) / RAS_TABLE_RECORD_SIZE) 151 151 152 - #define to_amdgpu_device(x) (container_of(x, struct amdgpu_ras, eeprom_control))->adev 152 + #define to_amdgpu_device(x) ((container_of(x, struct amdgpu_ras, eeprom_control))->adev) 153 153 154 154 static bool __is_ras_eeprom_supported(struct amdgpu_device *adev) 155 155 {
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
··· 33 33 #define AMDGPU_VCN_MAX_ENC_RINGS 3 34 34 35 35 #define AMDGPU_MAX_VCN_INSTANCES 4 36 - #define AMDGPU_MAX_VCN_ENC_RINGS AMDGPU_VCN_MAX_ENC_RINGS * AMDGPU_MAX_VCN_INSTANCES 36 + #define AMDGPU_MAX_VCN_ENC_RINGS (AMDGPU_VCN_MAX_ENC_RINGS * AMDGPU_MAX_VCN_INSTANCES) 37 37 38 38 #define AMDGPU_VCN_HARVEST_VCN0 (1 << 0) 39 39 #define AMDGPU_VCN_HARVEST_VCN1 (1 << 1)
+4 -2
drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h
··· 62 62 int xgpu_ai_mailbox_get_irq(struct amdgpu_device *adev); 63 63 void xgpu_ai_mailbox_put_irq(struct amdgpu_device *adev); 64 64 65 - #define AI_MAIBOX_CONTROL_TRN_OFFSET_BYTE SOC15_REG_OFFSET(NBIO, 0, mmBIF_BX_PF0_MAILBOX_CONTROL) * 4 66 - #define AI_MAIBOX_CONTROL_RCV_OFFSET_BYTE SOC15_REG_OFFSET(NBIO, 0, mmBIF_BX_PF0_MAILBOX_CONTROL) * 4 + 1 65 + #define AI_MAIBOX_CONTROL_TRN_OFFSET_BYTE \ 66 + (SOC15_REG_OFFSET(NBIO, 0, mmBIF_BX_PF0_MAILBOX_CONTROL) * 4) 67 + #define AI_MAIBOX_CONTROL_RCV_OFFSET_BYTE \ 68 + (SOC15_REG_OFFSET(NBIO, 0, mmBIF_BX_PF0_MAILBOX_CONTROL) * 4 + 1) 67 69 68 70 #endif