Linaro-mm-sig

linaro-mm-sig@lists.linaro.org

6 participants
2911 discussions

Re: [Linaro-mm-sig] [PATCH 17/40] drm/amd/amdgpu/gfx_v6_0: Supply description for 'gfx_v6_0_ring_test_ib()'s 'timeout' param

by Alex Deucher

On Mon, Nov 23, 2020 at 6:19 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c:1903: warning: Function parameter or member 'timeout' not described in 'gfx_v6_0_ring_test_ib' > > 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_v6_0.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c > index 671c46ebeced9..ca74638dec9b7 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c > @@ -1894,6 +1894,7 @@ static void gfx_v6_0_ring_emit_ib(struct amdgpu_ring *ring, > * gfx_v6_0_ring_test_ib - basic ring IB test > * > * @ring: amdgpu_ring structure holding ring information > + * @timeout: timeout value in jiffies, or MAX_SCHEDULE_TIMEOUT > * > * Allocate an IB and execute it on the gfx ring (SI). > * Provides a basic gfx ring test to verify that IBs are working. > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 16/40] drm/amd/amdgpu/si_dma: Fix a bunch of function documentation issues

by Alex Deucher

On Mon, Nov 23, 2020 at 6:19 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/si_dma.c:92: warning: Function parameter or member 'addr' not described in 'si_dma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/si_dma.c:92: warning: Function parameter or member 'seq' not described in 'si_dma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/si_dma.c:92: warning: Function parameter or member 'flags' not described in 'si_dma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/si_dma.c:92: warning: Excess function parameter 'fence' description in 'si_dma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/si_dma.c:252: warning: Function parameter or member 'timeout' not described in 'si_dma_ring_test_ib' > drivers/gpu/drm/amd/amdgpu/si_dma.c:408: warning: Function parameter or member 'ring' not described in 'si_dma_ring_pad_ib' > drivers/gpu/drm/amd/amdgpu/si_dma.c:446: warning: Function parameter or member 'vmid' not described in 'si_dma_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/si_dma.c:446: warning: Function parameter or member 'pd_addr' not described in 'si_dma_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/si_dma.c:446: warning: Excess function parameter 'vm' description in 'si_dma_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/si_dma.c:781: warning: Function parameter or member 'ib' not described in 'si_dma_emit_copy_buffer' > drivers/gpu/drm/amd/amdgpu/si_dma.c:781: warning: Function parameter or member 'tmz' not described in 'si_dma_emit_copy_buffer' > drivers/gpu/drm/amd/amdgpu/si_dma.c:781: warning: Excess function parameter 'ring' description in 'si_dma_emit_copy_buffer' > drivers/gpu/drm/amd/amdgpu/si_dma.c:804: warning: Function parameter or member 'ib' not described in 'si_dma_emit_fill_buffer' > drivers/gpu/drm/amd/amdgpu/si_dma.c:804: warning: Excess function parameter 'ring' description in 'si_dma_emit_fill_buffer' > > 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/amd/amdgpu/si_dma.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c > index 7d2bbcbe547b2..540dced190f33 100644 > --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c > +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c > @@ -81,7 +81,9 @@ static void si_dma_ring_emit_ib(struct amdgpu_ring *ring, > * si_dma_ring_emit_fence - emit a fence on the DMA ring > * > * @ring: amdgpu ring pointer > - * @fence: amdgpu fence object > + * @addr: address > + * @seq: sequence number > + * @flags: fence related flags > * > * Add a DMA fence packet to the ring to write > * the fence seq number and DMA trap packet to generate > @@ -244,6 +246,7 @@ static int si_dma_ring_test_ring(struct amdgpu_ring *ring) > * si_dma_ring_test_ib - test an IB on the DMA engine > * > * @ring: amdgpu_ring structure holding ring information > + * @timeout: timeout value in jiffies, or MAX_SCHEDULE_TIMEOUT > * > * Test a simple IB in the DMA ring (VI). > * Returns 0 on success, error on failure. > @@ -401,6 +404,7 @@ static void si_dma_vm_set_pte_pde(struct amdgpu_ib *ib, > /** > * si_dma_pad_ib - pad the IB to the required number of dw > * > + * @ring: amdgpu_ring pointer > * @ib: indirect buffer to fill with padding > * > */ > @@ -436,7 +440,8 @@ static void si_dma_ring_emit_pipeline_sync(struct amdgpu_ring *ring) > * si_dma_ring_emit_vm_flush - cik vm flush using sDMA > * > * @ring: amdgpu_ring pointer > - * @vm: amdgpu_vm pointer > + * @vmid: vmid number to use > + * @pd_addr: address > * > * Update the page table base and flush the VM TLB > * using sDMA (VI). > @@ -764,10 +769,11 @@ static void si_dma_set_irq_funcs(struct amdgpu_device *adev) > /** > * si_dma_emit_copy_buffer - copy buffer using the sDMA engine > * > - * @ring: amdgpu_ring structure holding ring information > + * @ib: indirect buffer to copy to > * @src_offset: src GPU address > * @dst_offset: dst GPU address > * @byte_count: number of bytes to xfer > + * @tmz: unused > * > * Copy GPU buffers using the DMA engine (VI). > * Used by the amdgpu ttm implementation to move pages if > @@ -790,7 +796,7 @@ static void si_dma_emit_copy_buffer(struct amdgpu_ib *ib, > /** > * si_dma_emit_fill_buffer - fill buffer using the sDMA engine > * > - * @ring: amdgpu_ring structure holding ring information > + * @ib: indirect buffer to copy to > * @src_data: value to write to buffer > * @dst_offset: dst GPU address > * @byte_count: number of bytes to xfer > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 09/40] drm/amd/amdgpu/gfx_v7_0: Clean-up a bunch of kernel-doc related issues

by Alex Deucher

On Mon, Nov 23, 2020 at 6:20 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:1590: warning: Function parameter or member 'instance' not described in 'gfx_v7_0_select_se_sh' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:1788: warning: Excess function parameter 'se_num' description in 'gfx_v7_0_setup_rb' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:1788: warning: Excess function parameter 'sh_per_se' description in 'gfx_v7_0_setup_rb' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:1852: warning: Excess function parameter 'adev' description in 'DEFAULT_SH_MEM_BASES' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2086: warning: Excess function parameter 'adev' description in 'gfx_v7_0_ring_test_ring' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2130: warning: Function parameter or member 'ring' not described in 'gfx_v7_0_ring_emit_hdp_flush' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2130: warning: Excess function parameter 'adev' description in 'gfx_v7_0_ring_emit_hdp_flush' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2130: warning: Excess function parameter 'ridx' description in 'gfx_v7_0_ring_emit_hdp_flush' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2182: warning: Function parameter or member 'ring' not described in 'gfx_v7_0_ring_emit_fence_gfx' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2182: warning: Function parameter or member 'addr' not described in 'gfx_v7_0_ring_emit_fence_gfx' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2182: warning: Function parameter or member 'seq' not described in 'gfx_v7_0_ring_emit_fence_gfx' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2182: warning: Function parameter or member 'flags' not described in 'gfx_v7_0_ring_emit_fence_gfx' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2182: warning: Excess function parameter 'adev' description in 'gfx_v7_0_ring_emit_fence_gfx' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2182: warning: Excess function parameter 'fence' description in 'gfx_v7_0_ring_emit_fence_gfx' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2224: warning: Function parameter or member 'ring' not described in 'gfx_v7_0_ring_emit_fence_compute' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2224: warning: Function parameter or member 'addr' not described in 'gfx_v7_0_ring_emit_fence_compute' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2224: warning: Function parameter or member 'seq' not described in 'gfx_v7_0_ring_emit_fence_compute' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2224: warning: Function parameter or member 'flags' not described in 'gfx_v7_0_ring_emit_fence_compute' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2224: warning: Excess function parameter 'adev' description in 'gfx_v7_0_ring_emit_fence_compute' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2224: warning: Excess function parameter 'fence' description in 'gfx_v7_0_ring_emit_fence_compute' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2260: warning: Function parameter or member 'job' not described in 'gfx_v7_0_ring_emit_ib_gfx' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2260: warning: Function parameter or member 'flags' not described in 'gfx_v7_0_ring_emit_ib_gfx' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2351: warning: Function parameter or member 'timeout' not described in 'gfx_v7_0_ring_test_ib' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:3244: warning: Function parameter or member 'ring' not described in 'gfx_v7_0_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:3244: warning: Function parameter or member 'vmid' not described in 'gfx_v7_0_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:3244: warning: Function parameter or member 'pd_addr' not described in 'gfx_v7_0_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:3244: warning: Excess function parameter 'adev' description in 'gfx_v7_0_ring_emit_vm_flush' > > 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 | 33 +++++++++++++++------------ > 1 file changed, 19 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > index 04e1e92f5f3cf..f2490f915a8be 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > @@ -1580,10 +1580,10 @@ static void gfx_v7_0_tiling_mode_table_init(struct amdgpu_device *adev) > * @adev: amdgpu_device pointer > * @se_num: shader engine to address > * @sh_num: sh block to address > + * @instance: Certain registers are instanced per SE or SH. > + * 0xffffffff means broadcast to all SEs or SHs (CIK). > * > - * Select which SE, SH combinations to address. Certain > - * registers are instanced per SE or SH. 0xffffffff means > - * broadcast to all SEs or SHs (CIK). > + * Select which SE, SH combinations to address. > */ > static void gfx_v7_0_select_se_sh(struct amdgpu_device *adev, > u32 se_num, u32 sh_num, u32 instance) > @@ -1779,8 +1779,6 @@ gfx_v7_0_write_harvested_raster_configs(struct amdgpu_device *adev, > * gfx_v7_0_setup_rb - setup the RBs on the asic > * > * @adev: amdgpu_device pointer > - * @se_num: number of SEs (shader engines) for the asic > - * @sh_per_se: number of SH blocks per SE for the asic > * > * Configures per-SE/SH RB registers (CIK). > */ > @@ -1841,6 +1839,7 @@ static void gfx_v7_0_setup_rb(struct amdgpu_device *adev) > mutex_unlock(&adev->grbm_idx_mutex); > } > > +#define DEFAULT_SH_MEM_BASES (0x6000) > /** > * gfx_v7_0_init_compute_vmid - gart enable > * > @@ -1849,7 +1848,6 @@ static void gfx_v7_0_setup_rb(struct amdgpu_device *adev) > * Initialize compute vmid sh_mem registers > * > */ > -#define DEFAULT_SH_MEM_BASES (0x6000) > static void gfx_v7_0_init_compute_vmid(struct amdgpu_device *adev) > { > int i; > @@ -2074,7 +2072,6 @@ static void gfx_v7_0_scratch_init(struct amdgpu_device *adev) > /** > * gfx_v7_0_ring_test_ring - basic gfx ring test > * > - * @adev: amdgpu_device pointer > * @ring: amdgpu_ring structure holding ring information > * > * Allocate a scratch register and write to it using the gfx ring (CIK). > @@ -2121,8 +2118,7 @@ static int gfx_v7_0_ring_test_ring(struct amdgpu_ring *ring) > /** > * gfx_v7_0_ring_emit_hdp - emit an hdp flush on the cp > * > - * @adev: amdgpu_device pointer > - * @ridx: amdgpu ring index > + * @ring: amdgpu_ring structure holding ring information > * > * Emits an hdp flush on the cp. > */ > @@ -2171,8 +2167,10 @@ static void gfx_v7_0_ring_emit_vgt_flush(struct amdgpu_ring *ring) > /** > * gfx_v7_0_ring_emit_fence_gfx - emit a fence on the gfx ring > * > - * @adev: amdgpu_device pointer > - * @fence: amdgpu fence object > + * @ring: amdgpu_ring structure holding ring information > + * @addr: address > + * @seq: sequence number > + * @flags: fence related flags > * > * Emits a fence sequnce number on the gfx ring and flushes > * GPU caches. > @@ -2212,8 +2210,10 @@ static void gfx_v7_0_ring_emit_fence_gfx(struct amdgpu_ring *ring, u64 addr, > /** > * gfx_v7_0_ring_emit_fence_compute - emit a fence on the compute ring > * > - * @adev: amdgpu_device pointer > - * @fence: amdgpu fence object > + * @ring: amdgpu_ring structure holding ring information > + * @addr: address > + * @seq: sequence number > + * @flags: fence related flags > * > * Emits a fence sequnce number on the compute ring and flushes > * GPU caches. > @@ -2245,7 +2245,9 @@ static void gfx_v7_0_ring_emit_fence_compute(struct amdgpu_ring *ring, > * gfx_v7_0_ring_emit_ib - emit an IB (Indirect Buffer) on the ring > * > * @ring: amdgpu_ring structure holding ring information > + * @job: job to retrive vmid from > * @ib: amdgpu indirect buffer object > + * @flags: options (AMDGPU_HAVE_CTX_SWITCH) > * > * Emits an DE (drawing engine) or CE (constant engine) IB > * on the gfx ring. IBs are usually generated by userspace > @@ -2342,6 +2344,7 @@ static void gfx_v7_ring_emit_cntxcntl(struct amdgpu_ring *ring, uint32_t flags) > * gfx_v7_0_ring_test_ib - basic ring IB test > * > * @ring: amdgpu_ring structure holding ring information > + * @timeout: timeout value in jiffies, or MAX_SCHEDULE_TIMEOUT > * > * Allocate an IB and execute it on the gfx ring (CIK). > * Provides a basic gfx ring test to verify that IBs are working. > @@ -3234,7 +3237,9 @@ static void gfx_v7_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring) > /** > * gfx_v7_0_ring_emit_vm_flush - cik vm flush using the CP > * > - * @adev: amdgpu_device pointer > + * @ring: amdgpu_ring pointer > + * @vmid: vmid number to use > + * @pd_addr: address > * > * Update the page table base and flush the VM TLB > * using the CP (CIK). > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 08/40] drm/amd/amdgpu/cik_sdma: Supply some missing function param descriptions

by Alex Deucher

On Mon, Nov 23, 2020 at 6:19 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:226: warning: Function parameter or member 'job' not described in 'cik_sdma_ring_emit_ib' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:226: warning: Function parameter or member 'flags' not described in 'cik_sdma_ring_emit_ib' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:278: warning: Function parameter or member 'addr' not described in 'cik_sdma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:278: warning: Function parameter or member 'seq' not described in 'cik_sdma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:278: warning: Function parameter or member 'flags' not described in 'cik_sdma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:278: warning: Excess function parameter 'fence' description in 'cik_sdma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:663: warning: Function parameter or member 'timeout' not described in 'cik_sdma_ring_test_ib' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:808: warning: Function parameter or member 'ring' not described in 'cik_sdma_ring_pad_ib' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:859: warning: Function parameter or member 'vmid' not described in 'cik_sdma_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:859: warning: Function parameter or member 'pd_addr' not described in 'cik_sdma_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:859: warning: Excess function parameter 'vm' description in 'cik_sdma_ring_emit_vm_flush' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:1315: warning: Function parameter or member 'ib' not described in 'cik_sdma_emit_copy_buffer' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:1315: warning: Function parameter or member 'tmz' not described in 'cik_sdma_emit_copy_buffer' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:1315: warning: Excess function parameter 'ring' description in 'cik_sdma_emit_copy_buffer' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:1339: warning: Function parameter or member 'ib' not described in 'cik_sdma_emit_fill_buffer' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:1339: warning: Excess function parameter 'ring' description in 'cik_sdma_emit_fill_buffer' > > 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/amd/amdgpu/cik_sdma.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > index 1a6494ea50912..f1e9966e7244e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > @@ -215,7 +215,9 @@ static void cik_sdma_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) > * cik_sdma_ring_emit_ib - Schedule an IB on the DMA engine > * > * @ring: amdgpu ring pointer > + * @job: job to retrive vmid from > * @ib: IB object to schedule > + * @flags: unused > * > * Schedule an IB in the DMA ring (CIK). > */ > @@ -267,6 +269,8 @@ static void cik_sdma_ring_emit_hdp_flush(struct amdgpu_ring *ring) > * cik_sdma_ring_emit_fence - emit a fence on the DMA ring > * > * @ring: amdgpu ring pointer > + * @addr: address > + * @seq: sequence number > * @fence: amdgpu fence object > * > * Add a DMA fence packet to the ring to write > @@ -655,6 +659,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring) > * cik_sdma_ring_test_ib - test an IB on the DMA engine > * > * @ring: amdgpu_ring structure holding ring information > + * @timeout: timeout value in jiffies, or MAX_SCHEDULE_TIMEOUT > * > * Test a simple IB in the DMA ring (CIK). > * Returns 0 on success, error on failure. > @@ -801,6 +806,7 @@ static void cik_sdma_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe, > /** > * cik_sdma_vm_pad_ib - pad the IB to the required number of dw > * > + * @ring: amdgpu_ring structure holding ring information > * @ib: indirect buffer to fill with padding > * > */ > @@ -849,7 +855,8 @@ static void cik_sdma_ring_emit_pipeline_sync(struct amdgpu_ring *ring) > * cik_sdma_ring_emit_vm_flush - cik vm flush using sDMA > * > * @ring: amdgpu_ring pointer > - * @vm: amdgpu_vm pointer > + * @vmid: vmid number to use > + * @pd_addr: address > * > * Update the page table base and flush the VM TLB > * using sDMA (CIK). > @@ -1298,10 +1305,11 @@ static void cik_sdma_set_irq_funcs(struct amdgpu_device *adev) > /** > * cik_sdma_emit_copy_buffer - copy buffer using the sDMA engine > * > - * @ring: amdgpu_ring structure holding ring information > + * @ib: indirect buffer to copy to > * @src_offset: src GPU address > * @dst_offset: dst GPU address > * @byte_count: number of bytes to xfer > + * @tmz: unused > * > * Copy GPU buffers using the DMA engine (CIK). > * Used by the amdgpu ttm implementation to move pages if > @@ -1325,7 +1333,7 @@ static void cik_sdma_emit_copy_buffer(struct amdgpu_ib *ib, > /** > * cik_sdma_emit_fill_buffer - fill buffer using the sDMA engine > * > - * @ring: amdgpu_ring structure holding ring information > + * @ib: indirect buffer to fill > * @src_data: value to write to buffer > * @dst_offset: dst GPU address > * @byte_count: number of bytes to xfer > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 03/40] drm/amd/amdgpu/amdgpu_ib: Provide docs for 'amdgpu_ib_schedule()'s 'job' param

by Alex Deucher

On Mon, Nov 23, 2020 at 6:19 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:127: warning: Function parameter or member 'job' not described 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 | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c > index c69af9b86cc60..024d0a563a652 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c > @@ -106,6 +106,7 @@ void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, > * @ring: ring index the IB is associated with > * @num_ibs: number of IBs to schedule > * @ibs: IB objects to schedule > + * @job: job to schedule > * @f: fence created during this submission > * > * Schedule an IB on the associated ring (all asics). > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 02/40] drm/amd/amdgpu/amdgpu_ttm: Add description for 'page_flags'

by Alex Deucher

On Mon, Nov 23, 2020 at 6:19 AM 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:1214: warning: Function parameter or member 'page_flags' not described in 'amdgpu_ttm_tt_create' > > 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_ttm.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index 5fcdd67e5a913..debbcef961dd5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -1199,6 +1199,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: Page flags to be added to the ttm_tt object > * > * Called by ttm_tt_create(). > */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

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

