Commit 2d5c0415 authored by Praful Swarnakar's avatar Praful Swarnakar Committed by Alex Deucher

drm/amdgpu: Fix style issues in amdgpu_psp.c

Fixes the following to align to linux coding style:

WARNING: Block comments use a trailing */ on a separate line
WARNING: Block comments should align the * on each line

Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: default avatarPraful Swarnakar <Praful.Swarnakar@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ad19c200
...@@ -438,14 +438,15 @@ static int psp_sw_init(void *handle) ...@@ -438,14 +438,15 @@ static int psp_sw_init(void *handle)
/* If psp runtime database exists, then /* If psp runtime database exists, then
* only enable two stage memory training * only enable two stage memory training
* when TWO_STAGE_DRAM_TRAINING bit is set * when TWO_STAGE_DRAM_TRAINING bit is set
* in runtime database */ * in runtime database
*/
mem_training_ctx->enable_mem_training = true; mem_training_ctx->enable_mem_training = true;
} }
} else { } else {
/* If psp runtime database doesn't exist or /* If psp runtime database doesn't exist or is
* is invalid, force enable two stage memory * invalid, force enable two stage memory training
* training */ */
mem_training_ctx->enable_mem_training = true; mem_training_ctx->enable_mem_training = true;
} }
...@@ -797,7 +798,8 @@ static int psp_tmr_init(struct psp_context *psp) ...@@ -797,7 +798,8 @@ static int psp_tmr_init(struct psp_context *psp)
tmr_size = PSP_TMR_SIZE(psp->adev); tmr_size = PSP_TMR_SIZE(psp->adev);
/* For ASICs support RLC autoload, psp will parse the toc /* For ASICs support RLC autoload, psp will parse the toc
* and calculate the total size of TMR needed */ * and calculate the total size of TMR needed
*/
if (!amdgpu_sriov_vf(psp->adev) && if (!amdgpu_sriov_vf(psp->adev) &&
psp->toc.start_addr && psp->toc.start_addr &&
psp->toc.size_bytes && psp->toc.size_bytes &&
...@@ -1137,9 +1139,9 @@ int psp_ta_init_shared_buf(struct psp_context *psp, ...@@ -1137,9 +1139,9 @@ int psp_ta_init_shared_buf(struct psp_context *psp,
struct ta_mem_context *mem_ctx) struct ta_mem_context *mem_ctx)
{ {
/* /*
* Allocate 16k memory aligned to 4k from Frame Buffer (local * Allocate 16k memory aligned to 4k from Frame Buffer (local
* physical) for ta to host memory * physical) for ta to host memory
*/ */
return amdgpu_bo_create_kernel(psp->adev, mem_ctx->shared_mem_size, return amdgpu_bo_create_kernel(psp->adev, mem_ctx->shared_mem_size,
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM | PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM |
AMDGPU_GEM_DOMAIN_GTT, AMDGPU_GEM_DOMAIN_GTT,
...@@ -1728,7 +1730,8 @@ int psp_ras_trigger_error(struct psp_context *psp, ...@@ -1728,7 +1730,8 @@ int psp_ras_trigger_error(struct psp_context *psp,
return -EINVAL; return -EINVAL;
/* If err_event_athub occurs error inject was successful, however /* If err_event_athub occurs error inject was successful, however
return status from TA is no long reliable */ * return status from TA is no long reliable
*/
if (amdgpu_ras_intr_triggered()) if (amdgpu_ras_intr_triggered())
return 0; return 0;
...@@ -2577,7 +2580,8 @@ static int psp_load_non_psp_fw(struct psp_context *psp) ...@@ -2577,7 +2580,8 @@ static int psp_load_non_psp_fw(struct psp_context *psp)
ucode->ucode_id == AMDGPU_UCODE_ID_SDMA2 || ucode->ucode_id == AMDGPU_UCODE_ID_SDMA2 ||
ucode->ucode_id == AMDGPU_UCODE_ID_SDMA3)) ucode->ucode_id == AMDGPU_UCODE_ID_SDMA3))
/* PSP only receive one SDMA fw for sienna_cichlid, /* PSP only receive one SDMA fw for sienna_cichlid,
* as all four sdma fw are same */ * as all four sdma fw are same
*/
continue; continue;
psp_print_fw_hdr(psp, ucode); psp_print_fw_hdr(psp, ucode);
...@@ -2642,8 +2646,8 @@ static int psp_load_fw(struct amdgpu_device *adev) ...@@ -2642,8 +2646,8 @@ static int psp_load_fw(struct amdgpu_device *adev)
if (adev->gmc.xgmi.num_physical_nodes > 1) { if (adev->gmc.xgmi.num_physical_nodes > 1) {
ret = psp_xgmi_initialize(psp, false, true); ret = psp_xgmi_initialize(psp, false, true);
/* Warning the XGMI seesion initialize failure /* Warning the XGMI seesion initialize failure
* Instead of stop driver initialization * Instead of stop driver initialization
*/ */
if (ret) if (ret)
dev_err(psp->adev->dev, dev_err(psp->adev->dev,
"XGMI: Failed to initialize XGMI session\n"); "XGMI: Failed to initialize XGMI session\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment