This patch fixes the following checkpatch.pl errors and warnings:
ERROR: open brace '{' following struct go on the same line
ERROR: Macros with complex values should be enclosed in parentheses
ERROR: "foo* bar" should be "foo *bar"
ERROR: space prohibited before that close parenthesis ')'
WARNING: macros should not use a trailing semicolon
WARNING: please, no spaces at the start of a line
This patch also aligned member names in structs
Signed-off-by: Joseph Schulte <joeschulte.js@xxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 68 ++++++++++++++---------------
1 file changed, 33 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 5993dd0fdd8e..ff767f8c4f96 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -110,14 +110,12 @@
#define MAX_GPU_INSTANCE 16
-struct amdgpu_gpu_instance
-{
+struct amdgpu_gpu_instance {
struct amdgpu_device *adev;
int mgpu_fan_enabled;
};
-struct amdgpu_mgpu_info
-{
+struct amdgpu_mgpu_info {
struct amdgpu_gpu_instance gpu_ins[MAX_GPU_INSTANCE];
struct mutex mutex;
uint32_t num_gpu;
@@ -488,8 +486,8 @@ struct amdgpu_cs_chunk {
};
struct amdgpu_cs_post_dep {
- struct drm_syncobj *syncobj;
- struct dma_fence_chain *chain;
+ struct drm_syncobj *syncobj;
+ struct dma_fence_chain *chain;
u64 point;
};
@@ -964,7 +962,7 @@ struct amdgpu_device {
struct amdgpu_umc umc;
/* display related functionality */
- struct amdgpu_display_manager dm;
+ struct amdgpu_display_manager dm;
/* mes */
bool enable_mes;
@@ -975,7 +973,7 @@ struct amdgpu_device {
struct amdgpu_ip_block ip_blocks[AMDGPU_MAX_IP_NUM];
int num_ip_blocks;
- struct mutex mn_lock;
+ struct mutex mn_lock;
DECLARE_HASHTABLE(mn_hash, 7);
/* tracking pinned memory */
@@ -1005,8 +1003,8 @@ struct amdgpu_device {
atomic_t in_gpu_reset;
enum pp_mp1_state mp1_state;
- struct rw_semaphore reset_sem;
- struct amdgpu_doorbell_index doorbell_index;
+ struct rw_semaphore reset_sem;
+ struct amdgpu_doorbell_index doorbell_index;
struct mutex notifier_lock;
@@ -1100,7 +1098,7 @@ int emu_soc_asic_init(struct amdgpu_device *adev);
/*
* Registers read & write functions.
*/
-#define AMDGPU_REGS_NO_KIQ (1<<1)
+#define AMDGPU_REGS_NO_KIQ (1<<1)
#define RREG32_NO_KIQ(reg) amdgpu_device_rreg(adev, (reg), AMDGPU_REGS_NO_KIQ)
#define WREG32_NO_KIQ(reg, v) amdgpu_device_wreg(adev, (reg), (v), AMDGPU_REGS_NO_KIQ)
@@ -1189,38 +1187,38 @@ int emu_soc_asic_init(struct amdgpu_device *adev);
/*
* ASICs macro.
*/
-#define amdgpu_asic_set_vga_state(adev, state) (adev)->asic_funcs->set_vga_state((adev), (state))
-#define amdgpu_asic_reset(adev) (adev)->asic_funcs->reset((adev))
-#define amdgpu_asic_reset_method(adev) (adev)->asic_funcs->reset_method((adev))
-#define amdgpu_asic_get_xclk(adev) (adev)->asic_funcs->get_xclk((adev))
-#define amdgpu_asic_set_uvd_clocks(adev, v, d) (adev)->asic_funcs->set_uvd_clocks((adev), (v), (d))
-#define amdgpu_asic_set_vce_clocks(adev, ev, ec) (adev)->asic_funcs->set_vce_clocks((adev), (ev), (ec))
-#define amdgpu_get_pcie_lanes(adev) (adev)->asic_funcs->get_pcie_lanes((adev))
-#define amdgpu_set_pcie_lanes(adev, l) (adev)->asic_funcs->set_pcie_lanes((adev), (l))
-#define amdgpu_asic_get_gpu_clock_counter(adev) (adev)->asic_funcs->get_gpu_clock_counter((adev))
-#define amdgpu_asic_read_disabled_bios(adev) (adev)->asic_funcs->read_disabled_bios((adev))
-#define amdgpu_asic_read_bios_from_rom(adev, b, l) (adev)->asic_funcs->read_bios_from_rom((adev), (b), (l))
-#define amdgpu_asic_read_register(adev, se, sh, offset, v)((adev)->asic_funcs->read_register((adev), (se), (sh), (offset), (v)))
-#define amdgpu_asic_get_config_memsize(adev) (adev)->asic_funcs->get_config_memsize((adev))
-#define amdgpu_asic_flush_hdp(adev, r) (adev)->asic_funcs->flush_hdp((adev), (r))
-#define amdgpu_asic_invalidate_hdp(adev, r) (adev)->asic_funcs->invalidate_hdp((adev), (r))
-#define amdgpu_asic_need_full_reset(adev) (adev)->asic_funcs->need_full_reset((adev))
-#define amdgpu_asic_init_doorbell_index(adev) (adev)->asic_funcs->init_doorbell_index((adev))
+#define amdgpu_asic_set_vga_state(adev, state) ((adev)->asic_funcs->set_vga_state((adev), (state)))
+#define amdgpu_asic_reset(adev) ((adev)->asic_funcs->reset((adev)))
+#define amdgpu_asic_reset_method(adev) ((adev)->asic_funcs->reset_method((adev)))
+#define amdgpu_asic_get_xclk(adev) ((adev)->asic_funcs->get_xclk((adev)))
+#define amdgpu_asic_set_uvd_clocks(adev, v, d) ((adev)->asic_funcs->set_uvd_clocks((adev), (v), (d)))
+#define amdgpu_asic_set_vce_clocks(adev, ev, ec) ((adev)->asic_funcs->set_vce_clocks((adev), (ev), (ec)))
+#define amdgpu_get_pcie_lanes(adev) ((adev)->asic_funcs->get_pcie_lanes((adev)))
+#define amdgpu_set_pcie_lanes(adev, l) ((adev)->asic_funcs->set_pcie_lanes((adev), (l)))
+#define amdgpu_asic_get_gpu_clock_counter(adev) ((adev)->asic_funcs->get_gpu_clock_counter((adev)))
+#define amdgpu_asic_read_disabled_bios(adev) ((adev)->asic_funcs->read_disabled_bios((adev)))
+#define amdgpu_asic_read_bios_from_rom(adev, b, l) ((adev)->asic_funcs->read_bios_from_rom((adev), (b), (l)))
+#define amdgpu_asic_read_register(adev, se, sh, offset, v) (((adev)->asic_funcs->read_register((adev), (se), (sh), (offset), (v))))
+#define amdgpu_asic_get_config_memsize(adev) ((adev)->asic_funcs->get_config_memsize((adev)))
+#define amdgpu_asic_flush_hdp(adev, r) ((adev)->asic_funcs->flush_hdp((adev), (r)))
+#define amdgpu_asic_invalidate_hdp(adev, r) ((adev)->asic_funcs->invalidate_hdp((adev), (r)))
+#define amdgpu_asic_need_full_reset(adev) ((adev)->asic_funcs->need_full_reset((adev)))
+#define amdgpu_asic_init_doorbell_index(adev) ((adev)->asic_funcs->init_doorbell_index((adev)))
#define amdgpu_asic_get_pcie_usage(adev, cnt0, cnt1) ((adev)->asic_funcs->get_pcie_usage((adev), (cnt0), (cnt1)))
-#define amdgpu_asic_need_reset_on_init(adev) (adev)->asic_funcs->need_reset_on_init((adev))
+#define amdgpu_asic_need_reset_on_init(adev) ((adev)->asic_funcs->need_reset_on_init((adev)))
#define amdgpu_asic_get_pcie_replay_count(adev) ((adev)->asic_funcs->get_pcie_replay_count((adev)))
-#define amdgpu_asic_supports_baco(adev) (adev)->asic_funcs->supports_baco((adev))
-#define amdgpu_asic_pre_asic_init(adev) (adev)->asic_funcs->pre_asic_init((adev))
+#define amdgpu_asic_supports_baco(adev) ((adev)->asic_funcs->supports_baco((adev)))
+#define amdgpu_asic_pre_asic_init(adev) ((adev)->asic_funcs->pre_asic_init((adev)))
#define amdgpu_asic_update_umd_stable_pstate(adev, enter) \
((adev)->asic_funcs->update_umd_stable_pstate ? (adev)->asic_funcs->update_umd_stable_pstate((adev), (enter)) : 0)
-#define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter));
+#define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter))
/* Common functions */
bool amdgpu_device_has_job_running(struct amdgpu_device *adev);
bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev);
int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
- struct amdgpu_job* job);
+ struct amdgpu_job *job);
void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);
bool amdgpu_device_need_post(struct amdgpu_device *adev);
@@ -1327,7 +1325,7 @@ int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
struct amdgpu_bo_va_mapping **mapping);
#if defined(CONFIG_DRM_AMD_DC)
-int amdgpu_dm_display_resume(struct amdgpu_device *adev );
+int amdgpu_dm_display_resume(struct amdgpu_device *adev);
#else
static inline int amdgpu_dm_display_resume(struct amdgpu_device *adev) { return 0; }
#endif
@@ -1349,7 +1347,7 @@ bool amdgpu_device_load_pci_state(struct pci_dev *pdev);
static inline bool amdgpu_is_tmz(struct amdgpu_device *adev)
{
- return adev->gmc.tmz_enabled;
+ return adev->gmc.tmz_enabled;
}
static inline int amdgpu_in_reset(struct amdgpu_device *adev)
--
2.30.0
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