by Christian König

Only skimmed over them, but over all looks sane to me. Series is Acked-by: Christian König <christian.koenig(a)amd.com> Thanks, Christian. Am 23.11.20 um 12:18 schrieb Lee Jones: > 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. > > Only 900 (from 5000) to go! > > Lee Jones (40): > drm/radeon/radeon_device: Consume our own header where the prototypes > are located > drm/amd/amdgpu/amdgpu_ttm: Add description for 'page_flags' > drm/amd/amdgpu/amdgpu_ib: Provide docs for 'amdgpu_ib_schedule()'s > 'job' param > drm/amd/amdgpu/amdgpu_virt: Correct possible copy/paste or doc-rot > misnaming issue > drm/amd/amdgpu/cik_ih: Supply description for 'ih' in > 'cik_ih_{get,set}_wptr()' > drm/amd/amdgpu/uvd_v4_2: Fix some kernel-doc misdemeanours > drm/amd/amdgpu/dce_v8_0: Supply description for 'async' > drm/amd/amdgpu/cik_sdma: Supply some missing function param > descriptions > drm/amd/amdgpu/gfx_v7_0: Clean-up a bunch of kernel-doc related issues > drm/msm/disp/dpu1/dpu_core_perf: Fix kernel-doc formatting issues > drm/msm/disp/dpu1/dpu_hw_blk: Add one missing and remove an extra > param description > drm/msm/disp/dpu1/dpu_formats: Demote non-conformant kernel-doc header > drm/msm/disp/dpu1/dpu_hw_catalog: Remove duplicated initialisation of > 'max_linewidth' > drm/msm/disp/dpu1/dpu_hw_catalog: Move definitions to the only place > they are used > drm/nouveau/nvkm/subdev/bios/init: Demote obvious abuse of kernel-doc > drm/amd/amdgpu/si_dma: Fix a bunch of function documentation issues > drm/amd/amdgpu/gfx_v6_0: Supply description for > 'gfx_v6_0_ring_test_ib()'s 'timeout' param > drm/msm/disp/dpu1/dpu_encoder: Fix a few parameter/member formatting > issues > drm/msm/disp/dpu1/dpu_hw_lm: Fix misnaming of parameter 'ctx' > drm/msm/disp/dpu1/dpu_hw_sspp: Fix kernel-doc formatting abuse > drm/amd/amdgpu/uvd_v3_1: Fix-up some documentation issues > drm/amd/amdgpu/dce_v6_0: Fix formatting and missing parameter > description issues > drm/amd/include/vega20_ip_offset: Mark top-level IP_BASE definition as > __maybe_unused > drm/amd/include/navi10_ip_offset: Mark top-level IP_BASE as > __maybe_unused > drm/amd/include/arct_ip_offset: Mark top-level IP_BASE definition as > __maybe_unused > drm/amd/include/navi14_ip_offset: Mark top-level IP_BASE as > __maybe_unused > drm/amd/include/navi12_ip_offset: Mark top-level IP_BASE as > __maybe_unused > drm/amd/include/sienna_cichlid_ip_offset: Mark top-level IP_BASE as > __maybe_unused > drm/amd/include/vangogh_ip_offset: Mark top-level IP_BASE as > __maybe_unused > drm/amd/include/dimgrey_cavefish_ip_offset: Mark top-level IP_BASE as > __maybe_unused > drm/msm/disp/dpu1/dpu_rm: Fix formatting issues and supply > 'global_state' description > drm/msm/disp/dpu1/dpu_vbif: Fix a couple of function param > descriptions > drm/amd/amdgpu/cik_sdma: Add one and remove another function param > description > drm/amd/amdgpu/uvd_v4_2: Add one and remove another function param > description > drm/msm/disp/dpu1/dpu_plane: Fix some spelling and missing function > param descriptions > drm/amd/amdgpu/gmc_v7_0: Add some missing kernel-doc descriptions > drm/amd/amdgpu/gmc_v8_0: Fix more issues attributed to copy/paste > drm/msm/msm_drv: Make '_msm_ioremap()' static > drm/amd/amdgpu/gmc_v9_0: Remove unused table > 'ecc_umc_mcumc_status_addrs' > drm/amd/amdgpu/gmc_v9_0: Suppy some missing function doc descriptions > > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 12 +- > drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 + > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 18 ++- > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 33 +++-- > drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 7 +- > drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 + > drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 38 +---- > drivers/gpu/drm/amd/amdgpu/si_dma.c | 14 +- > drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 10 +- > drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 10 +- > drivers/gpu/drm/amd/include/arct_ip_offset.h | 4 +- > .../amd/include/dimgrey_cavefish_ip_offset.h | 2 +- > .../gpu/drm/amd/include/navi10_ip_offset.h | 2 +- > .../gpu/drm/amd/include/navi12_ip_offset.h | 2 +- > .../gpu/drm/amd/include/navi14_ip_offset.h | 2 +- > .../amd/include/sienna_cichlid_ip_offset.h | 2 +- > .../gpu/drm/amd/include/vangogh_ip_offset.h | 2 +- > .../gpu/drm/amd/include/vega20_ip_offset.h | 2 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 17 +-- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 15 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 2 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 2 +- > .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 75 +++++++++- > .../drm/msm/disp/dpu1/dpu_hw_catalog_format.h | 88 ------------ > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 2 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 4 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 19 ++- > drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 5 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 2 +- > drivers/gpu/drm/msm/msm_drv.c | 4 +- > .../gpu/drm/nouveau/nvkm/subdev/bios/init.c | 136 +++++++++--------- > drivers/gpu/drm/radeon/radeon_device.c | 1 + > 37 files changed, 277 insertions(+), 268 deletions(-) > delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: Ben Skeggs <bskeggs(a)redhat.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Drew Davenport <ddavenport(a)chromium.org> > Cc: dri-devel(a)lists.freedesktop.org > Cc: freedreno(a)lists.freedesktop.org > Cc: Fritz Koenig <frkoenig(a)google.com> > Cc: Hawking Zhang <Hawking.Zhang(a)amd.com> > Cc: Huang Rui <ray.huang(a)amd.com> > Cc: Jerome Glisse <glisse(a)freedesktop.org> > Cc: Jiansong Chen <Jiansong.Chen(a)amd.com> > Cc: Jonathan Marek <jonathan(a)marek.ca> > Cc: Kalyan Thota <kalyan_t(a)codeaurora.org> > Cc: Likun Gao <Likun.Gao(a)amd.com> > Cc: linaro-mm-sig(a)lists.linaro.org > Cc: linux-arm-msm(a)vger.kernel.org > Cc: linux-media(a)vger.kernel.org > Cc: Luben Tuikov <luben.tuikov(a)amd.com> > Cc: nouveau(a)lists.freedesktop.org > Cc: Qinglang Miao <miaoqinglang(a)huawei.com> > Cc: Rob Clark <robdclark(a)gmail.com> > Cc: Sean Paul <sean(a)poorly.run> > Cc: Sonny Jiang <sonny.jiang(a)amd.com> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: Tao Zhou <tao.zhou1(a)amd.com>

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH] drm/ttm: remove unused varibles

