* [PATCH 1/2] drm/amdgpu: Fix CIK references in gmc_v8
@ 2019-05-01 12:31 Russell, Kent
[not found] ` <20190501123118.10937-1-kent.russell-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Russell, Kent @ 2019-05-01 12:31 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org; +Cc: Russell, Kent
gmc_v8 is for VI, not CIK, so fix those references
Change-Id: Ifa46212fbeadbec7e73ba28d02e97339ffcfb5d1
Signed-off-by: Kent Russell <kent.russell@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 2880a145450a..6769989906bf 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -289,7 +289,7 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev)
*
* @adev: amdgpu_device pointer
*
- * Load the GDDR MC ucode into the hw (CIK).
+ * Load the GDDR MC ucode into the hw (VI).
* Returns 0 on success, error on failure.
*/
static int gmc_v8_0_tonga_mc_load_microcode(struct amdgpu_device *adev)
@@ -443,7 +443,7 @@ static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev,
* @adev: amdgpu_device pointer
*
* Set the location of vram, gart, and AGP in the GPU's
- * physical address space (CIK).
+ * physical address space (VI).
*/
static void gmc_v8_0_mc_program(struct amdgpu_device *adev)
{
@@ -515,7 +515,7 @@ static void gmc_v8_0_mc_program(struct amdgpu_device *adev)
* @adev: amdgpu_device pointer
*
* Look up the amount of vram, vram width, and decide how to place
- * vram and gart within the GPU's physical address space (CIK).
+ * vram and gart within the GPU's physical address space (VI).
* Returns 0 for success.
*/
static int gmc_v8_0_mc_init(struct amdgpu_device *adev)
@@ -630,7 +630,7 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev)
* @adev: amdgpu_device pointer
* @vmid: vm instance to flush
*
- * Flush the TLB for the requested page table (CIK).
+ * Flush the TLB for the requested page table (VI).
*/
static void gmc_v8_0_flush_gpu_tlb(struct amdgpu_device *adev,
uint32_t vmid, uint32_t flush_type)
@@ -800,7 +800,7 @@ static void gmc_v8_0_set_prt(struct amdgpu_device *adev, bool enable)
* This sets up the TLBs, programs the page tables for VMID0,
* sets up the hw for VMIDs 1-15 which are allocated on
* demand, and sets up the global locations for the LDS, GDS,
- * and GPUVM for FSA64 clients (CIK).
+ * and GPUVM for FSA64 clients (VI).
* Returns 0 for success, errors for failure.
*/
static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)
@@ -948,7 +948,7 @@ static int gmc_v8_0_gart_init(struct amdgpu_device *adev)
*
* @adev: amdgpu_device pointer
*
- * This disables all VM page table (CIK).
+ * This disables all VM page table (VI).
*/
static void gmc_v8_0_gart_disable(struct amdgpu_device *adev)
{
@@ -978,7 +978,7 @@ static void gmc_v8_0_gart_disable(struct amdgpu_device *adev)
* @status: VM_CONTEXT1_PROTECTION_FAULT_STATUS register value
* @addr: VM_CONTEXT1_PROTECTION_FAULT_ADDR register value
*
- * Print human readable fault information (CIK).
+ * Print human readable fault information (VI).
*/
static void gmc_v8_0_vm_decode_fault(struct amdgpu_device *adev, u32 status,
u32 addr, u32 mc_client, unsigned pasid)
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread[parent not found: <20190501123118.10937-1-kent.russell-5C7GfCeVMHo@public.gmane.org>]
* [PATCH 2/2] drm/amdkfd: Cosmetic cleanup [not found] ` <20190501123118.10937-1-kent.russell-5C7GfCeVMHo@public.gmane.org> @ 2019-05-01 12:31 ` Russell, Kent [not found] ` <20190501123118.10937-2-kent.russell-5C7GfCeVMHo@public.gmane.org> 2019-05-02 13:11 ` [PATCH 1/2] drm/amdgpu: Fix CIK references in gmc_v8 Christian König 1 sibling, 1 reply; 4+ messages in thread From: Russell, Kent @ 2019-05-01 12:31 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org; +Cc: Russell, Kent 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@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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 4+ messages in thread
[parent not found: <20190501123118.10937-2-kent.russell-5C7GfCeVMHo@public.gmane.org>]
* Re: [PATCH 2/2] drm/amdkfd: Cosmetic cleanup [not found] ` <20190501123118.10937-2-kent.russell-5C7GfCeVMHo@public.gmane.org> @ 2019-05-01 15:54 ` Kuehling, Felix 0 siblings, 0 replies; 4+ messages in thread From: Kuehling, Felix @ 2019-05-01 15:54 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Russell, Kent Thank you Kent! The series is Reviewed-by: Felix Kuehling <Felix.Kuehling@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@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@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/amdgpu: Fix CIK references in gmc_v8 [not found] ` <20190501123118.10937-1-kent.russell-5C7GfCeVMHo@public.gmane.org> 2019-05-01 12:31 ` [PATCH 2/2] drm/amdkfd: Cosmetic cleanup Russell, Kent @ 2019-05-02 13:11 ` Christian König 1 sibling, 0 replies; 4+ messages in thread From: Christian König @ 2019-05-02 13:11 UTC (permalink / raw) To: Russell, Kent, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Am 01.05.19 um 14:31 schrieb Russell, Kent: > gmc_v8 is for VI, not CIK, so fix those references > > Change-Id: Ifa46212fbeadbec7e73ba28d02e97339ffcfb5d1 > Signed-off-by: Kent Russell <kent.russell@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > index 2880a145450a..6769989906bf 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > @@ -289,7 +289,7 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) > * > * @adev: amdgpu_device pointer > * > - * Load the GDDR MC ucode into the hw (CIK). > + * Load the GDDR MC ucode into the hw (VI). > * Returns 0 on success, error on failure. > */ > static int gmc_v8_0_tonga_mc_load_microcode(struct amdgpu_device *adev) > @@ -443,7 +443,7 @@ static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev, > * @adev: amdgpu_device pointer > * > * Set the location of vram, gart, and AGP in the GPU's > - * physical address space (CIK). > + * physical address space (VI). > */ > static void gmc_v8_0_mc_program(struct amdgpu_device *adev) > { > @@ -515,7 +515,7 @@ static void gmc_v8_0_mc_program(struct amdgpu_device *adev) > * @adev: amdgpu_device pointer > * > * Look up the amount of vram, vram width, and decide how to place > - * vram and gart within the GPU's physical address space (CIK). > + * vram and gart within the GPU's physical address space (VI). > * Returns 0 for success. > */ > static int gmc_v8_0_mc_init(struct amdgpu_device *adev) > @@ -630,7 +630,7 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev) > * @adev: amdgpu_device pointer > * @vmid: vm instance to flush > * > - * Flush the TLB for the requested page table (CIK). > + * Flush the TLB for the requested page table (VI). > */ > static void gmc_v8_0_flush_gpu_tlb(struct amdgpu_device *adev, > uint32_t vmid, uint32_t flush_type) > @@ -800,7 +800,7 @@ static void gmc_v8_0_set_prt(struct amdgpu_device *adev, bool enable) > * This sets up the TLBs, programs the page tables for VMID0, > * sets up the hw for VMIDs 1-15 which are allocated on > * demand, and sets up the global locations for the LDS, GDS, > - * and GPUVM for FSA64 clients (CIK). > + * and GPUVM for FSA64 clients (VI). > * Returns 0 for success, errors for failure. > */ > static int gmc_v8_0_gart_enable(struct amdgpu_device *adev) > @@ -948,7 +948,7 @@ static int gmc_v8_0_gart_init(struct amdgpu_device *adev) > * > * @adev: amdgpu_device pointer > * > - * This disables all VM page table (CIK). > + * This disables all VM page table (VI). > */ > static void gmc_v8_0_gart_disable(struct amdgpu_device *adev) > { > @@ -978,7 +978,7 @@ static void gmc_v8_0_gart_disable(struct amdgpu_device *adev) > * @status: VM_CONTEXT1_PROTECTION_FAULT_STATUS register value > * @addr: VM_CONTEXT1_PROTECTION_FAULT_ADDR register value > * > - * Print human readable fault information (CIK). > + * Print human readable fault information (VI). > */ > static void gmc_v8_0_vm_decode_fault(struct amdgpu_device *adev, u32 status, > u32 addr, u32 mc_client, unsigned pasid) _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-02 13:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-01 12:31 [PATCH 1/2] drm/amdgpu: Fix CIK references in gmc_v8 Russell, Kent
[not found] ` <20190501123118.10937-1-kent.russell-5C7GfCeVMHo@public.gmane.org>
2019-05-01 12:31 ` [PATCH 2/2] drm/amdkfd: Cosmetic cleanup Russell, Kent
[not found] ` <20190501123118.10937-2-kent.russell-5C7GfCeVMHo@public.gmane.org>
2019-05-01 15:54 ` Kuehling, Felix
2019-05-02 13:11 ` [PATCH 1/2] drm/amdgpu: Fix CIK references in gmc_v8 Christian König
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox