- Linaro-mm-sig - lists.linaro.org

Re: [Linaro-mm-sig] [PATCH 31/42] drm/ttm/ttm_bo: Fix one function header - demote lots of kernel-doc abuses

by Christian König

Am 16.11.20 um 18:41 schrieb Lee Jones: > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/ttm/ttm_bo.c:51: warning: Function parameter or member 'ttm_global_mutex' not described in 'DEFINE_MUTEX' > drivers/gpu/drm/ttm/ttm_bo.c:286: warning: Function parameter or member 'bo' not described in 'ttm_bo_cleanup_memtype_use' > drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'bo' not described in 'ttm_bo_cleanup_refs' > drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'interruptible' not described in 'ttm_bo_cleanup_refs' > drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'no_wait_gpu' not described in 'ttm_bo_cleanup_refs' > drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'unlock_resv' not described in 'ttm_bo_cleanup_refs' > drivers/gpu/drm/ttm/ttm_bo.c:424: warning: Function parameter or member 'bdev' not described in 'ttm_bo_delayed_delete' > drivers/gpu/drm/ttm/ttm_bo.c:424: warning: Function parameter or member 'remove_all' not described in 'ttm_bo_delayed_delete' > drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'bo' not described in 'ttm_bo_evict_swapout_allowable' > drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'ctx' not described in 'ttm_bo_evict_swapout_allowable' > drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'locked' not described in 'ttm_bo_evict_swapout_allowable' > drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'busy' not described in 'ttm_bo_evict_swapout_allowable' > drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'bo' not described in 'ttm_bo_add_move_fence' > drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'man' not described in 'ttm_bo_add_move_fence' > drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'mem' not described in 'ttm_bo_add_move_fence' > drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'no_wait_gpu' not described in 'ttm_bo_add_move_fence' > drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'bo' not described in 'ttm_bo_mem_force_space' > drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'place' not described in 'ttm_bo_mem_force_space' > drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'mem' not described in 'ttm_bo_mem_force_space' > drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'ctx' not described in 'ttm_bo_mem_force_space' > drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'bo' not described in 'ttm_bo_mem_space' > drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'placement' not described in 'ttm_bo_mem_space' > drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'mem' not described in 'ttm_bo_mem_space' > drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'ctx' not described in 'ttm_bo_mem_space' > drivers/gpu/drm/ttm/ttm_bo.c:1387: warning: Function parameter or member 'ctx' not described in 'ttm_bo_swapout' > > Cc: Christian Koenig <christian.koenig(a)amd.com> > Cc: Huang Rui <ray.huang(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Reviewed-by: Christian König <christian.koenig(a)amd.com> Going to pick that one up for upstreaming. Thanks, Christian. > --- > drivers/gpu/drm/ttm/ttm_bo.c | 23 ++++++++++++----------- > 1 file changed, 12 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index e6bcbfe530ecc..9a03c7834b1ed 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -45,7 +45,7 @@ > > static void ttm_bo_global_kobj_release(struct kobject *kobj); > > -/** > +/* > * ttm_global_mutex - protecting the global BO state > */ > DEFINE_MUTEX(ttm_global_mutex); > @@ -278,7 +278,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, > return ret; > } > > -/** > +/* > * Call bo::reserved. > * Will release GPU memory type usage on destruction. > * This is the place to put in driver specific hooks to release > @@ -352,9 +352,10 @@ static void ttm_bo_flush_all_fences(struct ttm_buffer_object *bo) > * Must be called with lru_lock and reservation held, this function > * will drop the lru lock and optionally the reservation lock before returning. > * > - * @interruptible Any sleeps should occur interruptibly. > - * @no_wait_gpu Never wait for gpu. Return -EBUSY instead. > - * @unlock_resv Unlock the reservation lock as well. > + * @bo: The buffer object to clean-up > + * @interruptible: Any sleeps should occur interruptibly. > + * @no_wait_gpu: Never wait for gpu. Return -EBUSY instead. > + * @unlock_resv: Unlock the reservation lock as well. > */ > > static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, > @@ -420,7 +421,7 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo, > return 0; > } > > -/** > +/* > * Traverse the delayed list, and call ttm_bo_cleanup_refs on all > * encountered buffers. > */ > @@ -628,7 +629,7 @@ bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo, > } > EXPORT_SYMBOL(ttm_bo_eviction_valuable); > > -/** > +/* > * Check the target bo is allowable to be evicted or swapout, including cases: > * > * a. if share same reservation object with ctx->resv, have assumption > @@ -767,7 +768,7 @@ int ttm_mem_evict_first(struct ttm_bo_device *bdev, > return ret; > } > > -/** > +/* > * Add the last move fence to the BO and reserve a new shared slot. > */ > static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, > @@ -803,7 +804,7 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, > return 0; > } > > -/** > +/* > * Repeatedly evict memory from the LRU for @mem_type until we create enough > * space, or we've evicted everything and there isn't enough space. > */ > @@ -865,7 +866,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo, > return 0; > } > > -/** > +/* > * Creates space for memory region @mem according to its type. > * > * This function first searches for free space in compatible memory types in > @@ -1430,7 +1431,7 @@ int ttm_bo_wait(struct ttm_buffer_object *bo, > } > EXPORT_SYMBOL(ttm_bo_wait); > > -/** > +/* > * A buffer object shrink method that tries to swap out the first > * buffer object on the bo_global::swap_lru list. > */

4 years, 6 months

2
1
0 0

Re: [Linaro-mm-sig] [PATCH 40/43] drm/radeon/cik: Move 'vce_v2_0_enable_mgcg()'s prototype to shared header

by Alex Deucher

On Mon, Nov 16, 2020 at 12:38 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/vce_v2_0.c:111:6: warning: no previous prototype for ‘vce_v2_0_enable_mgcg’ [-Wmissing-prototypes] > 111 | void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable) > | ^~~~~~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/cik.c | 2 +- > drivers/gpu/drm/radeon/vce.h | 1 + > drivers/gpu/drm/radeon/vce_v2_0.c | 1 + > 3 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c > index 2af76463906ad..8b7a4f7b75766 100644 > --- a/drivers/gpu/drm/radeon/cik.c > +++ b/drivers/gpu/drm/radeon/cik.c > @@ -41,6 +41,7 @@ > #include "radeon_audio.h" > #include "radeon_ucode.h" > #include "si.h" > +#include "vce.h" > > #define SH_MEM_CONFIG_GFX_DEFAULT \ > ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED) > @@ -129,7 +130,6 @@ MODULE_FIRMWARE("radeon/mullins_rlc.bin"); > MODULE_FIRMWARE("radeon/mullins_sdma.bin"); > > static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); > -extern void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable); > static void cik_rlc_stop(struct radeon_device *rdev); > static void cik_pcie_gen3_enable(struct radeon_device *rdev); > static void cik_program_aspm(struct radeon_device *rdev); > diff --git a/drivers/gpu/drm/radeon/vce.h b/drivers/gpu/drm/radeon/vce.h > index 1eb4f5715202e..ccc9c00f0d02c 100644 > --- a/drivers/gpu/drm/radeon/vce.h > +++ b/drivers/gpu/drm/radeon/vce.h > @@ -30,5 +30,6 @@ > struct radeon_device; > > void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable); > +void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable); > > #endif /* __VCE_H__ */ > diff --git a/drivers/gpu/drm/radeon/vce_v2_0.c b/drivers/gpu/drm/radeon/vce_v2_0.c > index d6fde3659e65f..163c9bfc03da8 100644 > --- a/drivers/gpu/drm/radeon/vce_v2_0.c > +++ b/drivers/gpu/drm/radeon/vce_v2_0.c > @@ -30,6 +30,7 @@ > #include "radeon.h" > #include "radeon_asic.h" > #include "cikd.h" > +#include "vce.h" > > #define VCE_V2_0_FW_SIZE (256 * 1024) > #define VCE_V2_0_STACK_SIZE (64 * 1024) > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 38/43] drm/radeon/cik: Move 'Move 'cik_sdma_*()'s prototypes to shared header

by Alex Deucher

On Mon, Nov 16, 2020 at 12:38 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/cik_sdma.c:331:6: warning: no previous prototype for ‘cik_sdma_enable’ [-Wmissing-prototypes] > 331 | void cik_sdma_enable(struct radeon_device *rdev, bool enable) > | ^~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/cik_sdma.c:528:5: warning: no previous prototype for ‘cik_sdma_resume’ [-Wmissing-prototypes] > 528 | int cik_sdma_resume(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/cik_sdma.c:557:6: warning: no previous prototype for ‘cik_sdma_fini’ [-Wmissing-prototypes] > 557 | void cik_sdma_fini(struct radeon_device *rdev) > | ^~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/cik.c | 3 --- > drivers/gpu/drm/radeon/cik.h | 3 +++ > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c > index cef0f3111cd3a..2af76463906ad 100644 > --- a/drivers/gpu/drm/radeon/cik.c > +++ b/drivers/gpu/drm/radeon/cik.c > @@ -129,9 +129,6 @@ MODULE_FIRMWARE("radeon/mullins_rlc.bin"); > MODULE_FIRMWARE("radeon/mullins_sdma.bin"); > > static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); > -extern int cik_sdma_resume(struct radeon_device *rdev); > -extern void cik_sdma_enable(struct radeon_device *rdev, bool enable); > -extern void cik_sdma_fini(struct radeon_device *rdev); > extern void vce_v2_0_enable_mgcg(struct radeon_device *rdev, bool enable); > static void cik_rlc_stop(struct radeon_device *rdev); > static void cik_pcie_gen3_enable(struct radeon_device *rdev); > diff --git a/drivers/gpu/drm/radeon/cik.h b/drivers/gpu/drm/radeon/cik.h > index 420207d19de52..d1bf541da5923 100644 > --- a/drivers/gpu/drm/radeon/cik.h > +++ b/drivers/gpu/drm/radeon/cik.h > @@ -34,4 +34,7 @@ void cik_init_cp_pg_table(struct radeon_device *rdev); > u32 cik_get_csb_size(struct radeon_device *rdev); > void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); > > +int cik_sdma_resume(struct radeon_device *rdev); > +void cik_sdma_enable(struct radeon_device *rdev, bool enable); > +void cik_sdma_fini(struct radeon_device *rdev); > #endif /* __CIK_H__ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 31/43] drm/radeon/cik: Move 'si_*()'s prototypes to shared header

by Alex Deucher