by Christian König

Am 20.11.20 um 07:49 schrieb Tian Tao: > fixed the following warnings > drivers/gpu/drm/nouveau/nouveau_bo.c:1227:17: warning: variable ‘dev’ > set but not used [-Wunused-but-set-variable] > drivers/gpu/drm/nouveau/nouveau_bo.c:1251:17: warning: variable ‘dev’ > set but not used [-Wunused-but-set-variable] > > Signed-off-by: Tian Tao <tiantao6(a)hisilicon.com> The subject should read drm/nouveau instead of drm/ttm, but apart from that the patch is Acked-by: Christian König <christian.koenig(a)amd.com> > --- > drivers/gpu/drm/nouveau/nouveau_bo.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c > index 7aa4286..9465f56 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > @@ -1228,7 +1228,6 @@ nouveau_ttm_tt_populate(struct ttm_bo_device *bdev, > { > struct ttm_tt *ttm_dma = (void *)ttm; > struct nouveau_drm *drm; > - struct device *dev; > bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); > > if (ttm_tt_is_populated(ttm)) > @@ -1242,7 +1241,6 @@ nouveau_ttm_tt_populate(struct ttm_bo_device *bdev, > } > > drm = nouveau_bdev(bdev); > - dev = drm->dev->dev; > > return ttm_pool_alloc(&drm->ttm.bdev.pool, ttm, ctx); > }

4 years, 7 months

cleanup a fix and add the vma_set_file function

by Christian König

Hi Andrew, can I get you Acked-by to merge this cleanup through the drm-misc-next branch? The affected drivers are mostly from the DRM subsystem. The fix for the other problem you pointed out in mmap_region() has already shown up in that branch. Thanks in advance, Christian.

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 1/9] dt-binding: soc: xilinx: ai-engine: Add AI engine binding

by Rob Herring

On Wed, 18 Nov 2020 00:06:12 -0800, Wendy Liang wrote: > Xilinx AI engine array can be partitioned statically for different > applications. In the device tree, there will be device node for the AI > engine device, and device nodes for the statically configured AI engine > partitions. Each of the statically configured partition has a partition > ID in the system. > > Signed-off-by: Wendy Liang <wendy.liang(a)xilinx.com> > --- > .../bindings/soc/xilinx/xlnx,ai-engine.yaml | 119 +++++++++++++++++++++ > 1 file changed, 119 insertions(+) > create mode 100644 Documentation/devicetree/bindings/soc/xilinx/xlnx,ai-engine.yaml > My bot found errors running 'make dt_binding_check' on your patch: yamllint warnings/errors: ./Documentation/devicetree/bindings/soc/xilinx/xlnx,ai-engine.yaml:10:2: [warning] wrong indentation: expected 2 but found 1 (indentation) dtschema/dtc warnings/errors: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/soc/xilinx/xlnx,ai-engine.yaml: 'additionalProperties' is a required property /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/soc/xilinx/xlnx,ai-engine.yaml: ignoring, error in schema: warning: no schema found in file: ./Documentation/devicetree/bindings/soc/xilinx/xlnx,ai-engine.yaml See https://patchwork.ozlabs.org/patch/1402008 The base for the patch is generally the last rc1. Any dependencies should be noted. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit.

4 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Linaro-mm-sig