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

Re: [Linaro-mm-sig] [PATCH 33/40] drm/amd/amdgpu/cik_sdma: Add one and remove another function param description

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/cik_sdma.c:282: warning: Function parameter or member 'flags' not described in 'cik_sdma_ring_emit_fence' > drivers/gpu/drm/amd/amdgpu/cik_sdma.c:282: warning: Excess function parameter 'fence' description in 'cik_sdma_ring_emit_fence' > > 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 | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > index f1e9966e7244e..28a64de8ae0e6 100644 > --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > @@ -271,7 +271,7 @@ static void cik_sdma_ring_emit_hdp_flush(struct amdgpu_ring *ring) > * @ring: amdgpu ring pointer > * @addr: address > * @seq: sequence number > - * @fence: amdgpu fence object > + * @flags: fence related flags > * > * Add a DMA fence packet to the ring to write > * the fence seq number and DMA trap packet to generate > @@ -279,7 +279,7 @@ static void cik_sdma_ring_emit_hdp_flush(struct amdgpu_ring *ring) > */ > static void cik_sdma_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq, > unsigned flags) > -{ > + { > bool write64bit = flags & AMDGPU_FENCE_FLAG_64BIT; > /* write the fence */ > amdgpu_ring_write(ring, SDMA_PACKET(SDMA_OPCODE_FENCE, 0, 0)); > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

5 years, 2 months

1
0
0 0

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

5 years, 2 months

1
0
0 0

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

5 years, 2 months

1
0
0 0

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

5 years, 2 months

1
0
0 0

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

5 years, 2 months

1
0
0 0

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

5 years, 2 months

1
0
0 0

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

5 years, 2 months

1
0
0 0

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>

5 years, 2 months

1
0
0 0

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); > }

5 years, 2 months

1
0
0 0

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.

5 years, 2 months

2
5
0 0

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.

5 years, 2 months

1
0
0 0

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. > */

5 years, 2 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

5 years, 2 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

5 years, 2 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

5 years, 2 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

5 years, 2 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

5 years, 2 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

5 years, 2 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

5 years, 2 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

5 years, 2 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

5 years, 2 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

5 years, 2 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

5 years, 2 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

5 years, 3 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

5 years, 3 months

1
0
0 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Linaro-mm-sig