On Mon, Nov 16, 2020 at 12:38 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/si.c:4186:6: warning: no previous prototype for ‘si_vram_gtt_location’ [-Wmissing-prototypes] > 4186 | void si_vram_gtt_location(struct radeon_device *rdev, > | ^~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/si.c:5186:6: warning: no previous prototype for ‘si_init_uvd_internal_cg’ [-Wmissing-prototypes] > 5186 | void si_init_uvd_internal_cg(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/si.c:5801:6: warning: no previous prototype for ‘si_rlc_reset’ [-Wmissing-prototypes] > 5801 | void si_rlc_reset(struct radeon_device *rdev) > | ^~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/cik.c | 4 +--- > drivers/gpu/drm/radeon/si.h | 4 ++++ > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c > index ae020ad7b3185..cef0f3111cd3a 100644 > --- a/drivers/gpu/drm/radeon/cik.c > +++ b/drivers/gpu/drm/radeon/cik.c > @@ -40,6 +40,7 @@ > #include "radeon_asic.h" > #include "radeon_audio.h" > #include "radeon_ucode.h" > +#include "si.h" > > #define SH_MEM_CONFIG_GFX_DEFAULT \ > ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED) > @@ -127,9 +128,6 @@ MODULE_FIRMWARE("radeon/mullins_mec.bin"); > MODULE_FIRMWARE("radeon/mullins_rlc.bin"); > MODULE_FIRMWARE("radeon/mullins_sdma.bin"); > > -extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); > -extern void si_rlc_reset(struct radeon_device *rdev); > -extern void si_init_uvd_internal_cg(struct radeon_device *rdev); > static u32 cik_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh); > extern int cik_sdma_resume(struct radeon_device *rdev); > extern void cik_sdma_enable(struct radeon_device *rdev, bool enable); > diff --git a/drivers/gpu/drm/radeon/si.h b/drivers/gpu/drm/radeon/si.h > index a1751ae560f02..f483a64d17050 100644 > --- a/drivers/gpu/drm/radeon/si.h > +++ b/drivers/gpu/drm/radeon/si.h > @@ -25,8 +25,12 @@ > #define __SI_H__ > > struct radeon_device; > +struct radeon_mc; > > int si_mc_load_microcode(struct radeon_device *rdev); > u32 si_gpu_check_soft_reset(struct radeon_device *rdev); > +void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); > +void si_rlc_reset(struct radeon_device *rdev); > +void si_init_uvd_internal_cg(struct radeon_device *rdev); > > #endif /* __SI_H__ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 22/43] drm/radeon/cik: Move 'r600_ih_ring_{alloc, fini}()'s prototypes to shared header

by Alex Deucher

On Mon, Nov 16, 2020 at 12:38 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/r600.c:3480:5: warning: no previous prototype for ‘r600_ih_ring_alloc’ [-Wmissing-prototypes] > 3480 | int r600_ih_ring_alloc(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/r600.c:3516:6: warning: no previous prototype for ‘r600_ih_ring_fini’ [-Wmissing-prototypes] > 3516 | void r600_ih_ring_fini(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/cik.c | 3 +-- > drivers/gpu/drm/radeon/r600.h | 2 ++ > drivers/gpu/drm/radeon/si.c | 3 +-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c > index 315c4f3df3656..980b50d046cbc 100644 > --- a/drivers/gpu/drm/radeon/cik.c > +++ b/drivers/gpu/drm/radeon/cik.c > @@ -34,6 +34,7 @@ > #include "cik_blit_shaders.h" > #include "cikd.h" > #include "clearstate_ci.h" > +#include "r600.h" > #include "radeon.h" > #include "radeon_asic.h" > #include "radeon_audio.h" > @@ -125,8 +126,6 @@ MODULE_FIRMWARE("radeon/mullins_mec.bin"); > MODULE_FIRMWARE("radeon/mullins_rlc.bin"); > MODULE_FIRMWARE("radeon/mullins_sdma.bin"); > > -extern int r600_ih_ring_alloc(struct radeon_device *rdev); > -extern void r600_ih_ring_fini(struct radeon_device *rdev); > extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); > extern void si_rlc_reset(struct radeon_device *rdev); > extern void si_init_uvd_internal_cg(struct radeon_device *rdev); > diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h > index 2a3915f0039e4..e66ef58706cd8 100644 > --- a/drivers/gpu/drm/radeon/r600.h > +++ b/drivers/gpu/drm/radeon/r600.h > @@ -31,5 +31,7 @@ > struct radeon_device; > > u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); > +int r600_ih_ring_alloc(struct radeon_device *rdev); > +void r600_ih_ring_fini(struct radeon_device *rdev); > > #endif /* __R600_H__ */ > diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c > index 45076c27d7ded..d0407145c07b5 100644 > --- a/drivers/gpu/drm/radeon/si.c > +++ b/drivers/gpu/drm/radeon/si.c > @@ -33,6 +33,7 @@ > #include "atom.h" > #include "clearstate_si.h" > #include "evergreen.h" > +#include "r600.h" > #include "radeon.h" > #include "radeon_asic.h" > #include "radeon_audio.h" > @@ -128,8 +129,6 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev); > static void si_program_aspm(struct radeon_device *rdev); > extern void sumo_rlc_fini(struct radeon_device *rdev); > extern int sumo_rlc_init(struct radeon_device *rdev); > -extern int r600_ih_ring_alloc(struct radeon_device *rdev); > -extern void r600_ih_ring_fini(struct radeon_device *rdev); > static void si_enable_gui_idle_interrupt(struct radeon_device *rdev, > bool enable); > static void si_init_pg(struct radeon_device *rdev); > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 21/43] drm/radeon/r600_dma: Move 'r600_gpu_check_soft_reset()'s prototype to shared location

by Alex Deucher

On Mon, Nov 16, 2020 at 12:38 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/r600.c:1615:5: warning: no previous prototype for ‘r600_gpu_check_soft_reset’ [-Wmissing-prototypes] > 1615 | u32 r600_gpu_check_soft_reset(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied with minor changes. Thanks! Alex > --- > drivers/gpu/drm/radeon/r600.c | 1 + > drivers/gpu/drm/radeon/r600.h | 35 +++++++++++++++++++++++++++++++ > drivers/gpu/drm/radeon/r600_dma.c | 3 +-- > 3 files changed, 37 insertions(+), 2 deletions(-) > create mode 100644 drivers/gpu/drm/radeon/r600.h > > diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c > index f09b6dc5cbeb3..94e8815e5067d 100644 > --- a/drivers/gpu/drm/radeon/r600.c > +++ b/drivers/gpu/drm/radeon/r600.c > @@ -39,6 +39,7 @@ > > #include "atom.h" > #include "avivod.h" > +#include "r600.h" > #include "r600d.h" > #include "rv770.h" > #include "radeon.h" > diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h > new file mode 100644 > index 0000000000000..2a3915f0039e4 > --- /dev/null > +++ b/drivers/gpu/drm/radeon/r600.h > @@ -0,0 +1,35 @@ > +/* r600.h -- Private header for radeon driver -*- linux-c -*- > + * > + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. > + * Copyright 2000 VA Linux Systems, Inc., Fremont, California. > + * All rights reserved. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + */ > + > +#ifndef __R600_H__ > +#define __R600_H__ > + > +struct radeon_device; > + > +u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); > + > +#endif /* __R600_H__ */ > diff --git a/drivers/gpu/drm/radeon/r600_dma.c b/drivers/gpu/drm/radeon/r600_dma.c > index af6c0da45f28a..89ca2738c5d4c 100644 > --- a/drivers/gpu/drm/radeon/r600_dma.c > +++ b/drivers/gpu/drm/radeon/r600_dma.c > @@ -24,10 +24,9 @@ > > #include "radeon.h" > #include "radeon_asic.h" > +#include "r600.h" > #include "r600d.h" > > -u32 r600_gpu_check_soft_reset(struct radeon_device *rdev); > - > /* > * DMA > * Starting with R600, the GPU has an asynchronous > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 10/43] drm/radeon/radeon_pm: Move 'radeon_pm_acpi_event_handler' prototype into shared header

by Alex Deucher

On Mon, Nov 16, 2020 at 12:30 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/radeon_pm.c:74:6: warning: no previous prototype for ‘radeon_pm_acpi_event_handler’ [-Wmissing-prototypes] > 74 | void radeon_pm_acpi_event_handler(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied with minor changes. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_acpi.c | 3 +-- > drivers/gpu/drm/radeon/radeon_pm.c | 1 + > drivers/gpu/drm/radeon/radeon_pm.h | 33 ++++++++++++++++++++++++++++ > 3 files changed, 35 insertions(+), 2 deletions(-) > create mode 100644 drivers/gpu/drm/radeon/radeon_pm.h > > diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c > index 6cf1645e7a1a8..1baef7b493def 100644 > --- a/drivers/gpu/drm/radeon/radeon_acpi.c > +++ b/drivers/gpu/drm/radeon/radeon_acpi.c > @@ -36,6 +36,7 @@ > #include "atom.h" > #include "radeon.h" > #include "radeon_acpi.h" > +#include "radeon_pm.h" > > #if defined(CONFIG_VGA_SWITCHEROO) > bool radeon_atpx_dgpu_req_power_for_displays(void); > @@ -45,8 +46,6 @@ static inline bool radeon_atpx_dgpu_req_power_for_displays(void) { return false; > > #define ACPI_AC_CLASS "ac_adapter" > > -extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev); > - > struct atif_verify_interface { > u16 size; /* structure size in bytes (includes size field) */ > u16 version; /* version */ > diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c > index 65d172b13e065..1995dad59dd09 100644 > --- a/drivers/gpu/drm/radeon/radeon_pm.c > +++ b/drivers/gpu/drm/radeon/radeon_pm.c > @@ -33,6 +33,7 @@ > #include "avivod.h" > #include "r600_dpm.h" > #include "radeon.h" > +#include "radeon_pm.h" > > #define RADEON_IDLE_LOOP_MS 100 > #define RADEON_RECLOCK_DELAY_MS 200 > diff --git a/drivers/gpu/drm/radeon/radeon_pm.h b/drivers/gpu/drm/radeon/radeon_pm.h > new file mode 100644 > index 0000000000000..5ef147785e815 > --- /dev/null > +++ b/drivers/gpu/drm/radeon/radeon_pm.h > @@ -0,0 +1,33 @@ > +/* radeon_pm.h -- Private header for radeon driver -*- linux-c -*- > + * > + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. > + * Copyright 2000 VA Linux Systems, Inc., Fremont, California. > + * All rights reserved. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + */ > + > +#ifndef __RADEON_PM_H__ > +#define __RADEON_PM_H__ > + > +void radeon_pm_acpi_event_handler(struct radeon_device *rdev); > + > +#endif /* __RADEON_PM_H__ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 07/43] drm/radeon/radeon_legacy_encoders: Move 'radeon_add_legacy_encoder's prototype to shared location

by Alex Deucher

On Mon, Nov 16, 2020 at 12:30 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/radeon_legacy_encoders.c:1746:1: warning: no previous prototype for ‘radeon_add_legacy_encoder’ [-Wmissing-prototypes] > 1746 | radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t supported_device) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_atombios.c | 6 +----- > drivers/gpu/drm/radeon/radeon_combios.c | 6 +----- > drivers/gpu/drm/radeon/radeon_legacy_encoders.h | 2 ++ > 3 files changed, 4 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c > index 71bf2ed172697..cc80651b25773 100644 > --- a/drivers/gpu/drm/radeon/radeon_atombios.c > +++ b/drivers/gpu/drm/radeon/radeon_atombios.c > @@ -35,16 +35,12 @@ > #include "atom-bits.h" > #include "radeon_asic.h" > #include "radeon_atombios.h" > +#include "radeon_legacy_encoders.h" > > extern void > radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, > uint32_t supported_device, u16 caps); > > -/* from radeon_legacy_encoder.c */ > -extern void > -radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, > - uint32_t supported_device); > - > union atom_supported_devices { > struct _ATOM_SUPPORTED_DEVICES_INFO info; > struct _ATOM_SUPPORTED_DEVICES_INFO_2 info_2; > diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c > index d3c04df7e75d7..ff2135059c071 100644 > --- a/drivers/gpu/drm/radeon/radeon_combios.c > +++ b/drivers/gpu/drm/radeon/radeon_combios.c > @@ -31,6 +31,7 @@ > #include <drm/radeon_drm.h> > > #include "radeon.h" > +#include "radeon_legacy_encoders.h" > #include "atom.h" > > #ifdef CONFIG_PPC_PMAC > @@ -40,11 +41,6 @@ > #include <asm/prom.h> > #endif /* CONFIG_PPC_PMAC */ > > -/* from radeon_legacy_encoder.c */ > -extern void > -radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, > - uint32_t supported_device); > - > /* old legacy ATI BIOS routines */ > > /* COMBIOS table offsets */ > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.h b/drivers/gpu/drm/radeon/radeon_legacy_encoders.h > index a80b387559d4d..f4c7432267e67 100644 > --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.h > +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.h > @@ -30,5 +30,7 @@ > > void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, > struct drm_connector *drm_connector); > +void radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, > + uint32_t supported_device); > > #endif /* __RADEON_LEGACY_ENCODERS_H__ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 06/43] drm/radeon/radeon_legacy_encoders: Move 'radeon_add_legacy_encoder' prototype to shared header

by Alex Deucher

On Mon, Nov 16, 2020 at 12:30 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/radeon_legacy_encoders.c:1745:1: warning: no previous prototype for ‘radeon_add_legacy_encoder’ [-Wmissing-prototypes] > 1745 | radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t supported_device) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_encoders.c | 4 +-- > .../gpu/drm/radeon/radeon_legacy_encoders.c | 1 + > .../gpu/drm/radeon/radeon_legacy_encoders.h | 34 +++++++++++++++++++ > 3 files changed, 36 insertions(+), 3 deletions(-) > create mode 100644 drivers/gpu/drm/radeon/radeon_legacy_encoders.h > > diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c > index ced022fae19d7..b60a373d3ead3 100644 > --- a/drivers/gpu/drm/radeon/radeon_encoders.c > +++ b/drivers/gpu/drm/radeon/radeon_encoders.c > @@ -31,11 +31,9 @@ > #include <drm/radeon_drm.h> > > #include "radeon.h" > +#include "radeon_legacy_encoders.h" > #include "atom.h" > > -extern void > -radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, > - struct drm_connector *drm_connector); > extern void > radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, > struct drm_connector *drm_connector); > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c > index 44d060f75318e..e64fd0ce67070 100644 > --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c > +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c > @@ -35,6 +35,7 @@ > > #include "radeon.h" > #include "radeon_asic.h" > +#include "radeon_legacy_encoders.h" > #include "atom.h" > #ifdef CONFIG_PMAC_BACKLIGHT > #include <asm/backlight.h> > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.h b/drivers/gpu/drm/radeon/radeon_legacy_encoders.h > new file mode 100644 > index 0000000000000..a80b387559d4d > --- /dev/null > +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.h > @@ -0,0 +1,34 @@ > +/* radeon_legacy_encoders.h -- Private header for radeon driver -*- linux-c -*- > + * > + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. > + * Copyright 2000 VA Linux Systems, Inc., Fremont, California. > + * All rights reserved. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + */ > + > +#ifndef __RADEON_LEGACY_ENCODERS_H__ > +#define __RADEON_LEGACY_ENCODERS_H__ > + > +void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, > + struct drm_connector *drm_connector); > + > +#endif /* __RADEON_LEGACY_ENCODERS_H__ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 05/43] drm/radeon: Move radeon_ttm{init, fini} to shared location

by Alex Deucher

On Mon, Nov 16, 2020 at 12:30 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/radeon_ttm.c: At top level: > drivers/gpu/drm/radeon/radeon_ttm.c:817:5: warning: no previous prototype for ‘radeon_ttm_init’ [-Wmissing-prototypes] > 817 | int radeon_ttm_init(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/radeon_ttm.c:878:6: warning: no previous prototype for ‘radeon_ttm_fini’ [-Wmissing-prototypes] > 878 | void radeon_ttm_fini(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_object.c | 3 +-- > drivers/gpu/drm/radeon/radeon_ttm.c | 1 + > drivers/gpu/drm/radeon/radeon_ttm.h | 36 ++++++++++++++++++++++++++ > 3 files changed, 38 insertions(+), 2 deletions(-) > create mode 100644 drivers/gpu/drm/radeon/radeon_ttm.h > > diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c > index ab81e35cb0606..8bc5ad1d65857 100644 > --- a/drivers/gpu/drm/radeon/radeon_object.c > +++ b/drivers/gpu/drm/radeon/radeon_object.c > @@ -40,9 +40,8 @@ > > #include "radeon.h" > #include "radeon_trace.h" > +#include "radeon_ttm.h" > > -int radeon_ttm_init(struct radeon_device *rdev); > -void radeon_ttm_fini(struct radeon_device *rdev); > static void radeon_bo_clear_surface_reg(struct radeon_bo *bo); > > /* > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c > index 2939e71ceb700..28b300ed200ea 100644 > --- a/drivers/gpu/drm/radeon/radeon_ttm.c > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c > @@ -51,6 +51,7 @@ > > #include "radeon_reg.h" > #include "radeon.h" > +#include "radeon_ttm.h" > > static int radeon_ttm_debugfs_init(struct radeon_device *rdev); > static void radeon_ttm_debugfs_fini(struct radeon_device *rdev); > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.h b/drivers/gpu/drm/radeon/radeon_ttm.h > new file mode 100644 > index 0000000000000..91ea7141bc812 > --- /dev/null > +++ b/drivers/gpu/drm/radeon/radeon_ttm.h > @@ -0,0 +1,36 @@ > +/* radeon_ttm.h -- Private header for radeon driver -*- linux-c -*- > + * > + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. > + * Copyright 2000 VA Linux Systems, Inc., Fremont, California. > + * All rights reserved. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + */ > + > +#ifndef __RADEON_TTM_H__ > +#define __RADEON_TTM_H__ > + > +struct radeon_device; > + > +int radeon_ttm_init(struct radeon_device *rdev); > +void radeon_ttm_fini(struct radeon_device *rdev); > + > +#endif /* __RADEON_TTM_H__ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 03/43] drm/radeon/radeon_kms: Move 'radeon_*_kms' prototypes to shared header

by Alex Deucher

On Mon, Nov 16, 2020 at 12:30 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/radeon_kms.c:756:5: warning: no previous prototype for ‘radeon_get_vblank_counter_kms’ [-Wmissing-prototypes] > 756 | u32 radeon_get_vblank_counter_kms(struct drm_crtc *crtc) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/radeon_kms.c:826:5: warning: no previous prototype for ‘radeon_enable_vblank_kms’ [-Wmissing-prototypes] > 826 | int radeon_enable_vblank_kms(struct drm_crtc *crtc) > | ^~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/radeon_kms.c:853:6: warning: no previous prototype for ‘radeon_disable_vblank_kms’ [-Wmissing-prototypes] > 853 | void radeon_disable_vblank_kms(struct drm_crtc *crtc) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_display.c | 1 + > drivers/gpu/drm/radeon/radeon_kms.c | 1 + > drivers/gpu/drm/radeon/radeon_kms.h | 35 +++++++++++++++++++++++++ > 3 files changed, 37 insertions(+) > create mode 100644 drivers/gpu/drm/radeon/radeon_kms.h > > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index eb0d4cb95f0a6..3a6fedad002d7 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -44,6 +44,7 @@ > > #include "atom.h" > #include "radeon.h" > +#include "radeon_kms.h" > > static void avivo_crtc_load_lut(struct drm_crtc *crtc) > { > diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c > index 3d31c04e4b3db..001940bca90a6 100644 > --- a/drivers/gpu/drm/radeon/radeon_kms.c > +++ b/drivers/gpu/drm/radeon/radeon_kms.c > @@ -41,6 +41,7 @@ > #include "radeon.h" > #include "radeon_asic.h" > #include "radeon_drv.h" > +#include "radeon_kms.h" > > #if defined(CONFIG_VGA_SWITCHEROO) > bool radeon_has_atpx(void); > diff --git a/drivers/gpu/drm/radeon/radeon_kms.h b/drivers/gpu/drm/radeon/radeon_kms.h > new file mode 100644 > index 0000000000000..36e73cea92154 > --- /dev/null > +++ b/drivers/gpu/drm/radeon/radeon_kms.h > @@ -0,0 +1,35 @@ > +/* radeon_kms.h -- Private header for radeon driver -*- linux-c -*- > + * > + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. > + * Copyright 2000 VA Linux Systems, Inc., Fremont, California. > + * All rights reserved. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + */ > + > +#ifndef __RADEON_KMS_H__ > +#define __RADEON_KMS_H__ > + > +u32 radeon_get_vblank_counter_kms(struct drm_crtc *crtc); > +int radeon_enable_vblank_kms(struct drm_crtc *crtc); > +void radeon_disable_vblank_kms(struct drm_crtc *crtc); > + > +#endif /* __RADEON_KMS_H__ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 02/43] drm/radeon/radeon: Move prototype into shared header

by Alex Deucher

On Mon, Nov 16, 2020 at 12:30 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Unfortunately, a suitable one didn't already exist. > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/radeon_device.c:637:6: warning: no previous prototype for ‘radeon_device_is_virtual’ [-Wmissing-prototypes] > 637 | bool radeon_device_is_virtual(void) > | ^~~~~~~~~~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_device.c | 1 + > drivers/gpu/drm/radeon/radeon_device.h | 32 ++++++++++++++++++++++++++ > drivers/gpu/drm/radeon/radeon_drv.c | 3 +-- > 3 files changed, 34 insertions(+), 2 deletions(-) > create mode 100644 drivers/gpu/drm/radeon/radeon_device.h > > diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c > index 7f384ffe848a7..ad572f965190b 100644 > --- a/drivers/gpu/drm/radeon/radeon_device.c > +++ b/drivers/gpu/drm/radeon/radeon_device.c > @@ -42,6 +42,7 @@ > #include <drm/drm_probe_helper.h> > #include <drm/radeon_drm.h> > > +#include "radeon_device.h" > #include "radeon_reg.h" > #include "radeon.h" > #include "atom.h" > diff --git a/drivers/gpu/drm/radeon/radeon_device.h b/drivers/gpu/drm/radeon/radeon_device.h > new file mode 100644 > index 0000000000000..3112b99ae36f1 > --- /dev/null > +++ b/drivers/gpu/drm/radeon/radeon_device.h > @@ -0,0 +1,32 @@ > +/* radeon_device.h -- Private header for radeon device -*- linux-c -*- > + * > + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. > + * Copyright 2000 VA Linux Systems, Inc., Fremont, California. > + * All rights reserved. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + */ > + > +#ifndef __RADEON_DEVICE_H__ > +#define __RADEON_DEVICE_H__ > + > +bool radeon_device_is_virtual(void); > + > +#endif /* __RADEON_DEVICE_H__ */ > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index f813eb5e140dd..536b246b9a6aa 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -52,6 +52,7 @@ > > #include "radeon_drv.h" > #include "radeon.h" > +#include "radeon_device.h" > > /* > * KMS wrapper. > @@ -293,8 +294,6 @@ MODULE_DEVICE_TABLE(pci, pciidlist); > > static const struct drm_driver kms_driver; > > -bool radeon_device_is_virtual(void); > - > static int radeon_pci_probe(struct pci_dev *pdev, > const struct pci_device_id *ent) > { > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 40/40] drm/amd/amdgpu/gfx_v7_0: Remove unused struct definition

by Alex Deucher

On Fri, Nov 13, 2020 at 8:50 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:5211:45: warning: ‘gfx_v7_0_ip_block’ defined but not used [-Wunused-const-variable=] > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 9 --------- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h | 1 - > 2 files changed, 10 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > index cb07bc21dcbe5..04e1e92f5f3cf 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > @@ -5208,15 +5208,6 @@ static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev) > cu_info->lds_size = 64; > } > > -static const struct amdgpu_ip_block_version gfx_v7_0_ip_block = > -{ > - .type = AMD_IP_BLOCK_TYPE_GFX, > - .major = 7, > - .minor = 0, > - .rev = 0, > - .funcs = &gfx_v7_0_ip_funcs, > -}; > - > const struct amdgpu_ip_block_version gfx_v7_1_ip_block = > { > .type = AMD_IP_BLOCK_TYPE_GFX, > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h > index 6fb9c1524691f..eedce7d007f1d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h > @@ -24,7 +24,6 @@ > #ifndef __GFX_V7_0_H__ > #define __GFX_V7_0_H__ > > -extern const struct amdgpu_ip_block_version gfx_v7_0_ip_block; > extern const struct amdgpu_ip_block_version gfx_v7_1_ip_block; > extern const struct amdgpu_ip_block_version gfx_v7_2_ip_block; > extern const struct amdgpu_ip_block_version gfx_v7_3_ip_block; > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 31/40] drm/amd/amdgpu/amdgpu_vm_sdma: Fix 'amdgpu_vm_sdma_prepare()'s doc-rot

by Alex Deucher

On Fri, Nov 13, 2020 at 8:50 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c:63: warning: Function parameter or member 'resv' not described in 'amdgpu_vm_sdma_prepare' > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c:63: warning: Function parameter or member 'sync_mode' not described in 'amdgpu_vm_sdma_prepare' > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c:63: warning: Excess function parameter 'owner' description in 'amdgpu_vm_sdma_prepare' > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c:63: warning: Excess function parameter 'exclusive' description in 'amdgpu_vm_sdma_prepare' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c > index db790574dc2e8..a83a646759c58 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c > @@ -51,8 +51,8 @@ static int amdgpu_vm_sdma_map_table(struct amdgpu_bo *table) > * amdgpu_vm_sdma_prepare - prepare SDMA command submission > * > * @p: see amdgpu_vm_update_params definition > - * @owner: owner we need to sync to > - * @exclusive: exclusive move fence we need to sync to > + * @resv: reservation object with embedded fence > + * @sync_mode: synchronization mode > * > * Returns: > * Negativ errno, 0 for success. > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 30/40] drm/amd/amdgpu/amdgpu_vm_cpu: Fix 'amdgpu_vm_cpu_prepare()'s doc-rot

by Alex Deucher

On Fri, Nov 13, 2020 at 8:50 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c:50: warning: Function parameter or member 'resv' not described in 'amdgpu_vm_cpu_prepare' > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c:50: warning: Function parameter or member 'sync_mode' not described in 'amdgpu_vm_cpu_prepare' > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c:50: warning: Excess function parameter 'owner' description in 'amdgpu_vm_cpu_prepare' > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c:50: warning: Excess function parameter 'exclusive' description in 'amdgpu_vm_cpu_prepare' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: Felix Kuehling <Felix.Kuehling(a)amd.com> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c > index 0786e7555554b..ac45d9c7a4e94 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c > @@ -38,8 +38,8 @@ static int amdgpu_vm_cpu_map_table(struct amdgpu_bo *table) > * amdgpu_vm_cpu_prepare - prepare page table update with the CPU > * > * @p: see amdgpu_vm_update_params definition > - * @owner: owner we need to sync to > - * @exclusive: exclusive move fence we need to sync to > + * @resv: reservation object with embedded fence > + * @sync_mode: synchronization mode > * > * Returns: > * Negativ errno, 0 for success. > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 25/40] drm/amd/amdgpu/amdgpu_debugfs: Demote obvious abuse of kernel-doc formatting

by Alex Deucher

On Fri, Nov 13, 2020 at 8:50 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:308: warning: Function parameter or member 'f' not described in 'amdgpu_debugfs_regs_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:308: warning: Function parameter or member 'buf' not described in 'amdgpu_debugfs_regs_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:308: warning: Function parameter or member 'size' not described in 'amdgpu_debugfs_regs_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:308: warning: Function parameter or member 'pos' not described in 'amdgpu_debugfs_regs_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:317: warning: Function parameter or member 'f' not described in 'amdgpu_debugfs_regs_write' > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:317: warning: Function parameter or member 'buf' not described in 'amdgpu_debugfs_regs_write' > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:317: warning: Function parameter or member 'size' not described in 'amdgpu_debugfs_regs_write' > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:317: warning: Function parameter or member 'pos' not described in 'amdgpu_debugfs_regs_write' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c > index 5c1f3725c7410..a6667a2ca0db3 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c > @@ -300,7 +300,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, > return result; > } > > -/** > +/* > * amdgpu_debugfs_regs_read - Callback for reading MMIO registers > */ > static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, > @@ -309,7 +309,7 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, > return amdgpu_debugfs_process_reg_op(true, f, buf, size, pos); > } > > -/** > +/* > * amdgpu_debugfs_regs_write - Callback for writing MMIO registers > */ > static ssize_t amdgpu_debugfs_regs_write(struct file *f, const char __user *buf, > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 24/40] drm/amd/amdgpu/amdgpu_ids: Supply missing docs for 'id' and 'vmhub'

by Alex Deucher

On Fri, Nov 13, 2020 at 8:50 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c:271: warning: Function parameter or member 'id' not described in 'amdgpu_vmid_grab_reserved' > drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c:523: warning: Function parameter or member 'vmhub' not described in 'amdgpu_vmid_reset' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: Felix Kuehling <Felix.Kuehling(a)amd.com> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c > index 6e9a9e5dbea07..61a1331f482c5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c > @@ -259,6 +259,7 @@ static int amdgpu_vmid_grab_idle(struct amdgpu_vm *vm, > * @sync: sync object where we add dependencies > * @fence: fence protecting ID from reuse > * @job: job who wants to use the VMID > + * @id: resulting VMID > * > * Try to assign a reserved VMID. > */ > @@ -514,6 +515,7 @@ void amdgpu_vmid_free_reserved(struct amdgpu_device *adev, > * amdgpu_vmid_reset - reset VMID to zero > * > * @adev: amdgpu device structure > + * @vmhub: vmhub type > * @vmid: vmid number to use > * > * Reset saved GDW, GWS and OA to force switch on next flush. > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 16/40] drm/amd/amdgpu/amdgpu_sync: Fix misnamed, missing and extra param descriptions

by Alex Deucher

On Fri, Nov 13, 2020 at 8:50 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c:86: warning: Function parameter or member 'f' not described in 'amdgpu_sync_get_owner' > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c:86: warning: Excess function parameter 'fence' description in 'amdgpu_sync_get_owner' > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c:182: warning: Excess function parameter 'adev' description in 'amdgpu_sync_vm_fence' > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c:203: warning: Function parameter or member 'adev' not described in 'amdgpu_sync_resv' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: Felix Kuehling <Felix.Kuehling(a)amd.com> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c > index 8ea6c49529e7d..4e558632a5d2b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c > @@ -78,7 +78,7 @@ static bool amdgpu_sync_same_dev(struct amdgpu_device *adev, > /** > * amdgpu_sync_get_owner - extract the owner of a fence > * > - * @fence: fence get the owner from > + * @f: fence get the owner from > * > * Extract who originally created the fence. > */ > @@ -172,7 +172,6 @@ int amdgpu_sync_fence(struct amdgpu_sync *sync, struct dma_fence *f) > /** > * amdgpu_sync_vm_fence - remember to sync to this VM fence > * > - * @adev: amdgpu device > * @sync: sync object to add fence to > * @fence: the VM fence to add > * > @@ -190,6 +189,7 @@ int amdgpu_sync_vm_fence(struct amdgpu_sync *sync, struct dma_fence *fence) > /** > * amdgpu_sync_resv - sync to a reservation object > * > + * @adev: amdgpu device > * @sync: sync object to add fences from reservation object to > * @resv: reservation object with embedded fence > * @mode: how owner affects which fences we sync to > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 08/40] drm/amd/amdgpu/amdgpu_ib: Fix some incorrect/incomplete function documentation

by Alex Deucher

On Fri, Nov 13, 2020 at 8:50 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c:66: warning: Function parameter or member 'adev' not described in 'amdgpu_ib_get' > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c:66: warning: Function parameter or member 'vm' not described in 'amdgpu_ib_get' > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c:66: warning: Function parameter or member 'pool_type' not described in 'amdgpu_ib_get' > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c:66: warning: Excess function parameter 'ring' description in 'amdgpu_ib_get' > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c:125: warning: Function parameter or member 'ring' not described in 'amdgpu_ib_schedule' > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c:125: warning: Function parameter or member 'job' not described in 'amdgpu_ib_schedule' > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c:125: warning: Excess function parameter 'adev' description in 'amdgpu_ib_schedule' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c > index 2f53fa0ae9a62..c69af9b86cc60 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c > @@ -52,8 +52,10 @@ > /** > * amdgpu_ib_get - request an IB (Indirect Buffer) > * > - * @ring: ring index the IB is associated with > + * @adev: amdgpu_device pointer > + * @vm: amdgpu_vm pointer > * @size: requested IB size > + * @pool_type: IB pool type (delayed, immediate, direct) > * @ib: IB object returned > * > * Request an IB (all asics). IBs are allocated using the > @@ -101,7 +103,7 @@ void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, > /** > * amdgpu_ib_schedule - schedule an IB (Indirect Buffer) on the ring > * > - * @adev: amdgpu_device pointer > + * @ring: ring index the IB is associated with > * @num_ibs: number of IBs to schedule > * @ibs: IB objects to schedule > * @f: fence created during this submission > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 05/40] drm/amd/amdgpu/amdgpu_ring: Fix misnaming of param 'max_dw'

by Alex Deucher

On Fri, Nov 13, 2020 at 8:50 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:168: warning: Function parameter or member 'max_dw' not described in 'amdgpu_ring_init' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:168: warning: Excess function parameter 'max_ndw' description in 'amdgpu_ring_init' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c > index a23b2079696a1..1a612f51ecd9e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c > @@ -154,7 +154,7 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring) > * > * @adev: amdgpu_device pointer > * @ring: amdgpu_ring structure holding ring information > - * @max_ndw: maximum number of dw for ring alloc > + * @max_dw: maximum number of dw for ring alloc > * @irq_src: interrupt source to use for this ring > * @irq_type: interrupt type to use for this ring > * @hw_prio: ring priority (NORMAL/HIGH) > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 00/19] [Set 2] Rid W=1 warnings from GPU

by Alex Deucher

On Fri, Nov 13, 2020 at 2:19 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > On Fri, 06 Nov 2020, Lee Jones wrote: > > > This set is part of a larger effort attempting to clean-up W=1 > > kernel builds, which are currently overwhelmingly riddled with > > niggly little warnings. > > > > There are 5000 warnings to work through. It will take a couple more > > sets. Although, ("drm/amd/display/dc/basics/fixpt31_32: Move > > variables to where they're used") does take care of 2000 of them! > > > > Lee Jones (19): > > drm/ttm/ttm_range_manager: Demote non-conformant kernel-doc header > > drm/r128/ati_pcigart: Source file headers are not good candidates for > > kernel-doc > > drm/selftests/test-drm_dp_mst_helper: Move > > 'sideband_msg_req_encode_decode' onto the heap > > drm/mga/mga_dma: Demote kernel-doc abusers to standard comment blocks > > drm/mga/mga_state: Remove unused variable 'buf_priv' > > drm/radeon/atom: Move prototype into shared location > > drm/radeon/radeon_kms: Include header containing our own prototypes > > drm/omapdrm/omap_gem: Fix misnamed and missing parameter descriptions > > drm/omapdrm/omap_dmm_tiler: Demote abusive use of kernel-doc format > > drm/radeon/radeon: Move prototype into shared header > > drm/radeon/radeon_drv: Source file headers are not good candidates for > > kernel-doc > > drm/amd/display/dc/basics/fixpt31_32: Move variables to where they're > > used > > drm/radeon/radeon_drv: Move prototypes to a shared headerfile > > drm/amd/amdgpu/amdgpu_device: Provide documentation for 'reg_addr' > > params > > drm/radeon: Move prototypes to shared header > > drm/amd/amdgpu/amdgpu_kms: Remove 'struct drm_amdgpu_info_device > > dev_info' from the stack > > drm/radeon/radeon_kms: Fix misnaming of 'radeon_info_ioctl's dev param > > drm/radeon/atombios_crtc: Remove description of non-existent function > > param 'encoder' > > drm/v3d/v3d_drv: Remove unused static variable 'v3d_v3d_pm_ops' > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 + > > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 104 +++++++++--------- > > .../drm/amd/display/dc/basics/fixpt31_32.c | 5 + > > .../gpu/drm/amd/display/include/fixed31_32.h | 6 - > > drivers/gpu/drm/mga/mga_dma.c | 10 +- > > drivers/gpu/drm/mga/mga_state.c | 2 - > > drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +- > > drivers/gpu/drm/omapdrm/omap_gem.c | 3 +- > > drivers/gpu/drm/r128/ati_pcigart.c | 2 +- > > drivers/gpu/drm/radeon/atom.h | 6 + > > drivers/gpu/drm/radeon/atombios_crtc.c | 1 - > > drivers/gpu/drm/radeon/atombios_encoders.c | 4 - > > drivers/gpu/drm/radeon/radeon.h | 6 + > > drivers/gpu/drm/radeon/radeon_device.c | 1 + > > drivers/gpu/drm/radeon/radeon_device.h | 32 ++++++ > > drivers/gpu/drm/radeon/radeon_display.c | 4 - > > drivers/gpu/drm/radeon/radeon_drv.c | 11 +- > > drivers/gpu/drm/radeon/radeon_drv.h | 7 ++ > > drivers/gpu/drm/radeon/radeon_kms.c | 3 +- > > .../drm/selftests/test-drm_dp_mst_helper.c | 11 +- > > drivers/gpu/drm/ttm/ttm_range_manager.c | 2 +- > > drivers/gpu/drm/v3d/v3d_drv.c | 36 ------ > > 22 files changed, 138 insertions(+), 126 deletions(-) > > create mode 100644 drivers/gpu/drm/radeon/radeon_device.h > > Still no Radeon patches in today's -next. > > I really wanted to have had this set rebased by now. > > How long do they take to peculate through? Usually a day or two, but I was swamped the last couple of days. I pushed an updated -next branch today: https://cgit.freedesktop.org/~agd5f/linux/log/?h=drm-next Alex > > -- > Lee Jones [李琼斯] > Senior Technical Lead - Developer Services > Linaro.org │ Open source software for Arm SoCs > Follow Linaro: Facebook | Twitter | Blog > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 19/30] drm/amd/amdgpu/amdgpu_cs: Add a couple of missing function param descriptions

by Alex Deucher

On Thu, Nov 12, 2020 at 2:07 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:685: warning: Function parameter or member 'backoff' not described in 'amdgpu_cs_parser_fini' > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1655: warning: Function parameter or member 'map' not described in 'amdgpu_cs_find_mapping' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: Jerome Glisse <glisse(a)freedesktop.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > index 8d2878e950dab..594a0108e90fa 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > @@ -676,6 +676,7 @@ static int amdgpu_cs_sync_rings(struct amdgpu_cs_parser *p) > * cs_parser_fini() - clean parser states > * @parser: parser structure holding parsing context. > * @error: error number > + * @backoff: indicator to backoff the reservation > * > * If error is set than unvalidate buffer, otherwise just free memory > * used by parsing context. > @@ -1644,6 +1645,7 @@ int amdgpu_cs_wait_fences_ioctl(struct drm_device *dev, void *data, > * @parser: command submission parser context > * @addr: VM address > * @bo: resulting BO of the mapping found > + * @map: Placeholder to return found BO mapping > * > * Search the buffer objects in the command submission context for a certain > * virtual memory address. Returns allocation structure when found, NULL > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 15/30] drm/amd/amdgpu/amdgpu_display: Remove pointless header

by Alex Deucher

On Thu, Nov 12, 2020 at 2:01 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > It seems only to repeat the function name. > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c:450: warning: Function parameter or member 'amdgpu_connector' not described in 'amdgpu_display_ddc_probe' > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c:450: warning: Function parameter or member 'use_aux' not described in 'amdgpu_display_ddc_probe' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: report to <xorg-driver-ati(a)lists.x.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index 0b134598b3a65..f4de4b41adcfd 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -441,10 +441,6 @@ void amdgpu_display_print_display_setup(struct drm_device *dev) > drm_connector_list_iter_end(&iter); > } > > -/** > - * amdgpu_display_ddc_probe > - * > - */ > bool amdgpu_display_ddc_probe(struct amdgpu_connector *amdgpu_connector, > bool use_aux) > { > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 14/30] drm/amd/amdgpu/amdgpu_ring: Fix a bunch of function misdocumentation

by Alex Deucher

On Thu, Nov 12, 2020 at 2:01 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:63: warning: Excess function parameter 'adev' description in 'amdgpu_ring_alloc' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:122: warning: Excess function parameter 'adev' description in 'amdgpu_ring_commit' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:167: warning: Function parameter or member 'max_dw' not described in 'amdgpu_ring_init' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:167: warning: Function parameter or member 'irq_src' not described in 'amdgpu_ring_init' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:167: warning: Function parameter or member 'irq_type' not described in 'amdgpu_ring_init' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:167: warning: Function parameter or member 'hw_prio' not described in 'amdgpu_ring_init' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:167: warning: Excess function parameter 'max_ndw' description in 'amdgpu_ring_init' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:167: warning: Excess function parameter 'nop' description in 'amdgpu_ring_init' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:285: warning: Excess function parameter 'adev' description in 'amdgpu_ring_fini' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:325: warning: Function parameter or member 'ring' not described in 'amdgpu_ring_emit_reg_write_reg_wait_helper' > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c:325: warning: Excess function parameter 'adev' description in 'amdgpu_ring_emit_reg_write_reg_wait_helper' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c > index 2697b250dc326..a23b2079696a1 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c > @@ -52,7 +52,6 @@ > /** > * amdgpu_ring_alloc - allocate space on the ring buffer > * > - * @adev: amdgpu_device pointer > * @ring: amdgpu_ring structure holding ring information > * @ndw: number of dwords to allocate in the ring buffer > * > @@ -95,7 +94,8 @@ void amdgpu_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) > amdgpu_ring_write(ring, ring->funcs->nop); > } > > -/** amdgpu_ring_generic_pad_ib - pad IB with NOP packets > +/** > + * amdgpu_ring_generic_pad_ib - pad IB with NOP packets > * > * @ring: amdgpu_ring structure holding ring information > * @ib: IB to add NOP packets to > @@ -112,7 +112,6 @@ void amdgpu_ring_generic_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) > * amdgpu_ring_commit - tell the GPU to execute the new > * commands on the ring buffer > * > - * @adev: amdgpu_device pointer > * @ring: amdgpu_ring structure holding ring information > * > * Update the wptr (write pointer) to tell the GPU to > @@ -156,7 +155,9 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring) > * @adev: amdgpu_device pointer > * @ring: amdgpu_ring structure holding ring information > * @max_ndw: maximum number of dw for ring alloc > - * @nop: nop packet for this ring > + * @irq_src: interrupt source to use for this ring > + * @irq_type: interrupt type to use for this ring > + * @hw_prio: ring priority (NORMAL/HIGH) > * > * Initialize the driver information for the selected ring (all asics). > * Returns 0 on success, error on failure. > @@ -276,7 +277,6 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, > /** > * amdgpu_ring_fini - tear down the driver ring struct. > * > - * @adev: amdgpu_device pointer > * @ring: amdgpu_ring structure holding ring information > * > * Tear down the driver information for the selected ring (all asics). > @@ -310,7 +310,7 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring) > /** > * amdgpu_ring_emit_reg_write_reg_wait_helper - ring helper > * > - * @adev: amdgpu_device pointer > + * @ring: ring to write to > * @reg0: register to write > * @reg1: register to wait on > * @ref: reference value to write/wait on > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

Re: [Linaro-mm-sig] [PATCH 12/30] drm/amd/amdgpu/amdgpu_ttm: Demote non-conformant kernel-doc headers, fix slightly lacking ones

by Alex Deucher

On Thu, Nov 12, 2020 at 2:01 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:464: warning: Function parameter or member 'bo' not described in 'amdgpu_move_blit' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:464: warning: Function parameter or member 'evict' not described in 'amdgpu_move_blit' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:464: warning: Function parameter or member 'new_mem' not described in 'amdgpu_move_blit' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:464: warning: Function parameter or member 'old_mem' not described in 'amdgpu_move_blit' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:522: warning: Function parameter or member 'adev' not described in 'amdgpu_mem_visible' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:522: warning: Function parameter or member 'mem' not described in 'amdgpu_mem_visible' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:548: warning: Function parameter or member 'bo' not described in 'amdgpu_bo_move' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:548: warning: Function parameter or member 'evict' not described in 'amdgpu_bo_move' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:548: warning: Function parameter or member 'ctx' not described in 'amdgpu_bo_move' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:548: warning: Function parameter or member 'new_mem' not described in 'amdgpu_bo_move' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:548: warning: Function parameter or member 'hop' not described in 'amdgpu_bo_move' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:658: warning: Function parameter or member 'bdev' not described in 'amdgpu_ttm_io_mem_reserve' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:658: warning: Function parameter or member 'mem' not described in 'amdgpu_ttm_io_mem_reserve' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:751: warning: Function parameter or member 'bo' not described in 'amdgpu_ttm_tt_get_user_pages' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:751: warning: Function parameter or member 'pages' not described in 'amdgpu_ttm_tt_get_user_pages' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:855: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_tt_get_user_pages_done' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:892: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_tt_set_user_pages' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:892: warning: Function parameter or member 'pages' not described in 'amdgpu_ttm_tt_set_user_pages' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:906: warning: Function parameter or member 'bdev' not described in 'amdgpu_ttm_tt_pin_userptr' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:906: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_tt_pin_userptr' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:944: warning: Function parameter or member 'bdev' not described in 'amdgpu_ttm_tt_unpin_userptr' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:944: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_tt_unpin_userptr' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1029: warning: Function parameter or member 'bdev' not described in 'amdgpu_ttm_backend_bind' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1029: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_backend_bind' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1029: warning: Function parameter or member 'bo_mem' not described in 'amdgpu_ttm_backend_bind' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1087: warning: Function parameter or member 'bo' not described in 'amdgpu_ttm_alloc_gart' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1146: warning: Function parameter or member 'tbo' not described in 'amdgpu_ttm_recover_gart' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1168: warning: Function parameter or member 'bdev' not described in 'amdgpu_ttm_backend_unbind' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1168: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_backend_unbind' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1214: warning: Function parameter or member 'page_flags' not described in 'amdgpu_ttm_tt_create' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1247: warning: Function parameter or member 'bdev' not described in 'amdgpu_ttm_tt_populate' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1247: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_tt_populate' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1247: warning: Function parameter or member 'ctx' not described in 'amdgpu_ttm_tt_populate' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1291: warning: Function parameter or member 'bdev' not described in 'amdgpu_ttm_tt_unpopulate' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1291: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_tt_unpopulate' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1357: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_tt_get_usermm' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1376: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_tt_affect_userptr' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1376: warning: Function parameter or member 'start' not described in 'amdgpu_ttm_tt_affect_userptr' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1376: warning: Function parameter or member 'end' not described in 'amdgpu_ttm_tt_affect_userptr' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1397: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_tt_is_userptr' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1410: warning: Function parameter or member 'ttm' not described in 'amdgpu_ttm_tt_is_readonly' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1449: warning: bad line: > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1454: warning: Function parameter or member 'adev' not described in 'amdgpu_ttm_tt_pte_flags' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1477: warning: Function parameter or member 'bo' not described in 'amdgpu_ttm_bo_eviction_valuable' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1477: warning: Function parameter or member 'place' not described in 'amdgpu_ttm_bo_eviction_valuable' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1787: warning: Function parameter or member 'adev' not described in 'amdgpu_ttm_init' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1915: warning: Function parameter or member 'adev' not described in 'amdgpu_ttm_late_init' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1926: warning: Function parameter or member 'adev' not described in 'amdgpu_ttm_fini' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2250: warning: Function parameter or member 'f' not described in 'amdgpu_ttm_vram_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2250: warning: Function parameter or member 'buf' not described in 'amdgpu_ttm_vram_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2250: warning: Function parameter or member 'size' not described in 'amdgpu_ttm_vram_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2250: warning: Function parameter or member 'pos' not described in 'amdgpu_ttm_vram_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2285: warning: Function parameter or member 'f' not described in 'amdgpu_ttm_vram_write' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2285: warning: Function parameter or member 'buf' not described in 'amdgpu_ttm_vram_write' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2285: warning: Function parameter or member 'size' not described in 'amdgpu_ttm_vram_write' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2285: warning: Function parameter or member 'pos' not described in 'amdgpu_ttm_vram_write' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2336: warning: Function parameter or member 'f' not described in 'amdgpu_ttm_gtt_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2336: warning: Function parameter or member 'buf' not described in 'amdgpu_ttm_gtt_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2336: warning: Function parameter or member 'size' not described in 'amdgpu_ttm_gtt_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2336: warning: Function parameter or member 'pos' not described in 'amdgpu_ttm_gtt_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2390: warning: Function parameter or member 'f' not described in 'amdgpu_iomem_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2390: warning: Function parameter or member 'buf' not described in 'amdgpu_iomem_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2390: warning: Function parameter or member 'size' not described in 'amdgpu_iomem_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2390: warning: Function parameter or member 'pos' not described in 'amdgpu_iomem_read' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2446: warning: Function parameter or member 'f' not described in 'amdgpu_iomem_write' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2446: warning: Function parameter or member 'buf' not described in 'amdgpu_iomem_write' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2446: warning: Function parameter or member 'size' not described in 'amdgpu_iomem_write' > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2446: warning: Function parameter or member 'pos' not described in 'amdgpu_iomem_write' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: Jerome Glisse <glisse(a)freedesktop.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks. Fixing these up with the proper function parameter documentation and re-enabling kerneldoc would be a good project for someone. Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 60 +++++++++++++------------ > 1 file changed, 31 insertions(+), 29 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index 676fb520e0449..b473b13f34f76 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -451,7 +451,7 @@ int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev, > return r; > } > > -/** > +/* > * amdgpu_move_blit - Copy an entire buffer to another buffer > * > * This is a helper called by amdgpu_bo_move() and amdgpu_move_vram_ram() to > @@ -512,7 +512,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo, > return r; > } > > -/** > +/* > * amdgpu_mem_visible - Check that memory can be accessed by ttm_bo_move_memcpy > * > * Called by amdgpu_bo_move() > @@ -536,7 +536,7 @@ static bool amdgpu_mem_visible(struct amdgpu_device *adev, > <= adev->gmc.visible_vram_size; > } > > -/** > +/* > * amdgpu_bo_move - Move a buffer object to a new memory location > * > * Called by ttm_bo_handle_move_mem() > @@ -649,7 +649,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, > return r; > } > > -/** > +/* > * amdgpu_ttm_io_mem_reserve - Reserve a block of memory during a fault > * > * Called by ttm_mem_io_reserve() ultimately via ttm_bo_vm_fault() > @@ -740,7 +740,7 @@ struct amdgpu_ttm_tt { > }; > > #ifdef CONFIG_DRM_AMDGPU_USERPTR > -/** > +/* > * amdgpu_ttm_tt_get_user_pages - get device accessible pages that back user > * memory and start HMM tracking CPU page table update > * > @@ -845,7 +845,7 @@ int amdgpu_ttm_tt_get_user_pages(struct amdgpu_bo *bo, struct page **pages) > return r; > } > > -/** > +/* > * amdgpu_ttm_tt_userptr_range_done - stop HMM track the CPU page table change > * Check if the pages backing this ttm range have been invalidated > * > @@ -881,7 +881,7 @@ bool amdgpu_ttm_tt_get_user_pages_done(struct ttm_tt *ttm) > } > #endif > > -/** > +/* > * amdgpu_ttm_tt_set_user_pages - Copy pages in, putting old pages as necessary. > * > * Called by amdgpu_cs_list_validate(). This creates the page list > @@ -896,7 +896,7 @@ void amdgpu_ttm_tt_set_user_pages(struct ttm_tt *ttm, struct page **pages) > ttm->pages[i] = pages ? pages[i] : NULL; > } > > -/** > +/* > * amdgpu_ttm_tt_pin_userptr - prepare the sg table with the user pages > * > * Called by amdgpu_ttm_backend_bind() > @@ -936,7 +936,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_bo_device *bdev, > return r; > } > > -/** > +/* > * amdgpu_ttm_tt_unpin_userptr - Unpin and unmap userptr pages > */ > static void amdgpu_ttm_tt_unpin_userptr(struct ttm_bo_device *bdev, > @@ -1017,7 +1017,7 @@ static int amdgpu_ttm_gart_bind(struct amdgpu_device *adev, > return r; > } > > -/** > +/* > * amdgpu_ttm_backend_bind - Bind GTT memory > * > * Called by ttm_tt_bind() on behalf of ttm_bo_handle_move_mem(). > @@ -1075,7 +1075,7 @@ static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev, > return r; > } > > -/** > +/* > * amdgpu_ttm_alloc_gart - Make sure buffer object is accessible either > * through AGP or GART aperture. > * > @@ -1136,7 +1136,7 @@ int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo) > return 0; > } > > -/** > +/* > * amdgpu_ttm_recover_gart - Rebind GTT pages > * > * Called by amdgpu_gtt_mgr_recover() from amdgpu_device_reset() to > @@ -1157,7 +1157,7 @@ int amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo) > return r; > } > > -/** > +/* > * amdgpu_ttm_backend_unbind - Unbind GTT mapped pages > * > * Called by ttm_tt_unbind() on behalf of ttm_bo_move_ttm() and > @@ -1206,6 +1206,7 @@ static void amdgpu_ttm_backend_destroy(struct ttm_bo_device *bdev, > * amdgpu_ttm_tt_create - Create a ttm_tt object for a given BO > * > * @bo: The buffer object to create a GTT ttm_tt object around > + * @page_flags: flags to request SG or DMA page directory > * > * Called by ttm_tt_create(). > */ > @@ -1235,7 +1236,7 @@ static struct ttm_tt *amdgpu_ttm_tt_create(struct ttm_buffer_object *bo, > return &gtt->ttm; > } > > -/** > +/* > * amdgpu_ttm_tt_populate - Map GTT pages visible to the device > * > * Map the pages of a ttm_tt object to an address space visible > @@ -1280,7 +1281,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_bo_device *bdev, > return ttm_pool_alloc(&adev->mman.bdev.pool, ttm, ctx); > } > > -/** > +/* > * amdgpu_ttm_tt_unpopulate - unmap GTT pages and unpopulate page arrays > * > * Unmaps pages of a ttm_tt object from the device address space and > @@ -1350,7 +1351,7 @@ int amdgpu_ttm_tt_set_userptr(struct ttm_buffer_object *bo, > return 0; > } > > -/** > +/* > * amdgpu_ttm_tt_get_usermm - Return memory manager for ttm_tt object > */ > struct mm_struct *amdgpu_ttm_tt_get_usermm(struct ttm_tt *ttm) > @@ -1366,7 +1367,7 @@ struct mm_struct *amdgpu_ttm_tt_get_usermm(struct ttm_tt *ttm) > return gtt->usertask->mm; > } > > -/** > +/* > * amdgpu_ttm_tt_affect_userptr - Determine if a ttm_tt object lays inside an > * address range for the current task. > * > @@ -1390,7 +1391,7 @@ bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start, > return true; > } > > -/** > +/* > * amdgpu_ttm_tt_is_userptr - Have the pages backing by userptr? > */ > bool amdgpu_ttm_tt_is_userptr(struct ttm_tt *ttm) > @@ -1403,7 +1404,7 @@ bool amdgpu_ttm_tt_is_userptr(struct ttm_tt *ttm) > return true; > } > > -/** > +/* > * amdgpu_ttm_tt_is_readonly - Is the ttm_tt object read only? > */ > bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm) > @@ -1444,9 +1445,10 @@ uint64_t amdgpu_ttm_tt_pde_flags(struct ttm_tt *ttm, struct ttm_resource *mem) > /** > * amdgpu_ttm_tt_pte_flags - Compute PTE flags for ttm_tt object > * > + * @adev: amdgpu_device pointer > * @ttm: The ttm_tt object to compute the flags for > * @mem: The memory registry backing this ttm_tt object > - > + * > * Figure out the flags to use for a VM PTE (Page Table Entry). > */ > uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, > @@ -1463,7 +1465,7 @@ uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, > return flags; > } > > -/** > +/* > * amdgpu_ttm_bo_eviction_valuable - Check to see if we can evict a buffer > * object. > * > @@ -1774,7 +1776,7 @@ static int amdgpu_ttm_reserve_tmr(struct amdgpu_device *adev) > return 0; > } > > -/** > +/* > * amdgpu_ttm_init - Init the memory management (ttm) as well as various > * gtt/vram related fields. > * > @@ -1908,7 +1910,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) > return 0; > } > > -/** > +/* > * amdgpu_ttm_late_init - Handle any late initialization for amdgpu_ttm > */ > void amdgpu_ttm_late_init(struct amdgpu_device *adev) > @@ -1919,7 +1921,7 @@ void amdgpu_ttm_late_init(struct amdgpu_device *adev) > amdgpu_bo_free_kernel(&adev->mman.stolen_extended_memory, NULL, NULL); > } > > -/** > +/* > * amdgpu_ttm_fini - De-initialize the TTM memory pools > */ > void amdgpu_ttm_fini(struct amdgpu_device *adev) > @@ -2240,7 +2242,7 @@ static const struct drm_info_list amdgpu_ttm_debugfs_list[] = { > {"ttm_page_pool", amdgpu_ttm_pool_debugfs, 0, NULL}, > }; > > -/** > +/* > * amdgpu_ttm_vram_read - Linear read access to VRAM > * > * Accesses VRAM via MMIO for debugging purposes. > @@ -2275,7 +2277,7 @@ static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf, > return result; > } > > -/** > +/* > * amdgpu_ttm_vram_write - Linear write access to VRAM > * > * Accesses VRAM via MMIO for debugging purposes. > @@ -2328,7 +2330,7 @@ static const struct file_operations amdgpu_ttm_vram_fops = { > > #ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS > > -/** > +/* > * amdgpu_ttm_gtt_read - Linear read access to GTT memory > */ > static ssize_t amdgpu_ttm_gtt_read(struct file *f, char __user *buf, > @@ -2378,7 +2380,7 @@ static const struct file_operations amdgpu_ttm_gtt_fops = { > > #endif > > -/** > +/* > * amdgpu_iomem_read - Virtual read access to GPU mapped memory > * > * This function is used to read memory that has been mapped to the > @@ -2434,7 +2436,7 @@ static ssize_t amdgpu_iomem_read(struct file *f, char __user *buf, > return result; > } > > -/** > +/* > * amdgpu_iomem_write - Virtual write access to GPU mapped memory > * > * This function is used to write memory that has been mapped to the > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 6 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Linaro-mm-sig