drm/amdkfd: Cosmetic cleanup

Fix some spacing issues, log output, uses of !=NULL/==NULL, unneeded
extra lines and clean up a declaration from =1 to =true for clarity

Signed-off-by: Kent Russell <kent.russell@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 8949b1ac2f189312c4159a5fb69e7c4679bd2e51..2e2a2617134bd7ba216430fe88bfe524cd4e6c92 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -149,7 +149,8 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
                };
 
                /* this is going to have a few of the MSBs set that we need to
-                * clear */
+                * clear
+                */
                bitmap_complement(gpu_resources.queue_bitmap,
                                  adev->gfx.mec.queue_bitmap,
                                  KGD_MAX_QUEUES);
@@ -163,7 +164,8 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
                                  gpu_resources.queue_bitmap);
 
                /* According to linux/bitmap.h we shouldn't use bitmap_clear if
-                * nbits is not compile time constant */
+                * nbits is not compile time constant
+                */
                last_valid_bit = 1 /* only first MEC can have compute queues */
                                * adev->gfx.mec.num_pipe_per_mec
                                * adev->gfx.mec.num_queue_per_pipe;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
index fa09e11a600c8df59ab61c545eafb25ab7c5fff1..c6abcf72e822cba875c3fcbc2f123bc610186619 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
@@ -310,7 +310,7 @@ static inline uint32_t get_sdma_base_addr(struct cik_sdma_rlc_registers *m)
        retval = m->sdma_engine_id * SDMA1_REGISTER_OFFSET +
                        m->sdma_queue_id * KFD_CIK_SDMA_QUEUE_OFFSET;
 
-       pr_debug("kfd: sdma base address: 0x%x\n", retval);
+       pr_debug("sdma base address: 0x%x\n", retval);
 
        return retval;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
index fec3a6aa1de61b119b4256f58edfcd4ab4149d8c..4e8b4e9499263a950bee0df94f12fa3d7cc56fab 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
@@ -266,7 +266,7 @@ static inline uint32_t get_sdma_base_addr(struct vi_sdma_mqd *m)
 
        retval = m->sdma_engine_id * SDMA1_REGISTER_OFFSET +
                m->sdma_queue_id * KFD_VI_SDMA_QUEUE_OFFSET;
-       pr_debug("kfd: sdma base address: 0x%x\n", retval);
+       pr_debug("sdma base address: 0x%x\n", retval);
 
        return retval;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 00e013581a7035a913880f92382636b63eb25a88..d39cb36b4830ebe031530592336ea832ce3d240a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1410,7 +1410,7 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
                        ret = map_bo_to_gpuvm(adev, entry, ctx.sync,
                                              is_invalid_userptr);
                        if (ret) {
-                               pr_err("Failed to map radeon bo to gpuvm\n");
+                               pr_err("Failed to map bo to gpuvm\n");
                                goto map_bo_to_gpuvm_failed;
                        }
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index d795e50182708238148afa7c9c10f1a9b26b16a2..3ccaa38779eae64009a6e819fbec5f382a4264d7 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -522,7 +522,7 @@ static int kfd_ioctl_set_trap_handler(struct file *filep,
        struct kfd_process_device *pdd;
 
        dev = kfd_device_by_id(args->gpu_id);
-       if (dev == NULL)
+       if (!dev)
                return -EINVAL;
 
        mutex_lock(&p->mutex);

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
index 6e1d41c5bf86e0cbce517fbd5629e90919182e72..d674d4b3340faa3437bf798cd73c05fd01d82411 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
@@ -983,7 +983,7 @@ void kfd_signal_vm_fault_event(struct kfd_dev *dev, unsigned int pasid,
                return; /* Presumably process exited. */
        memset(&memory_exception_data, 0, sizeof(memory_exception_data));
        memory_exception_data.gpu_id = dev->id;
-       memory_exception_data.failure.imprecise = 1;
+       memory_exception_data.failure.imprecise = true;
        /* Set failure reason */
        if (info) {
                memory_exception_data.va = (info->page_addr) << PAGE_SHIFT;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
index 213ea5454d11d36a506bf322f414298325aa7f3b..c2a22f6acf9afbf5d70b94a6107b186a836b3fe8 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
@@ -435,5 +435,3 @@ int kfd_init_apertures(struct kfd_process *process)
 
        return 0;
 }
-
-

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
index 6469b3456f00e8174751bd023424bc98cc0260e4..7f1cff3de4ebdd1e4de4fa3265ad42278b468696 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
@@ -343,7 +343,7 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd,
        memset(m, 0, sizeof(struct vi_sdma_mqd));
 
        *mqd = m;
-       if (gart_addr != NULL)
+       if (gart_addr)
                *gart_addr = (*mqd_mem_obj)->gpu_addr;
 
        retval = mm->update_mqd(mm, m, q);

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 9e02309656758761272c83c4535bac3392f67632..9c68ae5093ded605d1ba59b57cc674513b2d22bc 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -258,7 +258,7 @@ struct kfd_dev {
        bool interrupts_active;
 
        /* Debug manager */
-       struct kfd_dbgmgr           *dbgmgr;
+       struct kfd_dbgmgr *dbgmgr;
 
        /* Firmware versions */
        uint16_t mec_fw_version;