drm/amdgpu: Fix inconsistent indenting
Subsystems (3)
PATCH 1/1 drm/amdgpu: Fix inconsistent indenting
Eliminate the follow smatch warning:
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c:449 sdma_v5_0_ring_emit_mem_sync() warn: inconsistent indenting.
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +6 -7
@@ -440,20 +440,19 @@ static void sdma_v5_0_ring_emit_ib(struct amdgpu_ring *ring,*/ static void sdma_v5_0_ring_emit_mem_sync (struct amdgpu_ring *ring) { -uint32_t gcr_cntl = -SDMA_GCR_GL2_INV |SDMA_GCR_GL2_WB |SDMA_GCR_GLM_INV | -SDMA_GCR_GL1_INV |SDMA_GCR_GLV_INV |SDMA_GCR_GLK_INV | -SDMA_GCR_GLI_INV (1 ); +uint32_t gcr_cntl =SDMA_GCR_GL2_INV |SDMA_GCR_GL2_WB |SDMA_GCR_GLM_INV | +SDMA_GCR_GL1_INV |SDMA_GCR_GLV_INV |SDMA_GCR_GLK_INV | +SDMA_GCR_GLI_INV (1 );/* flush entire cache L0/L1/L2, this can be optimized by performance requirement */ amdgpu_ring_write (ring,SDMA_PKT_HEADER_OP (SDMA_OP_GCR_REQ ));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD1_BASE_VA_31_7 (0 ));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD2_GCR_CONTROL_15_0 (gcr_cntl) | -SDMA_PKT_GCR_REQ_PAYLOAD2_BASE_VA_47_32 (0 )); +SDMA_PKT_GCR_REQ_PAYLOAD2_BASE_VA_47_32 (0 ));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD3_LIMIT_VA_31_7 (0 ) | -SDMA_PKT_GCR_REQ_PAYLOAD3_GCR_CONTROL_18_16 (gcr_cntl >>16 )); +SDMA_PKT_GCR_REQ_PAYLOAD3_GCR_CONTROL_18_16 (gcr_cntl >>16 ));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD4_LIMIT_VA_47_32 (0 ) | -SDMA_PKT_GCR_REQ_PAYLOAD4_VMID (0 )); +SDMA_PKT_GCR_REQ_PAYLOAD4_VMID (0 )); }/**
Signature · 1 line
1.8.3.1
Am 21.05.21 um 11:50 schrieb Jiapeng Chong:
Quoted 7 lines
Eliminate the follow smatch warning:
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c:449sdma_v5_0_ring_emit_mem_sync()warn: inconsistent indenting.Reported-by Abaci Robot <[email protected]>Signed-off-by Jiapeng Chong <[email protected]>
Quoted 25 lines
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +3
-5@@ -440,20 +440,19 @@ static void sdma_v5_0_ring_emit_ib(struct amdgpu_ring *ring,*/ static void sdma_v5_0_ring_emit_mem_sync (struct amdgpu_ring *ring) { -uint32_t gcr_cntl = -SDMA_GCR_GL2_INV |SDMA_GCR_GL2_WB |SDMA_GCR_GLM_INV | -SDMA_GCR_GL1_INV |SDMA_GCR_GLV_INV |SDMA_GCR_GLK_INV | -SDMA_GCR_GLI_INV (1 ); +uint32_t gcr_cntl =SDMA_GCR_GL2_INV |SDMA_GCR_GL2_WB |SDMA_GCR_GLM_INV | +SDMA_GCR_GL1_INV |SDMA_GCR_GLV_INV |SDMA_GCR_GLK_INV | +SDMA_GCR_GLI_INV (1 );/* flush entire cache L0/L1/L2, this can be optimized by performance requirement */ amdgpu_ring_write (ring,SDMA_PKT_HEADER_OP (SDMA_OP_GCR_REQ ));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD1_BASE_VA_31_7 (0 )); amdgpu_ring_write(ring, SDMA_PKT_GCR_REQ_PAYLOAD2_GCR_CONTROL_15_0(gcr_cntl) | -SDMA_PKT_GCR_REQ_PAYLOAD2_BASE_VA_47_32 (0 ));
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c static void sdma_v5_0_ring_emit_ib(struct amdgpu_ring *ring, · line 458
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +3
-2+ SDMA_PKT_GCR_REQ_PAYLOAD2_BASE_VA_47_32(0));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD3_LIMIT_VA_31_7 (0 ) | -SDMA_PKT_GCR_REQ_PAYLOAD3_GCR_CONTROL_18_16 (gcr_cntl >>16 )); +SDMA_PKT_GCR_REQ_PAYLOAD3_GCR_CONTROL_18_16 (gcr_cntl >>16 ));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD4_LIMIT_VA_47_32 (0 ) | -SDMA_PKT_GCR_REQ_PAYLOAD4_VMID (0 )); +SDMA_PKT_GCR_REQ_PAYLOAD4_VMID (0 )); }/**
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
AppliedApplied. Thanks!
Alex
Quoted 46 lines · Christian König
Am 21.05.21 um 11:50 schrieb Jiapeng Chong:
Quoted 7 lines
Eliminate the follow smatch warning:
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c:449sdma_v5_0_ring_emit_mem_sync()warn: inconsistent indenting.Reported-by Abaci Robot <[email protected]>Signed-off-by Jiapeng Chong <[email protected]>Reviewed-by Christian König <[email protected]>Quoted 34 lines
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +6
-7@@ -440,20 +440,19 @@ static void sdma_v5_0_ring_emit_ib(struct amdgpu_ring *ring,*/ static void sdma_v5_0_ring_emit_mem_sync (struct amdgpu_ring *ring) { -uint32_t gcr_cntl = -SDMA_GCR_GL2_INV |SDMA_GCR_GL2_WB |SDMA_GCR_GLM_INV | -SDMA_GCR_GL1_INV |SDMA_GCR_GLV_INV |SDMA_GCR_GLK_INV | -SDMA_GCR_GLI_INV (1 ); +uint32_t gcr_cntl =SDMA_GCR_GL2_INV |SDMA_GCR_GL2_WB |SDMA_GCR_GLM_INV | +SDMA_GCR_GL1_INV |SDMA_GCR_GLV_INV |SDMA_GCR_GLK_INV | +SDMA_GCR_GLI_INV (1 );/* flush entire cache L0/L1/L2, this can be optimized by performance requirement */ amdgpu_ring_write (ring,SDMA_PKT_HEADER_OP (SDMA_OP_GCR_REQ ));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD1_BASE_VA_31_7 (0 ));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD2_GCR_CONTROL_15_0 (gcr_cntl) | -SDMA_PKT_GCR_REQ_PAYLOAD2_BASE_VA_47_32 (0 )); +SDMA_PKT_GCR_REQ_PAYLOAD2_BASE_VA_47_32 (0 ));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD3_LIMIT_VA_31_7 (0 ) | -SDMA_PKT_GCR_REQ_PAYLOAD3_GCR_CONTROL_18_16 (gcr_cntl >>16 )); +SDMA_PKT_GCR_REQ_PAYLOAD3_GCR_CONTROL_18_16 (gcr_cntl >>16 ));amdgpu_ring_write (ring,SDMA_PKT_GCR_REQ_PAYLOAD4_LIMIT_VA_47_32 (0 ) | -SDMA_PKT_GCR_REQ_PAYLOAD4_VMID (0 )); +SDMA_PKT_GCR_REQ_PAYLOAD4_VMID (0 )); }
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c static void sdma_v5_0_ring_emit_ib(struct amdgpu_ring *ring, · line 458
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +0
-0/** _______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx