On Mon, Nov 9, 2020 at 4:19 PM Lee Jones <lee.jo...@linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/cik.c:1869:5: warning: no previous prototype for > ‘ci_mc_load_microcode’ [-Wmissing-prototypes] > drivers/gpu/drm/radeon/cik.c: In function ‘cik_gpu_init’: > drivers/gpu/drm/radeon/cik.c:3181:6: warning: variable ‘mc_shared_chmap’ set > but not used [-Wunused-but-set-variable] > drivers/gpu/drm/radeon/cik.c: At top level: > drivers/gpu/drm/radeon/cik.c:4852:5: warning: no previous prototype for > ‘cik_gpu_check_soft_reset’ [-Wmissing-prototypes] > drivers/gpu/drm/radeon/cik.c:5850:6: warning: no previous prototype for > ‘cik_enter_rlc_safe_mode’ [-Wmissing-prototypes] > drivers/gpu/drm/radeon/cik.c:5871:6: warning: no previous prototype for > ‘cik_exit_rlc_safe_mode’ [-Wmissing-prototypes] > drivers/gpu/drm/radeon/cik.c:6289:6: warning: no previous prototype for > ‘cik_update_cg’ [-Wmissing-prototypes] > drivers/gpu/drm/radeon/cik.c:6421:6: warning: no previous prototype for > ‘cik_init_cp_pg_table’ [-Wmissing-prototypes] > drivers/gpu/drm/radeon/cik.c:6678:5: warning: no previous prototype for > ‘cik_get_csb_size’ [-Wmissing-prototypes] > drivers/gpu/drm/radeon/cik.c:6710:6: warning: no previous prototype for > ‘cik_get_csb_buffer’ [-Wmissing-prototypes] > drivers/gpu/drm/radeon/cik.c:3084: warning: Function parameter or member > 'max_rb_num_per_se' not described in 'cik_get_rb_disabled' > drivers/gpu/drm/radeon/cik.c:3084: warning: Excess function parameter > 'max_rb_num' description in 'cik_get_rb_disabled' > drivers/gpu/drm/radeon/cik.c:3084: warning: Excess function parameter > 'se_num' description in 'cik_get_rb_disabled' > drivers/gpu/drm/radeon/cik.c:3114: warning: Function parameter or member > 'max_rb_num_per_se' not described in 'cik_setup_rb' > drivers/gpu/drm/radeon/cik.c:3114: warning: Excess function parameter > 'max_rb_num' description in 'cik_setup_rb' > drivers/gpu/drm/radeon/cik.c:5662: warning: Function parameter or member > 'mc_client' not described in 'cik_vm_decode_fault' > drivers/gpu/drm/radeon/cik.c:5690: warning: Function parameter or member > 'ring' not described in 'cik_vm_flush' > drivers/gpu/drm/radeon/cik.c:5690: warning: Function parameter or member > 'vm_id' not described in 'cik_vm_flush' > drivers/gpu/drm/radeon/cik.c:5690: warning: Function parameter or member > 'pd_addr' not described in 'cik_vm_flush' > > Cc: Alex Deucher <alexander.deuc...@amd.com> > Cc: "Christian König" <christian.koe...@amd.com> > Cc: David Airlie <airl...@linux.ie> > Cc: Daniel Vetter <dan...@ffwll.ch> > Cc: Sumit Semwal <sumit.sem...@linaro.org> > Cc: amd-...@lists.freedesktop.org > Cc: dri-de...@lists.freedesktop.org > Cc: linux-me...@vger.kernel.org > Cc: linaro-mm-...@lists.linaro.org > Signed-off-by: Lee Jones <lee.jo...@linaro.org>
Applied with minor fixups. Thanks! Alex > --- > drivers/gpu/drm/radeon/cik.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c > index 5c42877fd6fbf..4494f9122fd91 100644 > --- a/drivers/gpu/drm/radeon/cik.c > +++ b/drivers/gpu/drm/radeon/cik.c > @@ -3071,8 +3071,7 @@ static u32 cik_create_bitmask(u32 bit_width) > * cik_get_rb_disabled - computes the mask of disabled RBs > * > * @rdev: radeon_device pointer > - * @max_rb_num: max RBs (render backends) for the asic > - * @se_num: number of SEs (shader engines) for the asic > + * @max_rb_num_per_se: max RBs (render backends) for the asic > * @sh_per_se: number of SH blocks per SE for the asic > * > * Calculates the bitmask of disabled RBs (CIK). > @@ -3104,7 +3103,7 @@ static u32 cik_get_rb_disabled(struct radeon_device > *rdev, > * @rdev: radeon_device pointer > * @se_num: number of SEs (shader engines) for the asic > * @sh_per_se: number of SH blocks per SE for the asic > - * @max_rb_num: max RBs (render backends) for the asic > + * @max_rb_num_per_se: max RBs (render backends) for the asic > * > * Configures per-SE/SH RB registers (CIK). > */ > @@ -5654,6 +5653,7 @@ void cik_vm_fini(struct radeon_device *rdev) > * @rdev: radeon_device pointer > * @status: VM_CONTEXT1_PROTECTION_FAULT_STATUS register value > * @addr: VM_CONTEXT1_PROTECTION_FAULT_ADDR register value > + * @mc_client: VM_CONTEXT1_PROTECTION_FAULT_MCCLIENT register value > * > * Print human readable fault information (CIK). > */ > @@ -5677,11 +5677,9 @@ static void cik_vm_decode_fault(struct radeon_device > *rdev, > block, mc_client, mc_id); > } > > -/** > +/* > * cik_vm_flush - cik vm flush using the CP > * > - * @rdev: radeon_device pointer > - * > * Update the page table base and flush the VM TLB > * using the CP (CIK). > */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-de...@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
