[PATCH 2/2] drm/amdkfd: Cosmetic cleanup
Kuehling, Felix
Felix.Kuehling at amd.com
Wed May 1 15:54:17 UTC 2019
Thank you Kent! The series is Reviewed-by: Felix Kuehling
<Felix.Kuehling at amd.com>
On 2019-05-01 8:31 a.m., Russell, Kent wrote:
> [CAUTION: External Email]
>
> Fix some spacing issues, log output, uses of !=NULL/==NULL, unneeded
> extra lines and clean up a declaration from =1 to =true for clarity
>
> Change-Id: I638231cde4887a3c2da0b70e5fee77059cfb0bf2
> Signed-off-by: Kent Russell <kent.russell at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 ++++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +-
> drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 +-
> drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 --
> drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 +-
> drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +-
> 9 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index 8949b1ac2f18..2e2a2617134b 100644
> --- 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 fa09e11a600c..c6abcf72e822 100644
> --- 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 fec3a6aa1de6..4e8b4e949926 100644
> --- 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 697b8efe896c..2fe72833f813 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -1379,7 +1379,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 c731126ada22..38ae53fe8182 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> @@ -524,7 +524,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 6e1d41c5bf86..d674d4b3340f 100644
> --- 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 dc7339825b5c..22a8e88b6a67 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
> @@ -436,5 +436,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 18697c2152a8..b550dea9b10a 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
> @@ -355,7 +355,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 c8925b7b6c46..8f02d7817162 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> @@ -259,7 +259,7 @@ struct kfd_dev {
> bool interrupts_active;
>
> /* Debug manager */
> - struct kfd_dbgmgr *dbgmgr;
> + struct kfd_dbgmgr *dbgmgr;
>
> /* Firmware versions */
> uint16_t mec_fw_version;
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
More information about the amd-gfx
mailing list