shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/amd/amdgpu: Fix style errors in amdgpu_drv.c & amdgpu_device.c

Browse Source 
[ Upstream commit 47fc644f80 ]

Fix following checkpatch style errors in amdgpu_drv.c &
amdgpu_device.c

ERROR: exactly one space required after that #ifdef
ERROR: spaces required around that '+=' (ctx:WxV)
ERROR: space required before the open brace '{'
ERROR: spaces required around that '||' (ctx:VxE)
ERROR: space prohibited before that close parenthesis ')'
ERROR: space required before the open parenthesis '('
ERROR: space required before the open brace '{'
ERROR: code indent should use tabs where possible

Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Mario Limonciello <mario.limonciello@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>
Stable-dep-of: 74fa02c4a5ea ("drm/amdgpu: Fix pci state save during mode-1 reset")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Srinivasan Shanmugam
2023-04-19 16:12:45 +05:30
committed by Greg Kroah-Hartman
parent 89d7008af4
commit 87a2448efc
2 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View File

@@ -980,7 +980,7 @@ void amdgpu_device_program_register_sequence(struct amdgpu_device *adev,
if (array_size % 3) if (array_size % 3)
return; return;
for (i = 0; i < array_size; i +=3) { for (i = 0; i < array_size; i += 3) {
reg = registers[i + 0]; reg = registers[i + 0];
and_mask = registers[i + 1]; and_mask = registers[i + 1];
or_mask = registers[i + 2]; or_mask = registers[i + 2];
@@ -1552,7 +1552,7 @@ static int amdgpu_device_check_arguments(struct amdgpu_device *adev)
dev_warn(adev->dev, "sched jobs (%d) must be at least 4\n", dev_warn(adev->dev, "sched jobs (%d) must be at least 4\n",
amdgpu_sched_jobs); amdgpu_sched_jobs);
amdgpu_sched_jobs = 4; amdgpu_sched_jobs = 4;
} else if (!is_power_of_2(amdgpu_sched_jobs)){ } else if (!is_power_of_2(amdgpu_sched_jobs)) {
dev_warn(adev->dev, "sched jobs (%d) must be a power of 2\n", dev_warn(adev->dev, "sched jobs (%d) must be a power of 2\n",
amdgpu_sched_jobs); amdgpu_sched_jobs);
amdgpu_sched_jobs = roundup_pow_of_two(amdgpu_sched_jobs); amdgpu_sched_jobs = roundup_pow_of_two(amdgpu_sched_jobs);
@@ -2747,8 +2747,9 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev)
DRM_ERROR("enable mgpu fan boost failed (%d).\n", r); DRM_ERROR("enable mgpu fan boost failed (%d).\n", r);
/* For passthrough configuration on arcturus and aldebaran, enable special handling SBR */ /* For passthrough configuration on arcturus and aldebaran, enable special handling SBR */
if (amdgpu_passthrough(adev) && ((adev->asic_type == CHIP_ARCTURUS && adev->gmc.xgmi.num_physical_nodes > 1)|| if (amdgpu_passthrough(adev) &&
adev->asic_type == CHIP_ALDEBARAN )) ((adev->asic_type == CHIP_ARCTURUS && adev->gmc.xgmi.num_physical_nodes > 1) ||
adev->asic_type == CHIP_ALDEBARAN))
amdgpu_dpm_handle_passthrough_sbr(adev, true); amdgpu_dpm_handle_passthrough_sbr(adev, true);
if (adev->gmc.xgmi.num_physical_nodes > 1) { if (adev->gmc.xgmi.num_physical_nodes > 1) {
@@ -3077,7 +3078,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)
} }
adev->ip_blocks[i].status.hw = false; adev->ip_blocks[i].status.hw = false;
/* handle putting the SMC in the appropriate state */ /* handle putting the SMC in the appropriate state */
if(!amdgpu_sriov_vf(adev)){ if (!amdgpu_sriov_vf(adev)) {
if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) { if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) {
r = amdgpu_dpm_set_mp1_state(adev, adev->mp1_state); r = amdgpu_dpm_set_mp1_state(adev, adev->mp1_state);
if (r) { if (r) {
@@ -4048,7 +4049,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)
/* disable all interrupts */ /* disable all interrupts */
amdgpu_irq_disable_all(adev); amdgpu_irq_disable_all(adev);
if (adev->mode_info.mode_config_initialized){ if (adev->mode_info.mode_config_initialized) {
if (!drm_drv_uses_atomic_modeset(adev_to_drm(adev))) if (!drm_drv_uses_atomic_modeset(adev_to_drm(adev)))
drm_helper_force_disable_all(adev_to_drm(adev)); drm_helper_force_disable_all(adev_to_drm(adev));
else else
@@ -4755,42 +4756,42 @@ disabled:
int amdgpu_device_mode1_reset(struct amdgpu_device *adev) int amdgpu_device_mode1_reset(struct amdgpu_device *adev)
{ {
u32 i; u32 i;
int ret = 0; int ret = 0;
amdgpu_atombios_scratch_regs_engine_hung(adev, true); amdgpu_atombios_scratch_regs_engine_hung(adev, true);
dev_info(adev->dev, "GPU mode1 reset\n"); dev_info(adev->dev, "GPU mode1 reset\n");
/* disable BM */ /* disable BM */
pci_clear_master(adev->pdev); pci_clear_master(adev->pdev);
amdgpu_device_cache_pci_state(adev->pdev); amdgpu_device_cache_pci_state(adev->pdev);
if (amdgpu_dpm_is_mode1_reset_supported(adev)) { if (amdgpu_dpm_is_mode1_reset_supported(adev)) {
dev_info(adev->dev, "GPU smu mode1 reset\n"); dev_info(adev->dev, "GPU smu mode1 reset\n");
ret = amdgpu_dpm_mode1_reset(adev); ret = amdgpu_dpm_mode1_reset(adev);
} else { } else {
dev_info(adev->dev, "GPU psp mode1 reset\n"); dev_info(adev->dev, "GPU psp mode1 reset\n");
ret = psp_gpu_reset(adev); ret = psp_gpu_reset(adev);
} }
if (ret) if (ret)
dev_err(adev->dev, "GPU mode1 reset failed\n"); dev_err(adev->dev, "GPU mode1 reset failed\n");
amdgpu_device_load_pci_state(adev->pdev); amdgpu_device_load_pci_state(adev->pdev);
/* wait for asic to come out of reset */ /* wait for asic to come out of reset */
for (i = 0; i < adev->usec_timeout; i++) { for (i = 0; i < adev->usec_timeout; i++) {
u32 memsize = adev->nbio.funcs->get_memsize(adev); u32 memsize = adev->nbio.funcs->get_memsize(adev);
if (memsize != 0xffffffff) if (memsize != 0xffffffff)
break; break;
udelay(1); udelay(1);
} }
amdgpu_atombios_scratch_regs_engine_hung(adev, false); amdgpu_atombios_scratch_regs_engine_hung(adev, false);
return ret; return ret;
} }
int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev, int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev,

2
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
View File

@@ -1662,7 +1662,7 @@ static const u16 amdgpu_unsupported_pciidlist[] = {
}; };
static const struct pci_device_id pciidlist[] = { static const struct pci_device_id pciidlist[] = {
#ifdef CONFIG_DRM_AMDGPU_SI #ifdef CONFIG_DRM_AMDGPU_SI
{0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, {0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI},
{0x1002, 0x6784, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, {0x1002, 0x6784, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI},
{0x1002, 0x6788, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, {0x1002, 0x6788, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI},