* [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU
@ 2020-11-10 19:30 Lee Jones
2020-11-10 19:30 ` [PATCH 01/30] drm/radeon/evergreen: Add comment for 'evergreen_page_flip()'s 'async' param Lee Jones
` (29 more replies)
0 siblings, 30 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, amd-gfx, Christian König,
Daniel Vetter, David Airlie, dri-devel, Evan Quan, Gareth Hughes,
linaro-mm-sig, linux-media, Sumit Semwal
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.
Exciting times (using Arm as the benchmark):
Before these sets:
5031 drivers/gpu/
3923 drivers/gpu/drm/amd/
258 drivers/gpu/drm/radeon/
95 drivers/gpu/drm/nouveau/
77 drivers/gpu/drm/msm/
After these sets:
2236 drivers/gpu/
1949 drivers/gpu/drm/amd/
97 drivers/gpu/drm/nouveau/
83 drivers/gpu/drm/msm/
40 drivers/gpu/drm/radeon
Couple more to go.
Plan is to finsish off Radeon, then start targeting AMD tomorrow.
Lee Jones (30):
drm/radeon/evergreen: Add comment for 'evergreen_page_flip()'s 'async'
param
drm/radeon/evergreen: Remove set but unused variable 'mc_shared_chmap'
drm/radeon/ni: Demote vague attempt at function header doc
drm/radeon/si: Remove set but unused variable 'mc_shared_chmap'
drm/radeon/cik: Remove set but unused variable 'mc_shared_chmap'
drm/radeon/trinity_dpm: Remove some defined but never used arrays
drm/radeon/kv_dpm: Strip out unused functions and their tables
drm/radeon/ci_dpm: Remove set but unused variable 'dpm_event_src'
drm/radeon/radeon_vm: Fix some function parameter documentation
drm/radeon/radeon_sync: Add description for function param 'rdev'
drm/radeon/radeon_ib: Supply description for 'radeon_ib_get's get
param
drm/radeon/radeon_dp_mst: Remove unused variable 'ret' from
radeon_mst_encoder_dpms()
drm/radeon/radeon_mn: Supply description for 'cur_seq' even if it is
unused
drm/radeon/evergreen_dma: Fix doc-rot of function parameter 'resv'
drm/radeon/cik_sdma: Demote vague attempt at kernel-doc
drm/radeon/r100: Fix some kernel-doc formatting, misnaming and missing
issues
drm/radeon/r600_cs: Fix some doc-rot and supply missing function param
docs
drm/radeon/evergreen_cs: Fix misnaming issues surrounding 'p' param
drm/radeon/radeon_drv: Move 'radeon_mmap()'s prototype to shared
header
drm/radeon/radeon_drv: Move 'radeon_driver_irq_handler_kms's prototype
into shared header
drm/radeon/atom: Move 'radeon_atom_hw_i2c_*()'s prototypes into shared
header
drm/radeon/radeon_gem: Move 'radeon_gem_prime_*()'s prototypes to
shared header
drm/radeon/evergreen_hdmi: Move 'evergreen_*()' and 'dce4_*()' HDMI
prototypes to shared header
drm/radeon/rv770: Move 'rv770_get_*()'s prototypes to shared header
drm/radeon/sumo_dpm: Move 'sumo_get_pi()'s prototype into shared
header
drm/radeon/ni_dpm: Move 'ni_get_{pi,ps}()'s into shared header
drm/radeon/ni: Remove set but unused variable 'mc_shared_chmap'
drm/radeon/evergreen: Move 'cayman_*()'s prototypes to shared header
drm/radeon/r600_dma: Move 'r600_gpu_check_soft_reset()'s prototype to
shared location
drm/radeon/cik: Move 'r600_ih_ring_{alloc,fini}()'s prototypes to
shared header
drivers/gpu/drm/radeon/atom.h | 6 +
drivers/gpu/drm/radeon/btc_dpm.c | 3 +-
drivers/gpu/drm/radeon/ci_dpm.c | 12 --
drivers/gpu/drm/radeon/cik.c | 7 +-
drivers/gpu/drm/radeon/cik_sdma.c | 4 +-
drivers/gpu/drm/radeon/cypress_dpm.c | 3 +-
drivers/gpu/drm/radeon/evergreen.c | 10 +-
drivers/gpu/drm/radeon/evergreen_cs.c | 6 +-
drivers/gpu/drm/radeon/evergreen_dma.c | 2 +-
drivers/gpu/drm/radeon/evergreen_hdmi.c | 1 +
drivers/gpu/drm/radeon/evergreen_hdmi.h | 69 ++++++++
drivers/gpu/drm/radeon/kv_dpm.c | 205 +-----------------------
drivers/gpu/drm/radeon/ni.c | 9 +-
drivers/gpu/drm/radeon/ni.h | 36 +++++
drivers/gpu/drm/radeon/ni_dpm.c | 2 +-
drivers/gpu/drm/radeon/ni_dpm.h | 3 +
drivers/gpu/drm/radeon/r100.c | 7 +-
drivers/gpu/drm/radeon/r600.c | 1 +
drivers/gpu/drm/radeon/r600.h | 35 ++++
drivers/gpu/drm/radeon/r600_cs.c | 9 +-
drivers/gpu/drm/radeon/r600_dma.c | 3 +-
drivers/gpu/drm/radeon/radeon_audio.c | 26 +--
drivers/gpu/drm/radeon/radeon_dp_mst.c | 16 +-
drivers/gpu/drm/radeon/radeon_drv.c | 7 +-
drivers/gpu/drm/radeon/radeon_gem.c | 9 +-
drivers/gpu/drm/radeon/radeon_i2c.c | 4 -
drivers/gpu/drm/radeon/radeon_ib.c | 1 +
drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 +
drivers/gpu/drm/radeon/radeon_kms.h | 5 +
drivers/gpu/drm/radeon/radeon_mn.c | 1 +
drivers/gpu/drm/radeon/radeon_prime.c | 1 +
drivers/gpu/drm/radeon/radeon_prime.h | 39 +++++
drivers/gpu/drm/radeon/radeon_sync.c | 1 +
drivers/gpu/drm/radeon/radeon_ttm.h | 1 +
drivers/gpu/drm/radeon/radeon_vm.c | 8 +-
drivers/gpu/drm/radeon/rv730_dpm.c | 4 +-
drivers/gpu/drm/radeon/rv740_dpm.c | 3 +-
drivers/gpu/drm/radeon/rv770.h | 5 +
drivers/gpu/drm/radeon/rv770_dpm.c | 1 +
drivers/gpu/drm/radeon/si.c | 7 +-
drivers/gpu/drm/radeon/si_dpm.c | 5 +-
drivers/gpu/drm/radeon/sumo_dpm.h | 1 +
drivers/gpu/drm/radeon/sumo_smc.c | 2 -
drivers/gpu/drm/radeon/trinity_dpm.c | 44 -----
44 files changed, 261 insertions(+), 364 deletions(-)
create mode 100644 drivers/gpu/drm/radeon/evergreen_hdmi.h
create mode 100644 drivers/gpu/drm/radeon/ni.h
create mode 100644 drivers/gpu/drm/radeon/r600.h
create mode 100644 drivers/gpu/drm/radeon/radeon_prime.h
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
Cc: Evan Quan <evan.quan@amd.com>
Cc: Gareth Hughes <gareth@valinux.com>
Cc: linaro-mm-sig@lists.linaro.org
Cc: linux-media@vger.kernel.org
Cc: Sumit Semwal <sumit.semwal@linaro.org>
--
2.25.1
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH 01/30] drm/radeon/evergreen: Add comment for 'evergreen_page_flip()'s 'async' param
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 22:52 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 02/30] drm/radeon/evergreen: Remove set but unused variable 'mc_shared_chmap' Lee Jones
` (28 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/evergreen.c: In function ‘evergreen_gpu_init’:
drivers/gpu/drm/radeon/evergreen.c:1419: warning: Function parameter or member 'async' not described in 'evergreen_page_flip'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/evergreen.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 4eb3f9bc8fa8b..c9a9a87959f9e 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -1412,6 +1412,7 @@ void dce4_wait_for_vblank(struct radeon_device *rdev, int crtc)
* @rdev: radeon_device pointer
* @crtc_id: crtc to cleanup pageflip on
* @crtc_base: new address of the crtc (GPU MC address)
+ * @async: Set retrace
*
* Triggers the actual pageflip by updating the primary
* surface base address (evergreen+).
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 02/30] drm/radeon/evergreen: Remove set but unused variable 'mc_shared_chmap'
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
2020-11-10 19:30 ` [PATCH 01/30] drm/radeon/evergreen: Add comment for 'evergreen_page_flip()'s 'async' param Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 22:50 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 03/30] drm/radeon/ni: Demote vague attempt at function header doc Lee Jones
` (27 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/evergreen.c: In function ‘evergreen_gpu_init’:
drivers/gpu/drm/radeon/evergreen.c:3135:6: warning: variable ‘mc_shared_chmap’ set but not used [-Wunused-but-set-variable]
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/evergreen.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index c9a9a87959f9e..efb19c445e48f 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3135,7 +3135,7 @@ static int evergreen_cp_resume(struct radeon_device *rdev)
static void evergreen_gpu_init(struct radeon_device *rdev)
{
u32 gb_addr_config;
- u32 mc_shared_chmap, mc_arb_ramcfg;
+ u32 mc_arb_ramcfg;
u32 sx_debug_1;
u32 smx_dc_ctl0;
u32 sq_config;
@@ -3399,7 +3399,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
evergreen_fix_pci_max_read_req_size(rdev);
- mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
+ RREG32(MC_SHARED_CHMAP);
if ((rdev->family == CHIP_PALM) ||
(rdev->family == CHIP_SUMO) ||
(rdev->family == CHIP_SUMO2))
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 03/30] drm/radeon/ni: Demote vague attempt at function header doc
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
2020-11-10 19:30 ` [PATCH 01/30] drm/radeon/evergreen: Add comment for 'evergreen_page_flip()'s 'async' param Lee Jones
2020-11-10 19:30 ` [PATCH 02/30] drm/radeon/evergreen: Remove set but unused variable 'mc_shared_chmap' Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:32 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 04/30] drm/radeon/si: Remove set but unused variable 'mc_shared_chmap' Lee Jones
` (26 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/ni.c: In function ‘cayman_gpu_init’:
drivers/gpu/drm/radeon/ni.c:2679: warning: Function parameter or member 'ring' not described in 'cayman_vm_flush'
drivers/gpu/drm/radeon/ni.c:2679: warning: Function parameter or member 'vm_id' not described in 'cayman_vm_flush'
drivers/gpu/drm/radeon/ni.c:2679: warning: Function parameter or member 'pd_addr' not described in 'cayman_vm_flush'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/ni.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 53a4d5c109794..12dd082069649 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -2668,11 +2668,9 @@ void cayman_vm_decode_fault(struct radeon_device *rdev,
block, mc_id);
}
-/**
+/*
* cayman_vm_flush - vm flush using the CP
*
- * @rdev: radeon_device pointer
- *
* Update the page table base and flush the VM TLB
* using the CP (cayman-si).
*/
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 04/30] drm/radeon/si: Remove set but unused variable 'mc_shared_chmap'
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (2 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 03/30] drm/radeon/ni: Demote vague attempt at function header doc Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 22:53 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 05/30] drm/radeon/cik: " Lee Jones
` (25 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/si.c: In function ‘si_gpu_init’:
drivers/gpu/drm/radeon/si.c:3090:6: warning: variable ‘mc_shared_chmap’ set but not used [-Wunused-but-set-variable]
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/si.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index c27af89785f34..45076c27d7ded 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -3088,7 +3088,7 @@ static void si_setup_rb(struct radeon_device *rdev,
static void si_gpu_init(struct radeon_device *rdev)
{
u32 gb_addr_config = 0;
- u32 mc_shared_chmap, mc_arb_ramcfg;
+ u32 mc_arb_ramcfg;
u32 sx_debug_1;
u32 hdp_host_path_cntl;
u32 tmp;
@@ -3200,7 +3200,7 @@ static void si_gpu_init(struct radeon_device *rdev)
WREG32(BIF_FB_EN, FB_READ_EN | FB_WRITE_EN);
- mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
+ RREG32(MC_SHARED_CHMAP);
mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
rdev->config.si.num_tile_pipes = rdev->config.si.max_tile_pipes;
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 05/30] drm/radeon/cik: Remove set but unused variable 'mc_shared_chmap'
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (3 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 04/30] drm/radeon/si: Remove set but unused variable 'mc_shared_chmap' Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:33 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 06/30] drm/radeon/trinity_dpm: Remove some defined but never used arrays Lee Jones
` (24 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, Sumit Semwal, amd-gfx, dri-devel, linux-media,
linaro-mm-sig
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/cik.c: In function ‘cik_gpu_init’:
drivers/gpu/drm/radeon/cik.c:3180:6: warning: variable ‘mc_shared_chmap’ set but not used [-Wunused-but-set-variable]
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/cik.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 4494f9122fd91..b94e2e678f255 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -3177,7 +3177,7 @@ static void cik_setup_rb(struct radeon_device *rdev,
static void cik_gpu_init(struct radeon_device *rdev)
{
u32 gb_addr_config = RREG32(GB_ADDR_CONFIG);
- u32 mc_shared_chmap, mc_arb_ramcfg;
+ u32 mc_arb_ramcfg;
u32 hdp_host_path_cntl;
u32 tmp;
int i, j;
@@ -3270,7 +3270,7 @@ static void cik_gpu_init(struct radeon_device *rdev)
WREG32(BIF_FB_EN, FB_READ_EN | FB_WRITE_EN);
- mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
+ RREG32(MC_SHARED_CHMAP);
mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
rdev->config.cik.num_tile_pipes = rdev->config.cik.max_tile_pipes;
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 06/30] drm/radeon/trinity_dpm: Remove some defined but never used arrays
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (4 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 05/30] drm/radeon/cik: " Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:38 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 07/30] drm/radeon/kv_dpm: Strip out unused functions and their tables Lee Jones
` (23 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/trinity_dpm.c:146:18: warning: ‘trinity_sysls_default’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/trinity_dpm.c:131:18: warning: ‘trinity_mgcg_shls_disable’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/trinity_dpm.c:120:18: warning: ‘trinity_mgcg_shls_enable’ defined but not used [-Wunused-const-variable=]
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/trinity_dpm.c | 44 ----------------------------
1 file changed, 44 deletions(-)
diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c
index 4d93b84aa7397..e005c18aac00e 100644
--- a/drivers/gpu/drm/radeon/trinity_dpm.c
+++ b/drivers/gpu/drm/radeon/trinity_dpm.c
@@ -116,55 +116,11 @@ static const u32 trinity_mgcg_shls_default[] =
0x00009220, 0x00090008, 0xffffffff,
0x00009294, 0x00000000, 0xffffffff
};
-
-static const u32 trinity_mgcg_shls_enable[] =
-{
- /* Register, Value, Mask */
- 0x0000802c, 0xc0000000, 0xffffffff,
- 0x000008f8, 0x00000000, 0xffffffff,
- 0x000008fc, 0x00000000, 0x000133FF,
- 0x000008f8, 0x00000001, 0xffffffff,
- 0x000008fc, 0x00000000, 0xE00B03FC,
- 0x00009150, 0x96944200, 0xffffffff
-};
-
-static const u32 trinity_mgcg_shls_disable[] =
-{
- /* Register, Value, Mask */
- 0x0000802c, 0xc0000000, 0xffffffff,
- 0x00009150, 0x00600000, 0xffffffff,
- 0x000008f8, 0x00000000, 0xffffffff,
- 0x000008fc, 0xffffffff, 0x000133FF,
- 0x000008f8, 0x00000001, 0xffffffff,
- 0x000008fc, 0xffffffff, 0xE00B03FC
-};
#endif
#ifndef TRINITY_SYSLS_SEQUENCE
#define TRINITY_SYSLS_SEQUENCE 100
-static const u32 trinity_sysls_default[] =
-{
- /* Register, Value, Mask */
- 0x000055e8, 0x00000000, 0xffffffff,
- 0x0000d0bc, 0x00000000, 0xffffffff,
- 0x0000d8bc, 0x00000000, 0xffffffff,
- 0x000015c0, 0x000c1401, 0xffffffff,
- 0x0000264c, 0x000c0400, 0xffffffff,
- 0x00002648, 0x000c0400, 0xffffffff,
- 0x00002650, 0x000c0400, 0xffffffff,
- 0x000020b8, 0x000c0400, 0xffffffff,
- 0x000020bc, 0x000c0400, 0xffffffff,
- 0x000020c0, 0x000c0c80, 0xffffffff,
- 0x0000f4a0, 0x000000c0, 0xffffffff,
- 0x0000f4a4, 0x00680fff, 0xffffffff,
- 0x00002f50, 0x00000404, 0xffffffff,
- 0x000004c8, 0x00000001, 0xffffffff,
- 0x0000641c, 0x00000000, 0xffffffff,
- 0x00000c7c, 0x00000000, 0xffffffff,
- 0x00006dfc, 0x00000000, 0xffffffff
-};
-
static const u32 trinity_sysls_disable[] =
{
/* Register, Value, Mask */
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 07/30] drm/radeon/kv_dpm: Strip out unused functions and their tables
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (5 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 06/30] drm/radeon/trinity_dpm: Remove some defined but never used arrays Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:37 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 08/30] drm/radeon/ci_dpm: Remove set but unused variable 'dpm_event_src' Lee Jones
` (22 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
These haven't been used since the driver was upstreamed in 2013.
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/kv_dpm.c:161:40: warning: ‘cpl_cac_config_reg’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:156:40: warning: ‘mc3_cac_config_reg’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:151:40: warning: ‘mc2_cac_config_reg’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:146:40: warning: ‘mc1_cac_config_reg’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:141:40: warning: ‘mc0_cac_config_reg’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:136:40: warning: ‘sx0_cac_config_reg’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:104:43: warning: ‘cpl_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:98:43: warning: ‘mc3_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:92:43: warning: ‘mc2_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:86:43: warning: ‘mc1_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:80:43: warning: ‘mc0_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
drivers/gpu/drm/radeon/kv_dpm.c:67:43: warning: ‘sx_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/kv_dpm.c | 205 +-------------------------------
1 file changed, 1 insertion(+), 204 deletions(-)
diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
index 5e6086eb18073..f7735da07feb9 100644
--- a/drivers/gpu/drm/radeon/kv_dpm.c
+++ b/drivers/gpu/drm/radeon/kv_dpm.c
@@ -64,105 +64,6 @@ extern void cik_exit_rlc_safe_mode(struct radeon_device *rdev);
extern void cik_update_cg(struct radeon_device *rdev,
u32 block, bool enable);
-static const struct kv_lcac_config_values sx_local_cac_cfg_kv[] =
-{
- { 0, 4, 1 },
- { 1, 4, 1 },
- { 2, 5, 1 },
- { 3, 4, 2 },
- { 4, 1, 1 },
- { 5, 5, 2 },
- { 6, 6, 1 },
- { 7, 9, 2 },
- { 0xffffffff }
-};
-
-static const struct kv_lcac_config_values mc0_local_cac_cfg_kv[] =
-{
- { 0, 4, 1 },
- { 0xffffffff }
-};
-
-static const struct kv_lcac_config_values mc1_local_cac_cfg_kv[] =
-{
- { 0, 4, 1 },
- { 0xffffffff }
-};
-
-static const struct kv_lcac_config_values mc2_local_cac_cfg_kv[] =
-{
- { 0, 4, 1 },
- { 0xffffffff }
-};
-
-static const struct kv_lcac_config_values mc3_local_cac_cfg_kv[] =
-{
- { 0, 4, 1 },
- { 0xffffffff }
-};
-
-static const struct kv_lcac_config_values cpl_local_cac_cfg_kv[] =
-{
- { 0, 4, 1 },
- { 1, 4, 1 },
- { 2, 5, 1 },
- { 3, 4, 1 },
- { 4, 1, 1 },
- { 5, 5, 1 },
- { 6, 6, 1 },
- { 7, 9, 1 },
- { 8, 4, 1 },
- { 9, 2, 1 },
- { 10, 3, 1 },
- { 11, 6, 1 },
- { 12, 8, 2 },
- { 13, 1, 1 },
- { 14, 2, 1 },
- { 15, 3, 1 },
- { 16, 1, 1 },
- { 17, 4, 1 },
- { 18, 3, 1 },
- { 19, 1, 1 },
- { 20, 8, 1 },
- { 21, 5, 1 },
- { 22, 1, 1 },
- { 23, 1, 1 },
- { 24, 4, 1 },
- { 27, 6, 1 },
- { 28, 1, 1 },
- { 0xffffffff }
-};
-
-static const struct kv_lcac_config_reg sx0_cac_config_reg[] =
-{
- { 0xc0400d00, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
-};
-
-static const struct kv_lcac_config_reg mc0_cac_config_reg[] =
-{
- { 0xc0400d30, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
-};
-
-static const struct kv_lcac_config_reg mc1_cac_config_reg[] =
-{
- { 0xc0400d3c, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
-};
-
-static const struct kv_lcac_config_reg mc2_cac_config_reg[] =
-{
- { 0xc0400d48, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
-};
-
-static const struct kv_lcac_config_reg mc3_cac_config_reg[] =
-{
- { 0xc0400d54, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
-};
-
-static const struct kv_lcac_config_reg cpl_cac_config_reg[] =
-{
- { 0xc0400d80, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
-};
-
static const struct kv_pt_config_reg didt_config_kv[] =
{
{ 0x10, 0x000000ff, 0, 0x0, KV_CONFIGREG_DIDT_IND },
@@ -254,32 +155,6 @@ static struct kv_power_info *kv_get_pi(struct radeon_device *rdev)
return pi;
}
-#if 0
-static void kv_program_local_cac_table(struct radeon_device *rdev,
- const struct kv_lcac_config_values *local_cac_table,
- const struct kv_lcac_config_reg *local_cac_reg)
-{
- u32 i, count, data;
- const struct kv_lcac_config_values *values = local_cac_table;
-
- while (values->block_id != 0xffffffff) {
- count = values->signal_id;
- for (i = 0; i < count; i++) {
- data = ((values->block_id << local_cac_reg->block_shift) &
- local_cac_reg->block_mask);
- data |= ((i << local_cac_reg->signal_shift) &
- local_cac_reg->signal_mask);
- data |= ((values->t << local_cac_reg->t_shift) &
- local_cac_reg->t_mask);
- data |= ((1 << local_cac_reg->enable_shift) &
- local_cac_reg->enable_mask);
- WREG32_SMC(local_cac_reg->cntl, data);
- }
- values++;
- }
-}
-#endif
-
static int kv_program_pt_config_registers(struct radeon_device *rdev,
const struct kv_pt_config_reg *cac_config_regs)
{
@@ -398,39 +273,6 @@ static int kv_enable_didt(struct radeon_device *rdev, bool enable)
return 0;
}
-#if 0
-static void kv_initialize_hardware_cac_manager(struct radeon_device *rdev)
-{
- struct kv_power_info *pi = kv_get_pi(rdev);
-
- if (pi->caps_cac) {
- WREG32_SMC(LCAC_SX0_OVR_SEL, 0);
- WREG32_SMC(LCAC_SX0_OVR_VAL, 0);
- kv_program_local_cac_table(rdev, sx_local_cac_cfg_kv, sx0_cac_config_reg);
-
- WREG32_SMC(LCAC_MC0_OVR_SEL, 0);
- WREG32_SMC(LCAC_MC0_OVR_VAL, 0);
- kv_program_local_cac_table(rdev, mc0_local_cac_cfg_kv, mc0_cac_config_reg);
-
- WREG32_SMC(LCAC_MC1_OVR_SEL, 0);
- WREG32_SMC(LCAC_MC1_OVR_VAL, 0);
- kv_program_local_cac_table(rdev, mc1_local_cac_cfg_kv, mc1_cac_config_reg);
-
- WREG32_SMC(LCAC_MC2_OVR_SEL, 0);
- WREG32_SMC(LCAC_MC2_OVR_VAL, 0);
- kv_program_local_cac_table(rdev, mc2_local_cac_cfg_kv, mc2_cac_config_reg);
-
- WREG32_SMC(LCAC_MC3_OVR_SEL, 0);
- WREG32_SMC(LCAC_MC3_OVR_VAL, 0);
- kv_program_local_cac_table(rdev, mc3_local_cac_cfg_kv, mc3_cac_config_reg);
-
- WREG32_SMC(LCAC_CPL_OVR_SEL, 0);
- WREG32_SMC(LCAC_CPL_OVR_VAL, 0);
- kv_program_local_cac_table(rdev, cpl_local_cac_cfg_kv, cpl_cac_config_reg);
- }
-}
-#endif
-
static int kv_enable_smc_cac(struct radeon_device *rdev, bool enable)
{
struct kv_power_info *pi = kv_get_pi(rdev);
@@ -1227,9 +1069,7 @@ int kv_dpm_enable(struct radeon_device *rdev)
return ret;
}
kv_program_vc(rdev);
-#if 0
- kv_initialize_hardware_cac_manager(rdev);
-#endif
+
kv_start_am(rdev);
if (pi->enable_auto_thermal_throttling) {
ret = kv_enable_auto_thermal_throttling(rdev);
@@ -1330,26 +1170,6 @@ void kv_dpm_disable(struct radeon_device *rdev)
kv_update_current_ps(rdev, rdev->pm.dpm.boot_ps);
}
-#if 0
-static int kv_write_smc_soft_register(struct radeon_device *rdev,
- u16 reg_offset, u32 value)
-{
- struct kv_power_info *pi = kv_get_pi(rdev);
-
- return kv_copy_bytes_to_smc(rdev, pi->soft_regs_start + reg_offset,
- (u8 *)&value, sizeof(u16), pi->sram_end);
-}
-
-static int kv_read_smc_soft_register(struct radeon_device *rdev,
- u16 reg_offset, u32 *value)
-{
- struct kv_power_info *pi = kv_get_pi(rdev);
-
- return kv_read_smc_sram_dword(rdev, pi->soft_regs_start + reg_offset,
- value, pi->sram_end);
-}
-#endif
-
static void kv_init_sclk_t(struct radeon_device *rdev)
{
struct kv_power_info *pi = kv_get_pi(rdev);
@@ -1939,29 +1759,6 @@ void kv_dpm_setup_asic(struct radeon_device *rdev)
kv_init_sclk_t(rdev);
}
-#if 0
-void kv_dpm_reset_asic(struct radeon_device *rdev)
-{
- struct kv_power_info *pi = kv_get_pi(rdev);
-
- if (rdev->family == CHIP_KABINI || rdev->family == CHIP_MULLINS) {
- kv_force_lowest_valid(rdev);
- kv_init_graphics_levels(rdev);
- kv_program_bootup_state(rdev);
- kv_upload_dpm_settings(rdev);
- kv_force_lowest_valid(rdev);
- kv_unforce_levels(rdev);
- } else {
- kv_init_graphics_levels(rdev);
- kv_program_bootup_state(rdev);
- kv_freeze_sclk_dpm(rdev, true);
- kv_upload_dpm_settings(rdev);
- kv_freeze_sclk_dpm(rdev, false);
- kv_set_enabled_level(rdev, pi->graphics_boot_level);
- }
-}
-#endif
-
//XXX use sumo_dpm_display_configuration_changed
static void kv_construct_max_power_limits_table(struct radeon_device *rdev,
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 08/30] drm/radeon/ci_dpm: Remove set but unused variable 'dpm_event_src'
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (6 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 07/30] drm/radeon/kv_dpm: Strip out unused functions and their tables Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:42 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 09/30] drm/radeon/radeon_vm: Fix some function parameter documentation Lee Jones
` (21 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
And the piece of code that has never been executed.
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/ci_dpm.c: In function ‘ci_set_dpm_event_sources’:
drivers/gpu/drm/radeon/ci_dpm.c:1369:28: warning: variable ‘dpm_event_src’ set but not used [-Wunused-but-set-variable]
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/ci_dpm.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index 886e9959496fe..8324aca5fd006 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -1366,7 +1366,6 @@ static void ci_set_dpm_event_sources(struct radeon_device *rdev, u32 sources)
{
struct ci_power_info *pi = ci_get_pi(rdev);
bool want_thermal_protection;
- enum radeon_dpm_event_src dpm_event_src;
u32 tmp;
switch (sources) {
@@ -1376,28 +1375,17 @@ static void ci_set_dpm_event_sources(struct radeon_device *rdev, u32 sources)
break;
case (1 << RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL):
want_thermal_protection = true;
- dpm_event_src = RADEON_DPM_EVENT_SRC_DIGITAL;
break;
case (1 << RADEON_DPM_AUTO_THROTTLE_SRC_EXTERNAL):
want_thermal_protection = true;
- dpm_event_src = RADEON_DPM_EVENT_SRC_EXTERNAL;
break;
case ((1 << RADEON_DPM_AUTO_THROTTLE_SRC_EXTERNAL) |
(1 << RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL)):
want_thermal_protection = true;
- dpm_event_src = RADEON_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL;
break;
}
if (want_thermal_protection) {
-#if 0
- /* XXX: need to figure out how to handle this properly */
- tmp = RREG32_SMC(CG_THERMAL_CTRL);
- tmp &= DPM_EVENT_SRC_MASK;
- tmp |= DPM_EVENT_SRC(dpm_event_src);
- WREG32_SMC(CG_THERMAL_CTRL, tmp);
-#endif
-
tmp = RREG32_SMC(GENERAL_PWRMGT);
if (pi->thermal_protection)
tmp &= ~THERMAL_PROTECTION_DIS;
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 09/30] drm/radeon/radeon_vm: Fix some function parameter documentation
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (7 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 08/30] drm/radeon/ci_dpm: Remove set but unused variable 'dpm_event_src' Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:36 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 10/30] drm/radeon/radeon_sync: Add description for function param 'rdev' Lee Jones
` (20 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/radeon_vm.c:131: warning: Function parameter or member 'rdev' not described in 'radeon_vm_get_bos'
drivers/gpu/drm/radeon/radeon_vm.c:643: warning: Excess function parameter 'start' description in 'radeon_vm_update_page_directory'
drivers/gpu/drm/radeon/radeon_vm.c:643: warning: Excess function parameter 'end' description in 'radeon_vm_update_page_directory'
drivers/gpu/drm/radeon/radeon_vm.c:819: warning: Function parameter or member 'ib' not described in 'radeon_vm_update_ptes'
drivers/gpu/drm/radeon/radeon_vm.c:915: warning: Function parameter or member 'bo_va' not described in 'radeon_vm_bo_update'
drivers/gpu/drm/radeon/radeon_vm.c:915: warning: Excess function parameter 'vm' description in 'radeon_vm_bo_update'
drivers/gpu/drm/radeon/radeon_vm.c:915: warning: Excess function parameter 'bo' description in 'radeon_vm_bo_update'
drivers/gpu/drm/radeon/radeon_vm.c:1155: warning: Excess function parameter 'vm' description in 'radeon_vm_bo_invalidate'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/radeon_vm.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 27b14eff532cb..71f2edcac6ea0 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -119,6 +119,7 @@ void radeon_vm_manager_fini(struct radeon_device *rdev)
/**
* radeon_vm_get_bos - add the vm BOs to a validation list
*
+ * @rdev: radeon_device pointer
* @vm: vm providing the BOs
* @head: head of validation list
*
@@ -629,8 +630,6 @@ static uint32_t radeon_vm_page_flags(uint32_t flags)
*
* @rdev: radeon_device pointer
* @vm: requested vm
- * @start: start of GPU address range
- * @end: end of GPU address range
*
* Allocates new page tables if necessary
* and updates the page directory (cayman+).
@@ -802,6 +801,7 @@ static void radeon_vm_frag_ptes(struct radeon_device *rdev,
*
* @rdev: radeon_device pointer
* @vm: requested vm
+ * @ib: indirect buffer to use for the update
* @start: start of GPU address range
* @end: end of GPU address range
* @dst: destination address to map to
@@ -900,8 +900,7 @@ static void radeon_vm_fence_pts(struct radeon_vm *vm,
* radeon_vm_bo_update - map a bo into the vm page table
*
* @rdev: radeon_device pointer
- * @vm: requested vm
- * @bo: radeon buffer object
+ * @bo_va: radeon buffer object
* @mem: ttm mem
*
* Fill in the page table entries for @bo (cayman+).
@@ -1145,7 +1144,6 @@ void radeon_vm_bo_rmv(struct radeon_device *rdev,
* radeon_vm_bo_invalidate - mark the bo as invalid
*
* @rdev: radeon_device pointer
- * @vm: requested vm
* @bo: radeon buffer object
*
* Mark @bo as invalid (cayman+).
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 10/30] drm/radeon/radeon_sync: Add description for function param 'rdev'
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (8 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 09/30] drm/radeon/radeon_vm: Fix some function parameter documentation Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:40 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 11/30] drm/radeon/radeon_ib: Supply description for 'radeon_ib_get's get param Lee Jones
` (19 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, Sumit Semwal, amd-gfx, dri-devel, linux-media,
linaro-mm-sig
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/radeon_sync.c:92: warning: Function parameter or member 'rdev' not described in 'radeon_sync_resv'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/radeon_sync.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/radeon/radeon_sync.c b/drivers/gpu/drm/radeon/radeon_sync.c
index 55cc77a73c7b7..5d3302945076b 100644
--- a/drivers/gpu/drm/radeon/radeon_sync.c
+++ b/drivers/gpu/drm/radeon/radeon_sync.c
@@ -79,6 +79,7 @@ void radeon_sync_fence(struct radeon_sync *sync,
/**
* radeon_sync_resv - use the semaphores to sync to a reservation object
*
+ * @rdev: radeon_device pointer
* @sync: sync object to add fences from reservation object to
* @resv: reservation object with embedded fence
* @shared: true if we should only sync to the exclusive fence
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 11/30] drm/radeon/radeon_ib: Supply description for 'radeon_ib_get's get param
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (9 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 10/30] drm/radeon/radeon_sync: Add description for function param 'rdev' Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:41 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 12/30] drm/radeon/radeon_dp_mst: Remove unused variable 'ret' from radeon_mst_encoder_dpms() Lee Jones
` (18 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/radeon_ib.c:61: warning: Function parameter or member 'vm' not described in 'radeon_ib_get'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/radeon_ib.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/radeon_ib.c
index 9fd55e9c616b0..c1fca2ba443c9 100644
--- a/drivers/gpu/drm/radeon/radeon_ib.c
+++ b/drivers/gpu/drm/radeon/radeon_ib.c
@@ -48,6 +48,7 @@ static int radeon_debugfs_sa_init(struct radeon_device *rdev);
*
* @rdev: radeon_device pointer
* @ring: ring index the IB is associated with
+ * @vm: requested vm
* @ib: IB object returned
* @size: requested IB size
*
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 12/30] drm/radeon/radeon_dp_mst: Remove unused variable 'ret' from radeon_mst_encoder_dpms()
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (10 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 11/30] drm/radeon/radeon_ib: Supply description for 'radeon_ib_get's get param Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:39 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 13/30] drm/radeon/radeon_mn: Supply description for 'cur_seq' even if it is unused Lee Jones
` (17 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/radeon_dp_mst.c: In function ‘radeon_mst_encoder_dpms’:
drivers/gpu/drm/radeon/radeon_dp_mst.c:366:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/radeon_dp_mst.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
index 008308780443c..2c32186c4acd9 100644
--- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
@@ -363,7 +363,7 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)
struct radeon_connector *radeon_connector;
struct drm_crtc *crtc;
struct radeon_crtc *radeon_crtc;
- int ret, slots;
+ int slots;
s64 fixed_pbn, fixed_pbn_per_slot, avg_time_slots_per_mtp;
if (!ASIC_IS_DCE5(rdev)) {
DRM_ERROR("got mst dpms on non-DCE5\n");
@@ -418,10 +418,10 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)
slots = drm_dp_find_vcpi_slots(&radeon_connector->mst_port->mst_mgr,
mst_enc->pbn);
- ret = drm_dp_mst_allocate_vcpi(&radeon_connector->mst_port->mst_mgr,
- radeon_connector->port,
- mst_enc->pbn, slots);
- ret = drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr);
+ drm_dp_mst_allocate_vcpi(&radeon_connector->mst_port->mst_mgr,
+ radeon_connector->port,
+ mst_enc->pbn, slots);
+ drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr);
radeon_dp_mst_set_be_cntl(primary, mst_enc,
radeon_connector->mst_port->hpd.hpd, true);
@@ -436,9 +436,9 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)
atombios_dig_encoder_setup2(&primary->base, ATOM_ENCODER_CMD_DP_VIDEO_ON, 0,
mst_enc->fe);
- ret = drm_dp_check_act_status(&radeon_connector->mst_port->mst_mgr);
+ drm_dp_check_act_status(&radeon_connector->mst_port->mst_mgr);
- ret = drm_dp_update_payload_part2(&radeon_connector->mst_port->mst_mgr);
+ drm_dp_update_payload_part2(&radeon_connector->mst_port->mst_mgr);
break;
case DRM_MODE_DPMS_STANDBY:
@@ -450,7 +450,7 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)
return;
drm_dp_mst_reset_vcpi_slots(&radeon_connector->mst_port->mst_mgr, mst_enc->port);
- ret = drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr);
+ drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr);
drm_dp_check_act_status(&radeon_connector->mst_port->mst_mgr);
/* and this can also fail */
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 13/30] drm/radeon/radeon_mn: Supply description for 'cur_seq' even if it is unused
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (11 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 12/30] drm/radeon/radeon_dp_mst: Remove unused variable 'ret' from radeon_mst_encoder_dpms() Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:52 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 14/30] drm/radeon/evergreen_dma: Fix doc-rot of function parameter 'resv' Lee Jones
` (16 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/radeon_mn.c:51: warning: Function parameter or member 'cur_seq' not described in 'radeon_mn_invalidate'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/radeon_mn.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c
index 97b9b6dd6dd3b..3c4c4213a7b57 100644
--- a/drivers/gpu/drm/radeon/radeon_mn.c
+++ b/drivers/gpu/drm/radeon/radeon_mn.c
@@ -41,6 +41,7 @@
*
* @mn: our notifier
* @range: the VMA under invalidation
+ * @cur_seq: unused
*
* We block for all BOs between start and end to be idle and
* unmap them by move them into system domain again.
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 14/30] drm/radeon/evergreen_dma: Fix doc-rot of function parameter 'resv'
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (12 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 13/30] drm/radeon/radeon_mn: Supply description for 'cur_seq' even if it is unused Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:57 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 15/30] drm/radeon/cik_sdma: Demote vague attempt at kernel-doc Lee Jones
` (15 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, Sumit Semwal, amd-gfx, dri-devel, linux-media,
linaro-mm-sig
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/evergreen_dma.c:112: warning: Function parameter or member 'resv' not described in 'evergreen_copy_dma'
drivers/gpu/drm/radeon/evergreen_dma.c:112: warning: Excess function parameter 'fence' description in 'evergreen_copy_dma'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/evergreen_dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c b/drivers/gpu/drm/radeon/evergreen_dma.c
index a46ee6c2099dd..767857d4a8c5c 100644
--- a/drivers/gpu/drm/radeon/evergreen_dma.c
+++ b/drivers/gpu/drm/radeon/evergreen_dma.c
@@ -98,7 +98,7 @@ void evergreen_dma_ring_ib_execute(struct radeon_device *rdev,
* @src_offset: src GPU address
* @dst_offset: dst GPU address
* @num_gpu_pages: number of GPU pages to xfer
- * @fence: radeon fence object
+ * @resv: reservation object with embedded fence
*
* Copy GPU paging using the DMA engine (evergreen-cayman).
* Used by the radeon ttm implementation to move pages if
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 15/30] drm/radeon/cik_sdma: Demote vague attempt at kernel-doc
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (13 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 14/30] drm/radeon/evergreen_dma: Fix doc-rot of function parameter 'resv' Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:56 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 16/30] drm/radeon/r100: Fix some kernel-doc formatting, misnaming and missing issues Lee Jones
` (14 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, Sumit Semwal, amd-gfx, dri-devel, linux-media,
linaro-mm-sig
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/cik_sdma.c:949: warning: Function parameter or member 'ring' not described in 'cik_dma_vm_flush'
drivers/gpu/drm/radeon/cik_sdma.c:949: warning: Function parameter or member 'vm_id' not described in 'cik_dma_vm_flush'
drivers/gpu/drm/radeon/cik_sdma.c:949: warning: Function parameter or member 'pd_addr' not described in 'cik_dma_vm_flush'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/cik_sdma.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
index 68403e77756d3..3c709ebe8d1ab 100644
--- a/drivers/gpu/drm/radeon/cik_sdma.c
+++ b/drivers/gpu/drm/radeon/cik_sdma.c
@@ -936,11 +936,9 @@ void cik_sdma_vm_pad_ib(struct radeon_ib *ib)
ib->ptr[ib->length_dw++] = SDMA_PACKET(SDMA_OPCODE_NOP, 0, 0);
}
-/**
+/*
* cik_dma_vm_flush - cik vm flush using sDMA
*
- * @rdev: radeon_device pointer
- *
* Update the page table base and flush the VM TLB
* using sDMA (CIK).
*/
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 16/30] drm/radeon/r100: Fix some kernel-doc formatting, misnaming and missing issues
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (14 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 15/30] drm/radeon/cik_sdma: Demote vague attempt at kernel-doc Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:54 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 17/30] drm/radeon/r600_cs: Fix some doc-rot and supply missing function param docs Lee Jones
` (13 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, Sumit Semwal, amd-gfx, dri-devel, linux-media,
linaro-mm-sig
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/r100.c:163: warning: Function parameter or member 'async' not described in 'r100_page_flip'
drivers/gpu/drm/radeon/r100.c:848: warning: Function parameter or member 'rdev' not described in 'r100_ring_hdp_flush'
drivers/gpu/drm/radeon/r100.c:848: warning: Function parameter or member 'ring' not described in 'r100_ring_hdp_flush'
drivers/gpu/drm/radeon/r100.c:1425: warning: Function parameter or member 'p' not described in 'r100_cs_packet_parse_vline'
drivers/gpu/drm/radeon/r100.c:1425: warning: Excess function parameter 'parser' description in 'r100_cs_packet_parse_vline'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/r100.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 24c8db673931a..92075dedf2cb2 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -153,6 +153,7 @@ void r100_wait_for_vblank(struct radeon_device *rdev, int crtc)
* @rdev: radeon_device pointer
* @crtc_id: crtc to cleanup pageflip on
* @crtc_base: new address of the crtc (GPU MC address)
+ * @async: unused
*
* Does the actual pageflip (r1xx-r4xx).
* During vblank we take the crtc lock and wait for the update_pending
@@ -841,8 +842,8 @@ u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc)
/**
* r100_ring_hdp_flush - flush Host Data Path via the ring buffer
- * rdev: radeon device structure
- * ring: ring buffer struct for emitting packets
+ * @rdev: radeon device structure
+ * @ring: ring buffer struct for emitting packets
*/
static void r100_ring_hdp_flush(struct radeon_device *rdev, struct radeon_ring *ring)
{
@@ -1409,7 +1410,7 @@ int r100_cs_parse_packet0(struct radeon_cs_parser *p,
/**
* r100_cs_packet_next_vline() - parse userspace VLINE packet
- * @parser: parser structure holding parsing context.
+ * @p: parser structure holding parsing context.
*
* Userspace sends a special sequence for VLINE waits.
* PACKET0 - VLINE_START_END + value
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 17/30] drm/radeon/r600_cs: Fix some doc-rot and supply missing function param docs
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (15 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 16/30] drm/radeon/r100: Fix some kernel-doc formatting, misnaming and missing issues Lee Jones
@ 2020-11-10 19:30 ` Lee Jones
2020-11-10 23:55 ` Alex Deucher
2020-11-10 19:31 ` [PATCH 18/30] drm/radeon/evergreen_cs: Fix misnaming issues surrounding 'p' param Lee Jones
` (12 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:30 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/r600_cs.c:793: warning: Function parameter or member 'p' not described in 'r600_cs_packet_parse_vline'
drivers/gpu/drm/radeon/r600_cs.c:793: warning: Excess function parameter 'parser' description in 'r600_cs_packet_parse_vline'
drivers/gpu/drm/radeon/r600_cs.c:826: warning: Function parameter or member 'p' not described in 'r600_cs_common_vline_parse'
drivers/gpu/drm/radeon/r600_cs.c:826: warning: Excess function parameter 'parser' description in 'r600_cs_common_vline_parse'
drivers/gpu/drm/radeon/r600_cs.c:968: warning: Function parameter or member 'p' not described in 'r600_cs_check_reg'
drivers/gpu/drm/radeon/r600_cs.c:968: warning: Excess function parameter 'parser' description in 'r600_cs_check_reg'
drivers/gpu/drm/radeon/r600_cs.c:1473: warning: Function parameter or member 'base_offset' not described in 'r600_check_texture_resource'
drivers/gpu/drm/radeon/r600_cs.c:1473: warning: Function parameter or member 'mip_offset' not described in 'r600_check_texture_resource'
drivers/gpu/drm/radeon/r600_cs.c:1473: warning: Function parameter or member 'tiling_flags' not described in 'r600_check_texture_resource'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/r600_cs.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index 390a9621604ae..f20b619466816 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -782,7 +782,7 @@ static int r600_cs_track_check(struct radeon_cs_parser *p)
/**
* r600_cs_packet_parse_vline() - parse userspace VLINE packet
- * @parser: parser structure holding parsing context.
+ * @p: parser structure holding parsing context.
*
* This is an R600-specific function for parsing VLINE packets.
* Real work is done by r600_cs_common_vline_parse function.
@@ -801,7 +801,7 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p)
/**
* r600_cs_common_vline_parse() - common vline parser
- * @parser: parser structure holding parsing context.
+ * @p: parser structure holding parsing context.
* @vline_start_end: table of vline_start_end registers
* @vline_status: table of vline_status registers
*
@@ -956,7 +956,7 @@ static int r600_cs_parse_packet0(struct radeon_cs_parser *p,
/**
* r600_cs_check_reg() - check if register is authorized or not
- * @parser: parser structure holding parsing context
+ * @p: parser structure holding parsing context
* @reg: register we are testing
* @idx: index into the cs buffer
*
@@ -1460,6 +1460,9 @@ static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned llevel,
* @idx: index into the cs buffer
* @texture: texture's bo structure
* @mipmap: mipmap's bo structure
+ * @base_offset: base offset (used for error checking)
+ * @mip_offset: mip offset (used for error checking)
+ * @tiling_flags: tiling flags
*
* This function will check that the resource has valid field and that
* the texture and mipmap bo object are big enough to cover this resource.
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 18/30] drm/radeon/evergreen_cs: Fix misnaming issues surrounding 'p' param
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (16 preceding siblings ...)
2020-11-10 19:30 ` [PATCH 17/30] drm/radeon/r600_cs: Fix some doc-rot and supply missing function param docs Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-10 23:57 ` Alex Deucher
2020-11-10 19:31 ` [PATCH 19/30] drm/radeon/radeon_drv: Move 'radeon_mmap()'s prototype to shared header Lee Jones
` (11 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/evergreen_cs.c:1026: warning: Function parameter or member 'p' not described in 'evergreen_cs_packet_parse_vline'
drivers/gpu/drm/radeon/evergreen_cs.c:1026: warning: Excess function parameter 'parser' description in 'evergreen_cs_packet_parse_vline'
drivers/gpu/drm/radeon/evergreen_cs.c:1095: warning: Function parameter or member 'p' not described in 'evergreen_cs_handle_reg'
drivers/gpu/drm/radeon/evergreen_cs.c:1095: warning: Excess function parameter 'parser' description in 'evergreen_cs_handle_reg'
drivers/gpu/drm/radeon/evergreen_cs.c:1757: warning: Function parameter or member 'p' not described in 'evergreen_is_safe_reg'
drivers/gpu/drm/radeon/evergreen_cs.c:1757: warning: Excess function parameter 'parser' description in 'evergreen_is_safe_reg'
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/evergreen_cs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index c410cad28f19f..53b75cf201958 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -1015,7 +1015,7 @@ static int evergreen_cs_track_check(struct radeon_cs_parser *p)
/**
* evergreen_cs_packet_parse_vline() - parse userspace VLINE packet
- * @parser: parser structure holding parsing context.
+ * @p: parser structure holding parsing context.
*
* This is an Evergreen(+)-specific function for parsing VLINE packets.
* Real work is done by r600_cs_common_vline_parse function.
@@ -1087,7 +1087,7 @@ static int evergreen_cs_parse_packet0(struct radeon_cs_parser *p,
/**
* evergreen_cs_handle_reg() - process registers that need special handling.
- * @parser: parser structure holding parsing context
+ * @p: parser structure holding parsing context
* @reg: register we are testing
* @idx: index into the cs buffer
*/
@@ -1747,7 +1747,7 @@ static int evergreen_cs_handle_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
/**
* evergreen_is_safe_reg() - check if register is authorized or not
- * @parser: parser structure holding parsing context
+ * @p: parser structure holding parsing context
* @reg: register we are testing
*
* This function will test against reg_safe_bm and return true
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 19/30] drm/radeon/radeon_drv: Move 'radeon_mmap()'s prototype to shared header
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (17 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 18/30] drm/radeon/evergreen_cs: Fix misnaming issues surrounding 'p' param Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-10 19:31 ` [PATCH 20/30] drm/radeon/radeon_drv: Move 'radeon_driver_irq_handler_kms's prototype into " Lee Jones
` (10 subsequent siblings)
29 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, Gareth Hughes, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/radeon_ttm.c:931:5: warning: no previous prototype for ‘radeon_mmap’ [-Wmissing-prototypes]
931 | int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
| ^~~~~~~~~~~
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Gareth Hughes <gareth@valinux.com>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
drivers/gpu/drm/radeon/radeon_ttm.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 536b246b9a6aa..2b9deaead99b2 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -51,6 +51,7 @@
#include <drm/radeon_drm.h>
#include "radeon_drv.h"
+#include "radeon_ttm.h"
#include "radeon.h"
#include "radeon_device.h"
@@ -125,7 +126,6 @@ extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int crtc,
ktime_t *stime, ktime_t *etime,
const struct drm_display_mode *mode);
extern bool radeon_is_px(struct drm_device *dev);
-int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
int radeon_mode_dumb_mmap(struct drm_file *filp,
struct drm_device *dev,
uint32_t handle, uint64_t *offset_p);
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.h b/drivers/gpu/drm/radeon/radeon_ttm.h
index 91ea7141bc812..4d7b90ee27740 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.h
+++ b/drivers/gpu/drm/radeon/radeon_ttm.h
@@ -32,5 +32,6 @@ struct radeon_device;
int radeon_ttm_init(struct radeon_device *rdev);
void radeon_ttm_fini(struct radeon_device *rdev);
+int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
#endif /* __RADEON_TTM_H__ */
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 20/30] drm/radeon/radeon_drv: Move 'radeon_driver_irq_handler_kms's prototype into shared header
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (18 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 19/30] drm/radeon/radeon_drv: Move 'radeon_mmap()'s prototype to shared header Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-10 19:31 ` [PATCH 21/30] drm/radeon/atom: Move 'radeon_atom_hw_i2c_*()'s prototypes " Lee Jones
` (9 subsequent siblings)
29 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, Gareth Hughes, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/radeon_irq_kms.c:53:13: warning: no previous prototype for ‘radeon_driver_irq_handler_kms’ [-Wmissing-prototypes]
53 | irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/radeon_irq_kms.c:120:6: warning: no previous prototype for ‘radeon_driver_irq_preinstall_kms’ [-Wmissing-prototypes]
120 | void radeon_driver_irq_preinstall_kms(struct drm_device *dev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/radeon_irq_kms.c:152:5: warning: no previous prototype for ‘radeon_driver_irq_postinstall_kms’ [-Wmissing-prototypes]
152 | int radeon_driver_irq_postinstall_kms(struct drm_device *dev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/radeon_irq_kms.c:171:6: warning: no previous prototype for ‘radeon_driver_irq_uninstall_kms’ [-Wmissing-prototypes]
171 | void radeon_driver_irq_uninstall_kms(struct drm_device *dev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Gareth Hughes <gareth@valinux.com>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/radeon_drv.c | 5 +----
drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 +
drivers/gpu/drm/radeon/radeon_kms.h | 5 +++++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 2b9deaead99b2..211932d73b191 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -51,6 +51,7 @@
#include <drm/radeon_drm.h>
#include "radeon_drv.h"
+#include "radeon_kms.h"
#include "radeon_ttm.h"
#include "radeon.h"
#include "radeon_device.h"
@@ -117,10 +118,6 @@
int radeon_suspend_kms(struct drm_device *dev, bool suspend,
bool fbcon, bool freeze);
int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon);
-void radeon_driver_irq_preinstall_kms(struct drm_device *dev);
-int radeon_driver_irq_postinstall_kms(struct drm_device *dev);
-void radeon_driver_irq_uninstall_kms(struct drm_device *dev);
-irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg);
extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int crtc,
unsigned int flags, int *vpos, int *hpos,
ktime_t *stime, ktime_t *etime,
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index 3521084030d24..7348ae52e2ef8 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -38,6 +38,7 @@
#include "atom.h"
#include "radeon.h"
+#include "radeon_kms.h"
#include "radeon_reg.h"
diff --git a/drivers/gpu/drm/radeon/radeon_kms.h b/drivers/gpu/drm/radeon/radeon_kms.h
index 36e73cea92154..913c8239d5d8d 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.h
+++ b/drivers/gpu/drm/radeon/radeon_kms.h
@@ -32,4 +32,9 @@ 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);
+irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg);
+void radeon_driver_irq_preinstall_kms(struct drm_device *dev);
+int radeon_driver_irq_postinstall_kms(struct drm_device *dev);
+void radeon_driver_irq_uninstall_kms(struct drm_device *dev);
+
#endif /* __RADEON_KMS_H__ */
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 21/30] drm/radeon/atom: Move 'radeon_atom_hw_i2c_*()'s prototypes into shared header
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (19 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 20/30] drm/radeon/radeon_drv: Move 'radeon_driver_irq_handler_kms's prototype into " Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-10 19:31 ` [PATCH 22/30] drm/radeon/radeon_gem: Move 'radeon_gem_prime_*()'s prototypes to " Lee Jones
` (8 subsequent siblings)
29 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/atombios_i2c.c:100:5: warning: no previous prototype for ‘radeon_atom_hw_i2c_xfer’ [-Wmissing-prototypes]
100 | int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/atombios_i2c.c:150:5: warning: no previous prototype for ‘radeon_atom_hw_i2c_func’ [-Wmissing-prototypes]
150 | u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap)
| ^~~~~~~~~~~~~~~~~~~~~~~
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/atom.h | 6 ++++++
drivers/gpu/drm/radeon/radeon_i2c.c | 4 ----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/radeon/atom.h b/drivers/gpu/drm/radeon/atom.h
index cb93b83114dbe..efc05e33b220c 100644
--- a/drivers/gpu/drm/radeon/atom.h
+++ b/drivers/gpu/drm/radeon/atom.h
@@ -160,6 +160,12 @@ struct radeon_device;
bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index,
struct drm_display_mode *mode);
+struct i2c_msg;
+struct i2c_adapter;
+int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap,
+ struct i2c_msg *msgs, int num);
+u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap);
+
#include "atom-types.h"
#include "atombios.h"
#include "ObjectID.h"
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
index aa61b3cb4049c..e543d993f73ee 100644
--- a/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
@@ -34,10 +34,6 @@
#include "radeon.h"
#include "atom.h"
-extern int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap,
- struct i2c_msg *msgs, int num);
-extern u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap);
-
bool radeon_ddc_probe(struct radeon_connector *radeon_connector, bool use_aux)
{
u8 out = 0x0;
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 22/30] drm/radeon/radeon_gem: Move 'radeon_gem_prime_*()'s prototypes to shared header
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (20 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 21/30] drm/radeon/atom: Move 'radeon_atom_hw_i2c_*()'s prototypes " Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-10 19:31 ` [PATCH 23/30] drm/radeon/evergreen_hdmi: Move 'evergreen_*()' and 'dce4_*()' HDMI " Lee Jones
` (7 subsequent siblings)
29 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/radeon_prime.c:34:18: warning: no previous prototype for ‘radeon_gem_prime_get_sg_table’ [-Wmissing-prototypes]
34 | struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/radeon_prime.c:42:7: warning: no previous prototype for ‘radeon_gem_prime_vmap’ [-Wmissing-prototypes]
42 | void *radeon_gem_prime_vmap(struct drm_gem_object *obj)
| ^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/radeon_prime.c:55:6: warning: no previous prototype for ‘radeon_gem_prime_vunmap’ [-Wmissing-prototypes]
55 | void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/radeon_prime.c:62:24: warning: no previous prototype for ‘radeon_gem_prime_import_sg_table’ [-Wmissing-prototypes]
62 | struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/radeon_prime.c:86:5: warning: no previous prototype for ‘radeon_gem_prime_pin’ [-Wmissing-prototypes]
86 | int radeon_gem_prime_pin(struct drm_gem_object *obj)
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/radeon_prime.c:104:6: warning: no previous prototype for ‘radeon_gem_prime_unpin’ [-Wmissing-prototypes]
104 | void radeon_gem_prime_unpin(struct drm_gem_object *obj)
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/radeon_prime.c:120:17: warning: no previous prototype for ‘radeon_gem_prime_export’ [-Wmissing-prototypes]
120 | struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj,
| ^~~~~~~~~~~~~~~~~~~~~~~
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/radeon_gem.c | 9 +------
drivers/gpu/drm/radeon/radeon_prime.c | 1 +
drivers/gpu/drm/radeon/radeon_prime.h | 39 +++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 8 deletions(-)
create mode 100644 drivers/gpu/drm/radeon/radeon_prime.h
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 0ccd7213e41ff..6db11e357565b 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -34,14 +34,7 @@
#include <drm/radeon_drm.h>
#include "radeon.h"
-
-struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj,
- int flags);
-struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj);
-int radeon_gem_prime_pin(struct drm_gem_object *obj);
-void radeon_gem_prime_unpin(struct drm_gem_object *obj);
-void *radeon_gem_prime_vmap(struct drm_gem_object *obj);
-void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
+#include "radeon_prime.h"
static const struct drm_gem_object_funcs radeon_gem_object_funcs;
diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
index b9de0e51c0be9..789e076efbdc6 100644
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c
@@ -30,6 +30,7 @@
#include <drm/radeon_drm.h>
#include "radeon.h"
+#include "radeon_prime.h"
struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj)
{
diff --git a/drivers/gpu/drm/radeon/radeon_prime.h b/drivers/gpu/drm/radeon/radeon_prime.h
new file mode 100644
index 0000000000000..11b7f80987834
--- /dev/null
+++ b/drivers/gpu/drm/radeon/radeon_prime.h
@@ -0,0 +1,39 @@
+/* radeon_prime.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_PRIME_H__
+#define __RADEON_PRIME_H__
+
+struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj,
+ int flags);
+struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj);
+int radeon_gem_prime_pin(struct drm_gem_object *obj);
+void radeon_gem_prime_unpin(struct drm_gem_object *obj);
+void *radeon_gem_prime_vmap(struct drm_gem_object *obj);
+void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
+
+#endif /* __RADEON_PRIME_H__ */
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 23/30] drm/radeon/evergreen_hdmi: Move 'evergreen_*()' and 'dce4_*()' HDMI prototypes to shared header
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (21 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 22/30] drm/radeon/radeon_gem: Move 'radeon_gem_prime_*()'s prototypes to " Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-10 19:31 ` [PATCH 24/30] drm/radeon/rv770: Move 'rv770_get_*()'s " Lee Jones
` (6 subsequent siblings)
29 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/evergreen_hdmi.c:37:6: warning: no previous prototype for ‘dce4_audio_enable’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:67:6: warning: no previous prototype for ‘evergreen_hdmi_update_acr’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:97:6: warning: no previous prototype for ‘dce4_afmt_write_latency_fields’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:119:6: warning: no previous prototype for ‘dce4_afmt_hdmi_write_speaker_allocation’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:137:6: warning: no previous prototype for ‘dce4_afmt_dp_write_speaker_allocation’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:155:6: warning: no previous prototype for ‘evergreen_hdmi_write_sad_regs’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:208:6: warning: no previous prototype for ‘evergreen_set_avi_packet’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:227:6: warning: no previous prototype for ‘dce4_hdmi_audio_set_dto’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:270:6: warning: no previous prototype for ‘dce4_dp_audio_set_dto’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:306:6: warning: no previous prototype for ‘dce4_set_vbi_packet’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:317:6: warning: no previous prototype for ‘dce4_hdmi_set_color_depth’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:354:6: warning: no previous prototype for ‘dce4_set_audio_packet’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:389:6: warning: no previous prototype for ‘dce4_set_mute’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:400:6: warning: no previous prototype for ‘evergreen_hdmi_enable’ [-Wmissing-prototypes]
drivers/gpu/drm/radeon/evergreen_hdmi.c:440:6: warning: no previous prototype for ‘evergreen_dp_enable’ [-Wmissing-prototypes]
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/evergreen_hdmi.c | 1 +
drivers/gpu/drm/radeon/evergreen_hdmi.h | 69 +++++++++++++++++++++++++
drivers/gpu/drm/radeon/radeon_audio.c | 26 +---------
3 files changed, 71 insertions(+), 25 deletions(-)
create mode 100644 drivers/gpu/drm/radeon/evergreen_hdmi.h
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index 739336a48d085..5f3078f8ab950 100644
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -27,6 +27,7 @@
#include <linux/hdmi.h>
#include <drm/radeon_drm.h>
+#include "evergreen_hdmi.h"
#include "radeon.h"
#include "radeon_asic.h"
#include "radeon_audio.h"
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.h b/drivers/gpu/drm/radeon/evergreen_hdmi.h
new file mode 100644
index 0000000000000..c86276b8d7f58
--- /dev/null
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.h
@@ -0,0 +1,69 @@
+/* evergreen_hdmi.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 __EVERGREEN_HDMI_H__
+#define __EVERGREEN_HDMI_H__
+
+struct cea_sa;
+struct cea_sad;
+struct drm_connector;
+struct drm_display_mode;
+struct drm_encoder;
+struct r600_audio_pin;
+struct radeon_crtc;
+struct radeon_device;
+struct radeon_hdmi_acr;
+
+void evergreen_hdmi_write_sad_regs(struct drm_encoder *encoder,
+ struct cea_sad *sads, int sad_count);
+void evergreen_set_avi_packet(struct radeon_device *rdev, u32 offset,
+ unsigned char *buffer, size_t size);
+void evergreen_hdmi_update_acr(struct drm_encoder *encoder, long offset,
+ const struct radeon_hdmi_acr *acr);
+void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable);
+void evergreen_dp_enable(struct drm_encoder *encoder, bool enable);
+
+void dce4_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin,
+ u8 enable_mask);
+void dce4_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder,
+ u8 *sadb, int sad_count);
+void dce4_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder,
+ u8 *sadb, int sad_count);
+void dce4_afmt_write_latency_fields(struct drm_encoder *encoder,
+ struct drm_connector *connector,
+ struct drm_display_mode *mode);
+void dce4_hdmi_audio_set_dto(struct radeon_device *rdev,
+ struct radeon_crtc *crtc, unsigned int clock);
+void dce4_dp_audio_set_dto(struct radeon_device *rdev,
+ struct radeon_crtc *crtc, unsigned int clock);
+void dce4_set_vbi_packet(struct drm_encoder *encoder, u32 offset);
+void dce4_hdmi_set_color_depth(struct drm_encoder *encoder,
+ u32 offset, int bpc);
+void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset);
+void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute);
+
+#endif /* __EVERGREEN_HDMI_H__ */
diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
index 18228b366752e..7a59028f64fbc 100644
--- a/drivers/gpu/drm/radeon/radeon_audio.c
+++ b/drivers/gpu/drm/radeon/radeon_audio.c
@@ -25,6 +25,7 @@
#include <linux/gcd.h>
#include <drm/drm_crtc.h>
+#include "evergreen_hdmi.h"
#include "radeon.h"
#include "atom.h"
#include "r600d.h"
@@ -32,55 +33,30 @@
void r600_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin,
u8 enable_mask);
-void dce4_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin,
- u8 enable_mask);
void dce6_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin,
u8 enable_mask);
u32 dce6_endpoint_rreg(struct radeon_device *rdev, u32 offset, u32 reg);
void dce6_endpoint_wreg(struct radeon_device *rdev,
u32 offset, u32 reg, u32 v);
-void evergreen_hdmi_write_sad_regs(struct drm_encoder *encoder,
- struct cea_sad *sads, int sad_count);
void dce6_afmt_write_sad_regs(struct drm_encoder *encoder,
struct cea_sad *sads, int sad_count);
-void dce4_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder,
- u8 *sadb, int sad_count);
-void dce4_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder,
- u8 *sadb, int sad_count);
void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder,
u8 *sadb, int sad_count);
void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder,
u8 *sadb, int sad_count);
-void dce4_afmt_write_latency_fields(struct drm_encoder *encoder,
- struct drm_connector *connector, struct drm_display_mode *mode);
void dce6_afmt_write_latency_fields(struct drm_encoder *encoder,
struct drm_connector *connector, struct drm_display_mode *mode);
struct r600_audio_pin* r600_audio_get_pin(struct radeon_device *rdev);
struct r600_audio_pin* dce6_audio_get_pin(struct radeon_device *rdev);
void dce6_afmt_select_pin(struct drm_encoder *encoder);
-void dce4_hdmi_audio_set_dto(struct radeon_device *rdev,
- struct radeon_crtc *crtc, unsigned int clock);
-void dce4_dp_audio_set_dto(struct radeon_device *rdev,
- struct radeon_crtc *crtc, unsigned int clock);
void dce6_hdmi_audio_set_dto(struct radeon_device *rdev,
struct radeon_crtc *crtc, unsigned int clock);
void dce6_dp_audio_set_dto(struct radeon_device *rdev,
struct radeon_crtc *crtc, unsigned int clock);
-void evergreen_set_avi_packet(struct radeon_device *rdev, u32 offset,
- unsigned char *buffer, size_t size);
-void evergreen_hdmi_update_acr(struct drm_encoder *encoder, long offset,
- const struct radeon_hdmi_acr *acr);
-void dce4_set_vbi_packet(struct drm_encoder *encoder, u32 offset);
-void dce4_hdmi_set_color_depth(struct drm_encoder *encoder,
- u32 offset, int bpc);
-void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset);
-void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute);
static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode);
static void radeon_audio_dp_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode);
-void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable);
-void evergreen_dp_enable(struct drm_encoder *encoder, bool enable);
static const u32 pin_offsets[7] =
{
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 24/30] drm/radeon/rv770: Move 'rv770_get_*()'s prototypes to shared header
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (22 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 23/30] drm/radeon/evergreen_hdmi: Move 'evergreen_*()' and 'dce4_*()' HDMI " Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-10 19:31 ` [PATCH 25/30] drm/radeon/sumo_dpm: Move 'sumo_get_pi()'s prototype into " Lee Jones
` (5 subsequent siblings)
29 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Evan Quan, Alex Deucher, Christian König,
David Airlie, Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/rv770_dpm.c:47:18: warning: no previous prototype for ‘rv770_get_ps’ [-Wmissing-prototypes]
47 | struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps)
| ^~~~~~~~~~~~
drivers/gpu/drm/radeon/rv770_dpm.c:54:26: warning: no previous prototype for ‘rv770_get_pi’ [-Wmissing-prototypes]
54 | struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev)
| ^~~~~~~~~~~~
Cc: Evan Quan <evan.quan@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/btc_dpm.c | 3 +--
drivers/gpu/drm/radeon/cypress_dpm.c | 3 +--
drivers/gpu/drm/radeon/ni_dpm.c | 2 +-
drivers/gpu/drm/radeon/rv730_dpm.c | 4 +---
drivers/gpu/drm/radeon/rv740_dpm.c | 3 +--
drivers/gpu/drm/radeon/rv770.h | 5 +++++
drivers/gpu/drm/radeon/rv770_dpm.c | 1 +
drivers/gpu/drm/radeon/si_dpm.c | 2 +-
8 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c
index d1d8aaf8323c2..018949668536e 100644
--- a/drivers/gpu/drm/radeon/btc_dpm.c
+++ b/drivers/gpu/drm/radeon/btc_dpm.c
@@ -30,6 +30,7 @@
#include "btcd.h"
#include "cypress_dpm.h"
#include "r600_dpm.h"
+#include "rv770.h"
#include "radeon.h"
#include "radeon_asic.h"
@@ -48,8 +49,6 @@
#ifndef BTC_MGCG_SEQUENCE
#define BTC_MGCG_SEQUENCE 300
-struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps);
-struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev);
struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);
extern int ni_mc_load_microcode(struct radeon_device *rdev);
diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c
index 35b177d777913..6d3690bcca2d2 100644
--- a/drivers/gpu/drm/radeon/cypress_dpm.c
+++ b/drivers/gpu/drm/radeon/cypress_dpm.c
@@ -28,6 +28,7 @@
#include "cypress_dpm.h"
#include "evergreend.h"
#include "r600_dpm.h"
+#include "rv770.h"
#include "radeon.h"
#include "radeon_asic.h"
@@ -43,8 +44,6 @@
#define MC_CG_SEQ_YCLK_SUSPEND 0x04
#define MC_CG_SEQ_YCLK_RESUME 0x0a
-struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps);
-struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev);
struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);
static void cypress_enable_bif_dynamic_pcie_gen2(struct radeon_device *rdev,
diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c
index 59cdadcece159..d39bbd9793cc2 100644
--- a/drivers/gpu/drm/radeon/ni_dpm.c
+++ b/drivers/gpu/drm/radeon/ni_dpm.c
@@ -29,6 +29,7 @@
#include "ni_dpm.h"
#include "nid.h"
#include "r600_dpm.h"
+#include "rv770.h"
#include "radeon.h"
#include "radeon_asic.h"
@@ -719,7 +720,6 @@ static const u32 cayman_sysls_enable[] =
};
#define CAYMAN_SYSLS_ENABLE_LENGTH sizeof(cayman_sysls_enable) / (3 * sizeof(u32))
-struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev);
struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);
extern int ni_mc_load_microcode(struct radeon_device *rdev);
diff --git a/drivers/gpu/drm/radeon/rv730_dpm.c b/drivers/gpu/drm/radeon/rv730_dpm.c
index 84a3d6d724866..a9de5c953396a 100644
--- a/drivers/gpu/drm/radeon/rv730_dpm.c
+++ b/drivers/gpu/drm/radeon/rv730_dpm.c
@@ -25,6 +25,7 @@
#include "radeon.h"
#include "rv730d.h"
#include "r600_dpm.h"
+#include "rv770.h"
#include "rv770_dpm.h"
#include "atom.h"
@@ -33,9 +34,6 @@
#define MC_CG_ARB_FREQ_F2 0x0c
#define MC_CG_ARB_FREQ_F3 0x0d
-struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps);
-struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev);
-
int rv730_populate_sclk_value(struct radeon_device *rdev,
u32 engine_clock,
RV770_SMC_SCLK_VALUE *sclk)
diff --git a/drivers/gpu/drm/radeon/rv740_dpm.c b/drivers/gpu/drm/radeon/rv740_dpm.c
index 327d65a76e1f4..d57a3e1df8d63 100644
--- a/drivers/gpu/drm/radeon/rv740_dpm.c
+++ b/drivers/gpu/drm/radeon/rv740_dpm.c
@@ -25,11 +25,10 @@
#include "radeon.h"
#include "rv740d.h"
#include "r600_dpm.h"
+#include "rv770.h"
#include "rv770_dpm.h"
#include "atom.h"
-struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev);
-
u32 rv740_get_decoded_reference_divider(u32 encoded_ref)
{
u32 ref = 0;
diff --git a/drivers/gpu/drm/radeon/rv770.h b/drivers/gpu/drm/radeon/rv770.h
index de831684c9926..cf234d59f0475 100644
--- a/drivers/gpu/drm/radeon/rv770.h
+++ b/drivers/gpu/drm/radeon/rv770.h
@@ -28,6 +28,11 @@
#ifndef __RADEON_RV770_H__
#define __RADEON_RV770_H__
+struct radeon_ps;
+
void rv770_set_clk_bypass_mode(struct radeon_device *rdev);
+struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps);
+struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev);
+
#endif /* __RADEON_RV770_H__ */
diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c
index 4a0cf597c11c6..badd8ac6e038f 100644
--- a/drivers/gpu/drm/radeon/rv770_dpm.c
+++ b/drivers/gpu/drm/radeon/rv770_dpm.c
@@ -24,6 +24,7 @@
#include "radeon.h"
#include "radeon_asic.h"
+#include "rv770.h"
#include "rv770d.h"
#include "r600_dpm.h"
#include "rv770_dpm.h"
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index d1c73e9db889a..a80a21447a76d 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -27,6 +27,7 @@
#include "atom.h"
#include "r600_dpm.h"
+#include "rv770.h"
#include "radeon.h"
#include "radeon_asic.h"
#include "si_dpm.h"
@@ -1717,7 +1718,6 @@ static const struct si_powertune_data powertune_data_hainan =
true
};
-struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev);
struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);
struct ni_power_info *ni_get_pi(struct radeon_device *rdev);
struct ni_ps *ni_get_ps(struct radeon_ps *rps);
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 25/30] drm/radeon/sumo_dpm: Move 'sumo_get_pi()'s prototype into shared header
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (23 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 24/30] drm/radeon/rv770: Move 'rv770_get_*()'s " Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-11 0:05 ` Alex Deucher
2020-11-10 19:31 ` [PATCH 26/30] drm/radeon/ni_dpm: Move 'ni_get_{pi,ps}()'s " Lee Jones
` (4 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/sumo_dpm.c:81:25: warning: no previous prototype for ‘sumo_get_pi’ [-Wmissing-prototypes]
81 | struct sumo_power_info *sumo_get_pi(struct radeon_device *rdev)
| ^~~~~~~~~~~
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/sumo_dpm.h | 1 +
drivers/gpu/drm/radeon/sumo_smc.c | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/sumo_dpm.h b/drivers/gpu/drm/radeon/sumo_dpm.h
index f1651135a47ab..db29d37ae2703 100644
--- a/drivers/gpu/drm/radeon/sumo_dpm.h
+++ b/drivers/gpu/drm/radeon/sumo_dpm.h
@@ -207,6 +207,7 @@ u32 sumo_get_sleep_divider_from_id(u32 id);
u32 sumo_get_sleep_divider_id_from_clock(struct radeon_device *rdev,
u32 sclk,
u32 min_sclk_in_sr);
+struct sumo_power_info *sumo_get_pi(struct radeon_device *rdev);
/* sumo_smc.c */
void sumo_initialize_m3_arb(struct radeon_device *rdev);
diff --git a/drivers/gpu/drm/radeon/sumo_smc.c b/drivers/gpu/drm/radeon/sumo_smc.c
index d781407057366..78d8716067318 100644
--- a/drivers/gpu/drm/radeon/sumo_smc.c
+++ b/drivers/gpu/drm/radeon/sumo_smc.c
@@ -30,8 +30,6 @@
#define SUMO_SMU_SERVICE_ROUTINE_ALTVDDNB_NOTIFY 27
#define SUMO_SMU_SERVICE_ROUTINE_GFX_SRV_ID_20 20
-struct sumo_power_info *sumo_get_pi(struct radeon_device *rdev);
-
static void sumo_send_msg_to_smu(struct radeon_device *rdev, u32 id)
{
u32 gfx_int_req;
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 26/30] drm/radeon/ni_dpm: Move 'ni_get_{pi,ps}()'s into shared header
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (24 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 25/30] drm/radeon/sumo_dpm: Move 'sumo_get_pi()'s prototype into " Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-10 19:31 ` [PATCH 27/30] drm/radeon/ni: Remove set but unused variable 'mc_shared_chmap' Lee Jones
` (3 subsequent siblings)
29 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/ni_dpm.c:727:23: warning: no previous prototype for ‘ni_get_pi’ [-Wmissing-prototypes]
727 | struct ni_power_info *ni_get_pi(struct radeon_device *rdev)
| ^~~~~~~~~
drivers/gpu/drm/radeon/ni_dpm.c:734:15: warning: no previous prototype for ‘ni_get_ps’ [-Wmissing-prototypes]
734 | struct ni_ps *ni_get_ps(struct radeon_ps *rps)
| ^~~~~~~~~
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/ni_dpm.h | 3 +++
drivers/gpu/drm/radeon/si_dpm.c | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/ni_dpm.h b/drivers/gpu/drm/radeon/ni_dpm.h
index 6bbee9180909e..74e3019369063 100644
--- a/drivers/gpu/drm/radeon/ni_dpm.h
+++ b/drivers/gpu/drm/radeon/ni_dpm.h
@@ -247,4 +247,7 @@ void ni_set_uvd_clock_after_set_eng_clock(struct radeon_device *rdev,
bool ni_dpm_vblank_too_short(struct radeon_device *rdev);
+struct ni_power_info *ni_get_pi(struct radeon_device *rdev);
+struct ni_ps *ni_get_ps(struct radeon_ps *rps);
+
#endif
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index a80a21447a76d..c68ab2fb1ac23 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -30,6 +30,7 @@
#include "rv770.h"
#include "radeon.h"
#include "radeon_asic.h"
+#include "ni_dpm.h"
#include "si_dpm.h"
#include "sid.h"
@@ -1719,8 +1720,6 @@ static const struct si_powertune_data powertune_data_hainan =
};
struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);
-struct ni_power_info *ni_get_pi(struct radeon_device *rdev);
-struct ni_ps *ni_get_ps(struct radeon_ps *rps);
extern int si_mc_load_microcode(struct radeon_device *rdev);
extern void vce_v1_0_enable_mgcg(struct radeon_device *rdev, bool enable);
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 27/30] drm/radeon/ni: Remove set but unused variable 'mc_shared_chmap'
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (25 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 26/30] drm/radeon/ni_dpm: Move 'ni_get_{pi,ps}()'s " Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-11 0:03 ` Alex Deucher
2020-11-10 19:31 ` [PATCH 28/30] drm/radeon/evergreen: Move 'cayman_*()'s prototypes to shared header Lee Jones
` (2 subsequent siblings)
29 siblings, 1 reply; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/ni.c: In function ‘cayman_gpu_init’:
drivers/gpu/drm/radeon/ni.c:880:6: warning: variable ‘mc_shared_chmap’ set but not used [-Wunused-but-set-variable]
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/ni.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 12dd082069649..1c9030a4631b8 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -877,7 +877,7 @@ int tn_get_temp(struct radeon_device *rdev)
static void cayman_gpu_init(struct radeon_device *rdev)
{
u32 gb_addr_config = 0;
- u32 mc_shared_chmap, mc_arb_ramcfg;
+ u32 mc_arb_ramcfg;
u32 cgts_tcc_disable;
u32 sx_debug_1;
u32 smx_dc_ctl0;
@@ -1002,7 +1002,7 @@ static void cayman_gpu_init(struct radeon_device *rdev)
evergreen_fix_pci_max_read_req_size(rdev);
- mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
+ RREG32(MC_SHARED_CHMAP);
mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
tmp = (mc_arb_ramcfg & NOOFCOLS_MASK) >> NOOFCOLS_SHIFT;
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 28/30] drm/radeon/evergreen: Move 'cayman_*()'s prototypes to shared header
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (26 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 27/30] drm/radeon/ni: Remove set but unused variable 'mc_shared_chmap' Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-10 19:31 ` [PATCH 29/30] drm/radeon/r600_dma: Move 'r600_gpu_check_soft_reset()'s prototype to shared location Lee Jones
2020-11-10 19:31 ` [PATCH 30/30] drm/radeon/cik: Move 'r600_ih_ring_{alloc,fini}()'s prototypes to shared header Lee Jones
29 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, amd-gfx, dri-devel
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/ni.c:1378:6: warning: no previous prototype for ‘cayman_cp_int_cntl_setup’ [-Wmissing-prototypes]
1378 | void cayman_cp_int_cntl_setup(struct radeon_device *rdev,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/radeon/ni.c:1732:5: warning: no previous prototype for ‘cayman_gpu_check_soft_reset’ [-Wmissing-prototypes]
1732 | u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/evergreen.c | 5 +----
drivers/gpu/drm/radeon/ni.c | 1 +
drivers/gpu/drm/radeon/ni.h | 36 ++++++++++++++++++++++++++++++
3 files changed, 38 insertions(+), 4 deletions(-)
create mode 100644 drivers/gpu/drm/radeon/ni.h
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index efb19c445e48f..28830f4ef95e3 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -31,6 +31,7 @@
#include "atom.h"
#include "avivod.h"
+#include "ni.h"
#include "rv770.h"
#include "evergreen.h"
#include "evergreen_blit_shaders.h"
@@ -215,10 +216,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev);
void evergreen_fini(struct radeon_device *rdev);
void evergreen_pcie_gen2_enable(struct radeon_device *rdev);
void evergreen_program_aspm(struct radeon_device *rdev);
-extern void cayman_cp_int_cntl_setup(struct radeon_device *rdev,
- int ring, u32 cp_int_cntl);
-extern void cayman_vm_decode_fault(struct radeon_device *rdev,
- u32 status, u32 addr);
void cik_init_cp_pg_table(struct radeon_device *rdev);
extern u32 si_get_csb_size(struct radeon_device *rdev);
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 1c9030a4631b8..ab7bd30802176 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -33,6 +33,7 @@
#include "cayman_blit_shaders.h"
#include "clearstate_cayman.h"
#include "evergreen.h"
+#include "ni.h"
#include "ni_reg.h"
#include "nid.h"
#include "radeon.h"
diff --git a/drivers/gpu/drm/radeon/ni.h b/drivers/gpu/drm/radeon/ni.h
new file mode 100644
index 0000000000000..bb03ac702b1cc
--- /dev/null
+++ b/drivers/gpu/drm/radeon/ni.h
@@ -0,0 +1,36 @@
+/* ni.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 __NI_H__
+#define __NI_H__
+
+void cayman_cp_int_cntl_setup(struct radeon_device *rdev,
+ int ring, u32 cp_int_cntl);
+void cayman_vm_decode_fault(struct radeon_device *rdev,
+ u32 status, u32 addr);
+
+#endif /* __NI_H__ */
--
2.25.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 29/30] drm/radeon/r600_dma: Move 'r600_gpu_check_soft_reset()'s prototype to shared location
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (27 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 28/30] drm/radeon/evergreen: Move 'cayman_*()'s prototypes to shared header Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
2020-11-10 19:31 ` [PATCH 30/30] drm/radeon/cik: Move 'r600_ih_ring_{alloc,fini}()'s prototypes to shared header Lee Jones
29 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, Sumit Semwal, amd-gfx, dri-devel, linux-media,
linaro-mm-sig
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@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/radeon/r600.c | 1 +
drivers/gpu/drm/radeon/r600.h | 33 +++++++++++++++++++++++++++++++
drivers/gpu/drm/radeon/r600_dma.c | 3 +--
3 files changed, 35 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..1bf2d0572f047
--- /dev/null
+++ b/drivers/gpu/drm/radeon/r600.h
@@ -0,0 +1,33 @@
+/* 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__
+
+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
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH 30/30] drm/radeon/cik: Move 'r600_ih_ring_{alloc,fini}()'s prototypes to shared header
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
` (28 preceding siblings ...)
2020-11-10 19:31 ` [PATCH 29/30] drm/radeon/r600_dma: Move 'r600_gpu_check_soft_reset()'s prototype to shared location Lee Jones
@ 2020-11-10 19:31 ` Lee Jones
29 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-10 19:31 UTC (permalink / raw)
To: lee.jones
Cc: linux-kernel, Alex Deucher, Christian König, David Airlie,
Daniel Vetter, Sumit Semwal, amd-gfx, dri-devel, linux-media,
linaro-mm-sig
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@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
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 b94e2e678f255..a71645693cbdb 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -33,6 +33,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"
@@ -124,8 +125,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 evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save);
extern void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save);
extern bool evergreen_is_display_hung(struct radeon_device *rdev);
diff --git a/drivers/gpu/drm/radeon/r600.h b/drivers/gpu/drm/radeon/r600.h
index 1bf2d0572f047..73004ffb98124 100644
--- a/drivers/gpu/drm/radeon/r600.h
+++ b/drivers/gpu/drm/radeon/r600.h
@@ -29,5 +29,7 @@
#define __R600_H__
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
^ permalink raw reply related [flat|nested] 52+ messages in thread
* Re: [PATCH 02/30] drm/radeon/evergreen: Remove set but unused variable 'mc_shared_chmap'
2020-11-10 19:30 ` [PATCH 02/30] drm/radeon/evergreen: Remove set but unused variable 'mc_shared_chmap' Lee Jones
@ 2020-11-10 22:50 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 22:50 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/evergreen.c: In function ‘evergreen_gpu_init’:
> drivers/gpu/drm/radeon/evergreen.c:3135:6: warning: variable ‘mc_shared_chmap’ set but not used [-Wunused-but-set-variable]
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/evergreen.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
> index c9a9a87959f9e..efb19c445e48f 100644
> --- a/drivers/gpu/drm/radeon/evergreen.c
> +++ b/drivers/gpu/drm/radeon/evergreen.c
> @@ -3135,7 +3135,7 @@ static int evergreen_cp_resume(struct radeon_device *rdev)
> static void evergreen_gpu_init(struct radeon_device *rdev)
> {
> u32 gb_addr_config;
> - u32 mc_shared_chmap, mc_arb_ramcfg;
> + u32 mc_arb_ramcfg;
> u32 sx_debug_1;
> u32 smx_dc_ctl0;
> u32 sq_config;
> @@ -3399,7 +3399,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
>
> evergreen_fix_pci_max_read_req_size(rdev);
>
> - mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
> + RREG32(MC_SHARED_CHMAP);
> if ((rdev->family == CHIP_PALM) ||
> (rdev->family == CHIP_SUMO) ||
> (rdev->family == CHIP_SUMO2))
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 01/30] drm/radeon/evergreen: Add comment for 'evergreen_page_flip()'s 'async' param
2020-11-10 19:30 ` [PATCH 01/30] drm/radeon/evergreen: Add comment for 'evergreen_page_flip()'s 'async' param Lee Jones
@ 2020-11-10 22:52 ` Alex Deucher
2020-11-11 7:16 ` Lee Jones
0 siblings, 1 reply; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 22:52 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/evergreen.c: In function ‘evergreen_gpu_init’:
> drivers/gpu/drm/radeon/evergreen.c:1419: warning: Function parameter or member 'async' not described in 'evergreen_page_flip'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied with minor fixups. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/evergreen.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
> index 4eb3f9bc8fa8b..c9a9a87959f9e 100644
> --- a/drivers/gpu/drm/radeon/evergreen.c
> +++ b/drivers/gpu/drm/radeon/evergreen.c
> @@ -1412,6 +1412,7 @@ void dce4_wait_for_vblank(struct radeon_device *rdev, int crtc)
> * @rdev: radeon_device pointer
> * @crtc_id: crtc to cleanup pageflip on
> * @crtc_base: new address of the crtc (GPU MC address)
> + * @async: Set retrace
> *
> * Triggers the actual pageflip by updating the primary
> * surface base address (evergreen+).
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 04/30] drm/radeon/si: Remove set but unused variable 'mc_shared_chmap'
2020-11-10 19:30 ` [PATCH 04/30] drm/radeon/si: Remove set but unused variable 'mc_shared_chmap' Lee Jones
@ 2020-11-10 22:53 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 22:53 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/si.c: In function ‘si_gpu_init’:
> drivers/gpu/drm/radeon/si.c:3090:6: warning: variable ‘mc_shared_chmap’ set but not used [-Wunused-but-set-variable]
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/si.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
> index c27af89785f34..45076c27d7ded 100644
> --- a/drivers/gpu/drm/radeon/si.c
> +++ b/drivers/gpu/drm/radeon/si.c
> @@ -3088,7 +3088,7 @@ static void si_setup_rb(struct radeon_device *rdev,
> static void si_gpu_init(struct radeon_device *rdev)
> {
> u32 gb_addr_config = 0;
> - u32 mc_shared_chmap, mc_arb_ramcfg;
> + u32 mc_arb_ramcfg;
> u32 sx_debug_1;
> u32 hdp_host_path_cntl;
> u32 tmp;
> @@ -3200,7 +3200,7 @@ static void si_gpu_init(struct radeon_device *rdev)
>
> WREG32(BIF_FB_EN, FB_READ_EN | FB_WRITE_EN);
>
> - mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
> + RREG32(MC_SHARED_CHMAP);
> mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
>
> rdev->config.si.num_tile_pipes = rdev->config.si.max_tile_pipes;
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 03/30] drm/radeon/ni: Demote vague attempt at function header doc
2020-11-10 19:30 ` [PATCH 03/30] drm/radeon/ni: Demote vague attempt at function header doc Lee Jones
@ 2020-11-10 23:32 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:32 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/ni.c: In function ‘cayman_gpu_init’:
> drivers/gpu/drm/radeon/ni.c:2679: warning: Function parameter or member 'ring' not described in 'cayman_vm_flush'
> drivers/gpu/drm/radeon/ni.c:2679: warning: Function parameter or member 'vm_id' not described in 'cayman_vm_flush'
> drivers/gpu/drm/radeon/ni.c:2679: warning: Function parameter or member 'pd_addr' not described in 'cayman_vm_flush'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/ni.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
> index 53a4d5c109794..12dd082069649 100644
> --- a/drivers/gpu/drm/radeon/ni.c
> +++ b/drivers/gpu/drm/radeon/ni.c
> @@ -2668,11 +2668,9 @@ void cayman_vm_decode_fault(struct radeon_device *rdev,
> block, mc_id);
> }
>
> -/**
> +/*
> * cayman_vm_flush - vm flush using the CP
> *
> - * @rdev: radeon_device pointer
> - *
> * Update the page table base and flush the VM TLB
> * using the CP (cayman-si).
> */
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 05/30] drm/radeon/cik: Remove set but unused variable 'mc_shared_chmap'
2020-11-10 19:30 ` [PATCH 05/30] drm/radeon/cik: " Lee Jones
@ 2020-11-10 23:33 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:33 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Christian König,
moderated list:DMA BUFFER SHARING FRAMEWORK,
Maling list - DRI developers, Alex Deucher, linux-media
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/cik.c: In function ‘cik_gpu_init’:
> drivers/gpu/drm/radeon/cik.c:3180:6: warning: variable ‘mc_shared_chmap’ set but not used [-Wunused-but-set-variable]
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-media@vger.kernel.org
> Cc: linaro-mm-sig@lists.linaro.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/cik.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index 4494f9122fd91..b94e2e678f255 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -3177,7 +3177,7 @@ static void cik_setup_rb(struct radeon_device *rdev,
> static void cik_gpu_init(struct radeon_device *rdev)
> {
> u32 gb_addr_config = RREG32(GB_ADDR_CONFIG);
> - u32 mc_shared_chmap, mc_arb_ramcfg;
> + u32 mc_arb_ramcfg;
> u32 hdp_host_path_cntl;
> u32 tmp;
> int i, j;
> @@ -3270,7 +3270,7 @@ static void cik_gpu_init(struct radeon_device *rdev)
>
> WREG32(BIF_FB_EN, FB_READ_EN | FB_WRITE_EN);
>
> - mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
> + RREG32(MC_SHARED_CHMAP);
> mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
>
> rdev->config.cik.num_tile_pipes = rdev->config.cik.max_tile_pipes;
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 09/30] drm/radeon/radeon_vm: Fix some function parameter documentation
2020-11-10 19:30 ` [PATCH 09/30] drm/radeon/radeon_vm: Fix some function parameter documentation Lee Jones
@ 2020-11-10 23:36 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:36 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/radeon_vm.c:131: warning: Function parameter or member 'rdev' not described in 'radeon_vm_get_bos'
> drivers/gpu/drm/radeon/radeon_vm.c:643: warning: Excess function parameter 'start' description in 'radeon_vm_update_page_directory'
> drivers/gpu/drm/radeon/radeon_vm.c:643: warning: Excess function parameter 'end' description in 'radeon_vm_update_page_directory'
> drivers/gpu/drm/radeon/radeon_vm.c:819: warning: Function parameter or member 'ib' not described in 'radeon_vm_update_ptes'
> drivers/gpu/drm/radeon/radeon_vm.c:915: warning: Function parameter or member 'bo_va' not described in 'radeon_vm_bo_update'
> drivers/gpu/drm/radeon/radeon_vm.c:915: warning: Excess function parameter 'vm' description in 'radeon_vm_bo_update'
> drivers/gpu/drm/radeon/radeon_vm.c:915: warning: Excess function parameter 'bo' description in 'radeon_vm_bo_update'
> drivers/gpu/drm/radeon/radeon_vm.c:1155: warning: Excess function parameter 'vm' description in 'radeon_vm_bo_invalidate'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied with a small fixup. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/radeon_vm.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
> index 27b14eff532cb..71f2edcac6ea0 100644
> --- a/drivers/gpu/drm/radeon/radeon_vm.c
> +++ b/drivers/gpu/drm/radeon/radeon_vm.c
> @@ -119,6 +119,7 @@ void radeon_vm_manager_fini(struct radeon_device *rdev)
> /**
> * radeon_vm_get_bos - add the vm BOs to a validation list
> *
> + * @rdev: radeon_device pointer
> * @vm: vm providing the BOs
> * @head: head of validation list
> *
> @@ -629,8 +630,6 @@ static uint32_t radeon_vm_page_flags(uint32_t flags)
> *
> * @rdev: radeon_device pointer
> * @vm: requested vm
> - * @start: start of GPU address range
> - * @end: end of GPU address range
> *
> * Allocates new page tables if necessary
> * and updates the page directory (cayman+).
> @@ -802,6 +801,7 @@ static void radeon_vm_frag_ptes(struct radeon_device *rdev,
> *
> * @rdev: radeon_device pointer
> * @vm: requested vm
> + * @ib: indirect buffer to use for the update
> * @start: start of GPU address range
> * @end: end of GPU address range
> * @dst: destination address to map to
> @@ -900,8 +900,7 @@ static void radeon_vm_fence_pts(struct radeon_vm *vm,
> * radeon_vm_bo_update - map a bo into the vm page table
> *
> * @rdev: radeon_device pointer
> - * @vm: requested vm
> - * @bo: radeon buffer object
> + * @bo_va: radeon buffer object
> * @mem: ttm mem
> *
> * Fill in the page table entries for @bo (cayman+).
> @@ -1145,7 +1144,6 @@ void radeon_vm_bo_rmv(struct radeon_device *rdev,
> * radeon_vm_bo_invalidate - mark the bo as invalid
> *
> * @rdev: radeon_device pointer
> - * @vm: requested vm
> * @bo: radeon buffer object
> *
> * Mark @bo as invalid (cayman+).
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 07/30] drm/radeon/kv_dpm: Strip out unused functions and their tables
2020-11-10 19:30 ` [PATCH 07/30] drm/radeon/kv_dpm: Strip out unused functions and their tables Lee Jones
@ 2020-11-10 23:37 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:37 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> These haven't been used since the driver was upstreamed in 2013.
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/kv_dpm.c:161:40: warning: ‘cpl_cac_config_reg’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:156:40: warning: ‘mc3_cac_config_reg’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:151:40: warning: ‘mc2_cac_config_reg’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:146:40: warning: ‘mc1_cac_config_reg’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:141:40: warning: ‘mc0_cac_config_reg’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:136:40: warning: ‘sx0_cac_config_reg’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:104:43: warning: ‘cpl_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:98:43: warning: ‘mc3_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:92:43: warning: ‘mc2_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:86:43: warning: ‘mc1_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:80:43: warning: ‘mc0_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/kv_dpm.c:67:43: warning: ‘sx_local_cac_cfg_kv’ defined but not used [-Wunused-const-variable=]
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/kv_dpm.c | 205 +-------------------------------
> 1 file changed, 1 insertion(+), 204 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
> index 5e6086eb18073..f7735da07feb9 100644
> --- a/drivers/gpu/drm/radeon/kv_dpm.c
> +++ b/drivers/gpu/drm/radeon/kv_dpm.c
> @@ -64,105 +64,6 @@ extern void cik_exit_rlc_safe_mode(struct radeon_device *rdev);
> extern void cik_update_cg(struct radeon_device *rdev,
> u32 block, bool enable);
>
> -static const struct kv_lcac_config_values sx_local_cac_cfg_kv[] =
> -{
> - { 0, 4, 1 },
> - { 1, 4, 1 },
> - { 2, 5, 1 },
> - { 3, 4, 2 },
> - { 4, 1, 1 },
> - { 5, 5, 2 },
> - { 6, 6, 1 },
> - { 7, 9, 2 },
> - { 0xffffffff }
> -};
> -
> -static const struct kv_lcac_config_values mc0_local_cac_cfg_kv[] =
> -{
> - { 0, 4, 1 },
> - { 0xffffffff }
> -};
> -
> -static const struct kv_lcac_config_values mc1_local_cac_cfg_kv[] =
> -{
> - { 0, 4, 1 },
> - { 0xffffffff }
> -};
> -
> -static const struct kv_lcac_config_values mc2_local_cac_cfg_kv[] =
> -{
> - { 0, 4, 1 },
> - { 0xffffffff }
> -};
> -
> -static const struct kv_lcac_config_values mc3_local_cac_cfg_kv[] =
> -{
> - { 0, 4, 1 },
> - { 0xffffffff }
> -};
> -
> -static const struct kv_lcac_config_values cpl_local_cac_cfg_kv[] =
> -{
> - { 0, 4, 1 },
> - { 1, 4, 1 },
> - { 2, 5, 1 },
> - { 3, 4, 1 },
> - { 4, 1, 1 },
> - { 5, 5, 1 },
> - { 6, 6, 1 },
> - { 7, 9, 1 },
> - { 8, 4, 1 },
> - { 9, 2, 1 },
> - { 10, 3, 1 },
> - { 11, 6, 1 },
> - { 12, 8, 2 },
> - { 13, 1, 1 },
> - { 14, 2, 1 },
> - { 15, 3, 1 },
> - { 16, 1, 1 },
> - { 17, 4, 1 },
> - { 18, 3, 1 },
> - { 19, 1, 1 },
> - { 20, 8, 1 },
> - { 21, 5, 1 },
> - { 22, 1, 1 },
> - { 23, 1, 1 },
> - { 24, 4, 1 },
> - { 27, 6, 1 },
> - { 28, 1, 1 },
> - { 0xffffffff }
> -};
> -
> -static const struct kv_lcac_config_reg sx0_cac_config_reg[] =
> -{
> - { 0xc0400d00, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
> -};
> -
> -static const struct kv_lcac_config_reg mc0_cac_config_reg[] =
> -{
> - { 0xc0400d30, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
> -};
> -
> -static const struct kv_lcac_config_reg mc1_cac_config_reg[] =
> -{
> - { 0xc0400d3c, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
> -};
> -
> -static const struct kv_lcac_config_reg mc2_cac_config_reg[] =
> -{
> - { 0xc0400d48, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
> -};
> -
> -static const struct kv_lcac_config_reg mc3_cac_config_reg[] =
> -{
> - { 0xc0400d54, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
> -};
> -
> -static const struct kv_lcac_config_reg cpl_cac_config_reg[] =
> -{
> - { 0xc0400d80, 0x003e0000, 17, 0x3fc00000, 22, 0x0001fffe, 1, 0x00000001, 0 }
> -};
> -
> static const struct kv_pt_config_reg didt_config_kv[] =
> {
> { 0x10, 0x000000ff, 0, 0x0, KV_CONFIGREG_DIDT_IND },
> @@ -254,32 +155,6 @@ static struct kv_power_info *kv_get_pi(struct radeon_device *rdev)
> return pi;
> }
>
> -#if 0
> -static void kv_program_local_cac_table(struct radeon_device *rdev,
> - const struct kv_lcac_config_values *local_cac_table,
> - const struct kv_lcac_config_reg *local_cac_reg)
> -{
> - u32 i, count, data;
> - const struct kv_lcac_config_values *values = local_cac_table;
> -
> - while (values->block_id != 0xffffffff) {
> - count = values->signal_id;
> - for (i = 0; i < count; i++) {
> - data = ((values->block_id << local_cac_reg->block_shift) &
> - local_cac_reg->block_mask);
> - data |= ((i << local_cac_reg->signal_shift) &
> - local_cac_reg->signal_mask);
> - data |= ((values->t << local_cac_reg->t_shift) &
> - local_cac_reg->t_mask);
> - data |= ((1 << local_cac_reg->enable_shift) &
> - local_cac_reg->enable_mask);
> - WREG32_SMC(local_cac_reg->cntl, data);
> - }
> - values++;
> - }
> -}
> -#endif
> -
> static int kv_program_pt_config_registers(struct radeon_device *rdev,
> const struct kv_pt_config_reg *cac_config_regs)
> {
> @@ -398,39 +273,6 @@ static int kv_enable_didt(struct radeon_device *rdev, bool enable)
> return 0;
> }
>
> -#if 0
> -static void kv_initialize_hardware_cac_manager(struct radeon_device *rdev)
> -{
> - struct kv_power_info *pi = kv_get_pi(rdev);
> -
> - if (pi->caps_cac) {
> - WREG32_SMC(LCAC_SX0_OVR_SEL, 0);
> - WREG32_SMC(LCAC_SX0_OVR_VAL, 0);
> - kv_program_local_cac_table(rdev, sx_local_cac_cfg_kv, sx0_cac_config_reg);
> -
> - WREG32_SMC(LCAC_MC0_OVR_SEL, 0);
> - WREG32_SMC(LCAC_MC0_OVR_VAL, 0);
> - kv_program_local_cac_table(rdev, mc0_local_cac_cfg_kv, mc0_cac_config_reg);
> -
> - WREG32_SMC(LCAC_MC1_OVR_SEL, 0);
> - WREG32_SMC(LCAC_MC1_OVR_VAL, 0);
> - kv_program_local_cac_table(rdev, mc1_local_cac_cfg_kv, mc1_cac_config_reg);
> -
> - WREG32_SMC(LCAC_MC2_OVR_SEL, 0);
> - WREG32_SMC(LCAC_MC2_OVR_VAL, 0);
> - kv_program_local_cac_table(rdev, mc2_local_cac_cfg_kv, mc2_cac_config_reg);
> -
> - WREG32_SMC(LCAC_MC3_OVR_SEL, 0);
> - WREG32_SMC(LCAC_MC3_OVR_VAL, 0);
> - kv_program_local_cac_table(rdev, mc3_local_cac_cfg_kv, mc3_cac_config_reg);
> -
> - WREG32_SMC(LCAC_CPL_OVR_SEL, 0);
> - WREG32_SMC(LCAC_CPL_OVR_VAL, 0);
> - kv_program_local_cac_table(rdev, cpl_local_cac_cfg_kv, cpl_cac_config_reg);
> - }
> -}
> -#endif
> -
> static int kv_enable_smc_cac(struct radeon_device *rdev, bool enable)
> {
> struct kv_power_info *pi = kv_get_pi(rdev);
> @@ -1227,9 +1069,7 @@ int kv_dpm_enable(struct radeon_device *rdev)
> return ret;
> }
> kv_program_vc(rdev);
> -#if 0
> - kv_initialize_hardware_cac_manager(rdev);
> -#endif
> +
> kv_start_am(rdev);
> if (pi->enable_auto_thermal_throttling) {
> ret = kv_enable_auto_thermal_throttling(rdev);
> @@ -1330,26 +1170,6 @@ void kv_dpm_disable(struct radeon_device *rdev)
> kv_update_current_ps(rdev, rdev->pm.dpm.boot_ps);
> }
>
> -#if 0
> -static int kv_write_smc_soft_register(struct radeon_device *rdev,
> - u16 reg_offset, u32 value)
> -{
> - struct kv_power_info *pi = kv_get_pi(rdev);
> -
> - return kv_copy_bytes_to_smc(rdev, pi->soft_regs_start + reg_offset,
> - (u8 *)&value, sizeof(u16), pi->sram_end);
> -}
> -
> -static int kv_read_smc_soft_register(struct radeon_device *rdev,
> - u16 reg_offset, u32 *value)
> -{
> - struct kv_power_info *pi = kv_get_pi(rdev);
> -
> - return kv_read_smc_sram_dword(rdev, pi->soft_regs_start + reg_offset,
> - value, pi->sram_end);
> -}
> -#endif
> -
> static void kv_init_sclk_t(struct radeon_device *rdev)
> {
> struct kv_power_info *pi = kv_get_pi(rdev);
> @@ -1939,29 +1759,6 @@ void kv_dpm_setup_asic(struct radeon_device *rdev)
> kv_init_sclk_t(rdev);
> }
>
> -#if 0
> -void kv_dpm_reset_asic(struct radeon_device *rdev)
> -{
> - struct kv_power_info *pi = kv_get_pi(rdev);
> -
> - if (rdev->family == CHIP_KABINI || rdev->family == CHIP_MULLINS) {
> - kv_force_lowest_valid(rdev);
> - kv_init_graphics_levels(rdev);
> - kv_program_bootup_state(rdev);
> - kv_upload_dpm_settings(rdev);
> - kv_force_lowest_valid(rdev);
> - kv_unforce_levels(rdev);
> - } else {
> - kv_init_graphics_levels(rdev);
> - kv_program_bootup_state(rdev);
> - kv_freeze_sclk_dpm(rdev, true);
> - kv_upload_dpm_settings(rdev);
> - kv_freeze_sclk_dpm(rdev, false);
> - kv_set_enabled_level(rdev, pi->graphics_boot_level);
> - }
> -}
> -#endif
> -
> //XXX use sumo_dpm_display_configuration_changed
>
> static void kv_construct_max_power_limits_table(struct radeon_device *rdev,
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 06/30] drm/radeon/trinity_dpm: Remove some defined but never used arrays
2020-11-10 19:30 ` [PATCH 06/30] drm/radeon/trinity_dpm: Remove some defined but never used arrays Lee Jones
@ 2020-11-10 23:38 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:38 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/trinity_dpm.c:146:18: warning: ‘trinity_sysls_default’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/trinity_dpm.c:131:18: warning: ‘trinity_mgcg_shls_disable’ defined but not used [-Wunused-const-variable=]
> drivers/gpu/drm/radeon/trinity_dpm.c:120:18: warning: ‘trinity_mgcg_shls_enable’ defined but not used [-Wunused-const-variable=]
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/trinity_dpm.c | 44 ----------------------------
> 1 file changed, 44 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c
> index 4d93b84aa7397..e005c18aac00e 100644
> --- a/drivers/gpu/drm/radeon/trinity_dpm.c
> +++ b/drivers/gpu/drm/radeon/trinity_dpm.c
> @@ -116,55 +116,11 @@ static const u32 trinity_mgcg_shls_default[] =
> 0x00009220, 0x00090008, 0xffffffff,
> 0x00009294, 0x00000000, 0xffffffff
> };
> -
> -static const u32 trinity_mgcg_shls_enable[] =
> -{
> - /* Register, Value, Mask */
> - 0x0000802c, 0xc0000000, 0xffffffff,
> - 0x000008f8, 0x00000000, 0xffffffff,
> - 0x000008fc, 0x00000000, 0x000133FF,
> - 0x000008f8, 0x00000001, 0xffffffff,
> - 0x000008fc, 0x00000000, 0xE00B03FC,
> - 0x00009150, 0x96944200, 0xffffffff
> -};
> -
> -static const u32 trinity_mgcg_shls_disable[] =
> -{
> - /* Register, Value, Mask */
> - 0x0000802c, 0xc0000000, 0xffffffff,
> - 0x00009150, 0x00600000, 0xffffffff,
> - 0x000008f8, 0x00000000, 0xffffffff,
> - 0x000008fc, 0xffffffff, 0x000133FF,
> - 0x000008f8, 0x00000001, 0xffffffff,
> - 0x000008fc, 0xffffffff, 0xE00B03FC
> -};
> #endif
>
> #ifndef TRINITY_SYSLS_SEQUENCE
> #define TRINITY_SYSLS_SEQUENCE 100
>
> -static const u32 trinity_sysls_default[] =
> -{
> - /* Register, Value, Mask */
> - 0x000055e8, 0x00000000, 0xffffffff,
> - 0x0000d0bc, 0x00000000, 0xffffffff,
> - 0x0000d8bc, 0x00000000, 0xffffffff,
> - 0x000015c0, 0x000c1401, 0xffffffff,
> - 0x0000264c, 0x000c0400, 0xffffffff,
> - 0x00002648, 0x000c0400, 0xffffffff,
> - 0x00002650, 0x000c0400, 0xffffffff,
> - 0x000020b8, 0x000c0400, 0xffffffff,
> - 0x000020bc, 0x000c0400, 0xffffffff,
> - 0x000020c0, 0x000c0c80, 0xffffffff,
> - 0x0000f4a0, 0x000000c0, 0xffffffff,
> - 0x0000f4a4, 0x00680fff, 0xffffffff,
> - 0x00002f50, 0x00000404, 0xffffffff,
> - 0x000004c8, 0x00000001, 0xffffffff,
> - 0x0000641c, 0x00000000, 0xffffffff,
> - 0x00000c7c, 0x00000000, 0xffffffff,
> - 0x00006dfc, 0x00000000, 0xffffffff
> -};
> -
> static const u32 trinity_sysls_disable[] =
> {
> /* Register, Value, Mask */
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 12/30] drm/radeon/radeon_dp_mst: Remove unused variable 'ret' from radeon_mst_encoder_dpms()
2020-11-10 19:30 ` [PATCH 12/30] drm/radeon/radeon_dp_mst: Remove unused variable 'ret' from radeon_mst_encoder_dpms() Lee Jones
@ 2020-11-10 23:39 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:39 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/radeon_dp_mst.c: In function ‘radeon_mst_encoder_dpms’:
> drivers/gpu/drm/radeon/radeon_dp_mst.c:366:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/radeon_dp_mst.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> index 008308780443c..2c32186c4acd9 100644
> --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
> +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> @@ -363,7 +363,7 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)
> struct radeon_connector *radeon_connector;
> struct drm_crtc *crtc;
> struct radeon_crtc *radeon_crtc;
> - int ret, slots;
> + int slots;
> s64 fixed_pbn, fixed_pbn_per_slot, avg_time_slots_per_mtp;
> if (!ASIC_IS_DCE5(rdev)) {
> DRM_ERROR("got mst dpms on non-DCE5\n");
> @@ -418,10 +418,10 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)
>
> slots = drm_dp_find_vcpi_slots(&radeon_connector->mst_port->mst_mgr,
> mst_enc->pbn);
> - ret = drm_dp_mst_allocate_vcpi(&radeon_connector->mst_port->mst_mgr,
> - radeon_connector->port,
> - mst_enc->pbn, slots);
> - ret = drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr);
> + drm_dp_mst_allocate_vcpi(&radeon_connector->mst_port->mst_mgr,
> + radeon_connector->port,
> + mst_enc->pbn, slots);
> + drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr);
>
> radeon_dp_mst_set_be_cntl(primary, mst_enc,
> radeon_connector->mst_port->hpd.hpd, true);
> @@ -436,9 +436,9 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)
>
> atombios_dig_encoder_setup2(&primary->base, ATOM_ENCODER_CMD_DP_VIDEO_ON, 0,
> mst_enc->fe);
> - ret = drm_dp_check_act_status(&radeon_connector->mst_port->mst_mgr);
> + drm_dp_check_act_status(&radeon_connector->mst_port->mst_mgr);
>
> - ret = drm_dp_update_payload_part2(&radeon_connector->mst_port->mst_mgr);
> + drm_dp_update_payload_part2(&radeon_connector->mst_port->mst_mgr);
>
> break;
> case DRM_MODE_DPMS_STANDBY:
> @@ -450,7 +450,7 @@ radeon_mst_encoder_dpms(struct drm_encoder *encoder, int mode)
> return;
>
> drm_dp_mst_reset_vcpi_slots(&radeon_connector->mst_port->mst_mgr, mst_enc->port);
> - ret = drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr);
> + drm_dp_update_payload_part1(&radeon_connector->mst_port->mst_mgr);
>
> drm_dp_check_act_status(&radeon_connector->mst_port->mst_mgr);
> /* and this can also fail */
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 10/30] drm/radeon/radeon_sync: Add description for function param 'rdev'
2020-11-10 19:30 ` [PATCH 10/30] drm/radeon/radeon_sync: Add description for function param 'rdev' Lee Jones
@ 2020-11-10 23:40 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:40 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Christian König,
moderated list:DMA BUFFER SHARING FRAMEWORK,
Maling list - DRI developers, Alex Deucher, linux-media
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/radeon_sync.c:92: warning: Function parameter or member 'rdev' not described in 'radeon_sync_resv'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-media@vger.kernel.org
> Cc: linaro-mm-sig@lists.linaro.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/radeon_sync.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_sync.c b/drivers/gpu/drm/radeon/radeon_sync.c
> index 55cc77a73c7b7..5d3302945076b 100644
> --- a/drivers/gpu/drm/radeon/radeon_sync.c
> +++ b/drivers/gpu/drm/radeon/radeon_sync.c
> @@ -79,6 +79,7 @@ void radeon_sync_fence(struct radeon_sync *sync,
> /**
> * radeon_sync_resv - use the semaphores to sync to a reservation object
> *
> + * @rdev: radeon_device pointer
> * @sync: sync object to add fences from reservation object to
> * @resv: reservation object with embedded fence
> * @shared: true if we should only sync to the exclusive fence
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 11/30] drm/radeon/radeon_ib: Supply description for 'radeon_ib_get's get param
2020-11-10 19:30 ` [PATCH 11/30] drm/radeon/radeon_ib: Supply description for 'radeon_ib_get's get param Lee Jones
@ 2020-11-10 23:41 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:41 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/radeon_ib.c:61: warning: Function parameter or member 'vm' not described in 'radeon_ib_get'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/radeon_ib.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/radeon_ib.c
> index 9fd55e9c616b0..c1fca2ba443c9 100644
> --- a/drivers/gpu/drm/radeon/radeon_ib.c
> +++ b/drivers/gpu/drm/radeon/radeon_ib.c
> @@ -48,6 +48,7 @@ static int radeon_debugfs_sa_init(struct radeon_device *rdev);
> *
> * @rdev: radeon_device pointer
> * @ring: ring index the IB is associated with
> + * @vm: requested vm
> * @ib: IB object returned
> * @size: requested IB size
> *
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 08/30] drm/radeon/ci_dpm: Remove set but unused variable 'dpm_event_src'
2020-11-10 19:30 ` [PATCH 08/30] drm/radeon/ci_dpm: Remove set but unused variable 'dpm_event_src' Lee Jones
@ 2020-11-10 23:42 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:42 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> And the piece of code that has never been executed.
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/ci_dpm.c: In function ‘ci_set_dpm_event_sources’:
> drivers/gpu/drm/radeon/ci_dpm.c:1369:28: warning: variable ‘dpm_event_src’ set but not used [-Wunused-but-set-variable]
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/ci_dpm.c | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
> index 886e9959496fe..8324aca5fd006 100644
> --- a/drivers/gpu/drm/radeon/ci_dpm.c
> +++ b/drivers/gpu/drm/radeon/ci_dpm.c
> @@ -1366,7 +1366,6 @@ static void ci_set_dpm_event_sources(struct radeon_device *rdev, u32 sources)
> {
> struct ci_power_info *pi = ci_get_pi(rdev);
> bool want_thermal_protection;
> - enum radeon_dpm_event_src dpm_event_src;
> u32 tmp;
>
> switch (sources) {
> @@ -1376,28 +1375,17 @@ static void ci_set_dpm_event_sources(struct radeon_device *rdev, u32 sources)
> break;
> case (1 << RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL):
> want_thermal_protection = true;
> - dpm_event_src = RADEON_DPM_EVENT_SRC_DIGITAL;
> break;
> case (1 << RADEON_DPM_AUTO_THROTTLE_SRC_EXTERNAL):
> want_thermal_protection = true;
> - dpm_event_src = RADEON_DPM_EVENT_SRC_EXTERNAL;
> break;
> case ((1 << RADEON_DPM_AUTO_THROTTLE_SRC_EXTERNAL) |
> (1 << RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL)):
> want_thermal_protection = true;
> - dpm_event_src = RADEON_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL;
> break;
> }
>
> if (want_thermal_protection) {
> -#if 0
> - /* XXX: need to figure out how to handle this properly */
> - tmp = RREG32_SMC(CG_THERMAL_CTRL);
> - tmp &= DPM_EVENT_SRC_MASK;
> - tmp |= DPM_EVENT_SRC(dpm_event_src);
> - WREG32_SMC(CG_THERMAL_CTRL, tmp);
> -#endif
> -
> tmp = RREG32_SMC(GENERAL_PWRMGT);
> if (pi->thermal_protection)
> tmp &= ~THERMAL_PROTECTION_DIS;
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 13/30] drm/radeon/radeon_mn: Supply description for 'cur_seq' even if it is unused
2020-11-10 19:30 ` [PATCH 13/30] drm/radeon/radeon_mn: Supply description for 'cur_seq' even if it is unused Lee Jones
@ 2020-11-10 23:52 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:52 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/radeon_mn.c:51: warning: Function parameter or member 'cur_seq' not described in 'radeon_mn_invalidate'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied with minor fixup. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/radeon_mn.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c
> index 97b9b6dd6dd3b..3c4c4213a7b57 100644
> --- a/drivers/gpu/drm/radeon/radeon_mn.c
> +++ b/drivers/gpu/drm/radeon/radeon_mn.c
> @@ -41,6 +41,7 @@
> *
> * @mn: our notifier
> * @range: the VMA under invalidation
> + * @cur_seq: unused
> *
> * We block for all BOs between start and end to be idle and
> * unmap them by move them into system domain again.
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 16/30] drm/radeon/r100: Fix some kernel-doc formatting, misnaming and missing issues
2020-11-10 19:30 ` [PATCH 16/30] drm/radeon/r100: Fix some kernel-doc formatting, misnaming and missing issues Lee Jones
@ 2020-11-10 23:54 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:54 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Christian König,
moderated list:DMA BUFFER SHARING FRAMEWORK,
Maling list - DRI developers, Alex Deucher, linux-media
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/r100.c:163: warning: Function parameter or member 'async' not described in 'r100_page_flip'
> drivers/gpu/drm/radeon/r100.c:848: warning: Function parameter or member 'rdev' not described in 'r100_ring_hdp_flush'
> drivers/gpu/drm/radeon/r100.c:848: warning: Function parameter or member 'ring' not described in 'r100_ring_hdp_flush'
> drivers/gpu/drm/radeon/r100.c:1425: warning: Function parameter or member 'p' not described in 'r100_cs_packet_parse_vline'
> drivers/gpu/drm/radeon/r100.c:1425: warning: Excess function parameter 'parser' description in 'r100_cs_packet_parse_vline'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-media@vger.kernel.org
> Cc: linaro-mm-sig@lists.linaro.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied with minor fixup. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/r100.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index 24c8db673931a..92075dedf2cb2 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -153,6 +153,7 @@ void r100_wait_for_vblank(struct radeon_device *rdev, int crtc)
> * @rdev: radeon_device pointer
> * @crtc_id: crtc to cleanup pageflip on
> * @crtc_base: new address of the crtc (GPU MC address)
> + * @async: unused
> *
> * Does the actual pageflip (r1xx-r4xx).
> * During vblank we take the crtc lock and wait for the update_pending
> @@ -841,8 +842,8 @@ u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc)
>
> /**
> * r100_ring_hdp_flush - flush Host Data Path via the ring buffer
> - * rdev: radeon device structure
> - * ring: ring buffer struct for emitting packets
> + * @rdev: radeon device structure
> + * @ring: ring buffer struct for emitting packets
> */
> static void r100_ring_hdp_flush(struct radeon_device *rdev, struct radeon_ring *ring)
> {
> @@ -1409,7 +1410,7 @@ int r100_cs_parse_packet0(struct radeon_cs_parser *p,
>
> /**
> * r100_cs_packet_next_vline() - parse userspace VLINE packet
> - * @parser: parser structure holding parsing context.
> + * @p: parser structure holding parsing context.
> *
> * Userspace sends a special sequence for VLINE waits.
> * PACKET0 - VLINE_START_END + value
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 17/30] drm/radeon/r600_cs: Fix some doc-rot and supply missing function param docs
2020-11-10 19:30 ` [PATCH 17/30] drm/radeon/r600_cs: Fix some doc-rot and supply missing function param docs Lee Jones
@ 2020-11-10 23:55 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:55 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/r600_cs.c:793: warning: Function parameter or member 'p' not described in 'r600_cs_packet_parse_vline'
> drivers/gpu/drm/radeon/r600_cs.c:793: warning: Excess function parameter 'parser' description in 'r600_cs_packet_parse_vline'
> drivers/gpu/drm/radeon/r600_cs.c:826: warning: Function parameter or member 'p' not described in 'r600_cs_common_vline_parse'
> drivers/gpu/drm/radeon/r600_cs.c:826: warning: Excess function parameter 'parser' description in 'r600_cs_common_vline_parse'
> drivers/gpu/drm/radeon/r600_cs.c:968: warning: Function parameter or member 'p' not described in 'r600_cs_check_reg'
> drivers/gpu/drm/radeon/r600_cs.c:968: warning: Excess function parameter 'parser' description in 'r600_cs_check_reg'
> drivers/gpu/drm/radeon/r600_cs.c:1473: warning: Function parameter or member 'base_offset' not described in 'r600_check_texture_resource'
> drivers/gpu/drm/radeon/r600_cs.c:1473: warning: Function parameter or member 'mip_offset' not described in 'r600_check_texture_resource'
> drivers/gpu/drm/radeon/r600_cs.c:1473: warning: Function parameter or member 'tiling_flags' not described in 'r600_check_texture_resource'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/r600_cs.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
> index 390a9621604ae..f20b619466816 100644
> --- a/drivers/gpu/drm/radeon/r600_cs.c
> +++ b/drivers/gpu/drm/radeon/r600_cs.c
> @@ -782,7 +782,7 @@ static int r600_cs_track_check(struct radeon_cs_parser *p)
>
> /**
> * r600_cs_packet_parse_vline() - parse userspace VLINE packet
> - * @parser: parser structure holding parsing context.
> + * @p: parser structure holding parsing context.
> *
> * This is an R600-specific function for parsing VLINE packets.
> * Real work is done by r600_cs_common_vline_parse function.
> @@ -801,7 +801,7 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p)
>
> /**
> * r600_cs_common_vline_parse() - common vline parser
> - * @parser: parser structure holding parsing context.
> + * @p: parser structure holding parsing context.
> * @vline_start_end: table of vline_start_end registers
> * @vline_status: table of vline_status registers
> *
> @@ -956,7 +956,7 @@ static int r600_cs_parse_packet0(struct radeon_cs_parser *p,
>
> /**
> * r600_cs_check_reg() - check if register is authorized or not
> - * @parser: parser structure holding parsing context
> + * @p: parser structure holding parsing context
> * @reg: register we are testing
> * @idx: index into the cs buffer
> *
> @@ -1460,6 +1460,9 @@ static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned llevel,
> * @idx: index into the cs buffer
> * @texture: texture's bo structure
> * @mipmap: mipmap's bo structure
> + * @base_offset: base offset (used for error checking)
> + * @mip_offset: mip offset (used for error checking)
> + * @tiling_flags: tiling flags
> *
> * This function will check that the resource has valid field and that
> * the texture and mipmap bo object are big enough to cover this resource.
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 15/30] drm/radeon/cik_sdma: Demote vague attempt at kernel-doc
2020-11-10 19:30 ` [PATCH 15/30] drm/radeon/cik_sdma: Demote vague attempt at kernel-doc Lee Jones
@ 2020-11-10 23:56 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:56 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Christian König,
moderated list:DMA BUFFER SHARING FRAMEWORK,
Maling list - DRI developers, Alex Deucher, linux-media
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/cik_sdma.c:949: warning: Function parameter or member 'ring' not described in 'cik_dma_vm_flush'
> drivers/gpu/drm/radeon/cik_sdma.c:949: warning: Function parameter or member 'vm_id' not described in 'cik_dma_vm_flush'
> drivers/gpu/drm/radeon/cik_sdma.c:949: warning: Function parameter or member 'pd_addr' not described in 'cik_dma_vm_flush'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-media@vger.kernel.org
> Cc: linaro-mm-sig@lists.linaro.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/cik_sdma.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
> index 68403e77756d3..3c709ebe8d1ab 100644
> --- a/drivers/gpu/drm/radeon/cik_sdma.c
> +++ b/drivers/gpu/drm/radeon/cik_sdma.c
> @@ -936,11 +936,9 @@ void cik_sdma_vm_pad_ib(struct radeon_ib *ib)
> ib->ptr[ib->length_dw++] = SDMA_PACKET(SDMA_OPCODE_NOP, 0, 0);
> }
>
> -/**
> +/*
> * cik_dma_vm_flush - cik vm flush using sDMA
> *
> - * @rdev: radeon_device pointer
> - *
> * Update the page table base and flush the VM TLB
> * using sDMA (CIK).
> */
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 18/30] drm/radeon/evergreen_cs: Fix misnaming issues surrounding 'p' param
2020-11-10 19:31 ` [PATCH 18/30] drm/radeon/evergreen_cs: Fix misnaming issues surrounding 'p' param Lee Jones
@ 2020-11-10 23:57 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:57 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/evergreen_cs.c:1026: warning: Function parameter or member 'p' not described in 'evergreen_cs_packet_parse_vline'
> drivers/gpu/drm/radeon/evergreen_cs.c:1026: warning: Excess function parameter 'parser' description in 'evergreen_cs_packet_parse_vline'
> drivers/gpu/drm/radeon/evergreen_cs.c:1095: warning: Function parameter or member 'p' not described in 'evergreen_cs_handle_reg'
> drivers/gpu/drm/radeon/evergreen_cs.c:1095: warning: Excess function parameter 'parser' description in 'evergreen_cs_handle_reg'
> drivers/gpu/drm/radeon/evergreen_cs.c:1757: warning: Function parameter or member 'p' not described in 'evergreen_is_safe_reg'
> drivers/gpu/drm/radeon/evergreen_cs.c:1757: warning: Excess function parameter 'parser' description in 'evergreen_is_safe_reg'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/evergreen_cs.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
> index c410cad28f19f..53b75cf201958 100644
> --- a/drivers/gpu/drm/radeon/evergreen_cs.c
> +++ b/drivers/gpu/drm/radeon/evergreen_cs.c
> @@ -1015,7 +1015,7 @@ static int evergreen_cs_track_check(struct radeon_cs_parser *p)
>
> /**
> * evergreen_cs_packet_parse_vline() - parse userspace VLINE packet
> - * @parser: parser structure holding parsing context.
> + * @p: parser structure holding parsing context.
> *
> * This is an Evergreen(+)-specific function for parsing VLINE packets.
> * Real work is done by r600_cs_common_vline_parse function.
> @@ -1087,7 +1087,7 @@ static int evergreen_cs_parse_packet0(struct radeon_cs_parser *p,
>
> /**
> * evergreen_cs_handle_reg() - process registers that need special handling.
> - * @parser: parser structure holding parsing context
> + * @p: parser structure holding parsing context
> * @reg: register we are testing
> * @idx: index into the cs buffer
> */
> @@ -1747,7 +1747,7 @@ static int evergreen_cs_handle_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
>
> /**
> * evergreen_is_safe_reg() - check if register is authorized or not
> - * @parser: parser structure holding parsing context
> + * @p: parser structure holding parsing context
> * @reg: register we are testing
> *
> * This function will test against reg_safe_bm and return true
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 14/30] drm/radeon/evergreen_dma: Fix doc-rot of function parameter 'resv'
2020-11-10 19:30 ` [PATCH 14/30] drm/radeon/evergreen_dma: Fix doc-rot of function parameter 'resv' Lee Jones
@ 2020-11-10 23:57 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-10 23:57 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Christian König,
moderated list:DMA BUFFER SHARING FRAMEWORK,
Maling list - DRI developers, Alex Deucher, linux-media
On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/evergreen_dma.c:112: warning: Function parameter or member 'resv' not described in 'evergreen_copy_dma'
> drivers/gpu/drm/radeon/evergreen_dma.c:112: warning: Excess function parameter 'fence' description in 'evergreen_copy_dma'
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-media@vger.kernel.org
> Cc: linaro-mm-sig@lists.linaro.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/evergreen_dma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c b/drivers/gpu/drm/radeon/evergreen_dma.c
> index a46ee6c2099dd..767857d4a8c5c 100644
> --- a/drivers/gpu/drm/radeon/evergreen_dma.c
> +++ b/drivers/gpu/drm/radeon/evergreen_dma.c
> @@ -98,7 +98,7 @@ void evergreen_dma_ring_ib_execute(struct radeon_device *rdev,
> * @src_offset: src GPU address
> * @dst_offset: dst GPU address
> * @num_gpu_pages: number of GPU pages to xfer
> - * @fence: radeon fence object
> + * @resv: reservation object with embedded fence
> *
> * Copy GPU paging using the DMA engine (evergreen-cayman).
> * Used by the radeon ttm implementation to move pages if
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 27/30] drm/radeon/ni: Remove set but unused variable 'mc_shared_chmap'
2020-11-10 19:31 ` [PATCH 27/30] drm/radeon/ni: Remove set but unused variable 'mc_shared_chmap' Lee Jones
@ 2020-11-11 0:03 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-11 0:03 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:32 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/ni.c: In function ‘cayman_gpu_init’:
> drivers/gpu/drm/radeon/ni.c:880:6: warning: variable ‘mc_shared_chmap’ set but not used [-Wunused-but-set-variable]
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/ni.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
> index 12dd082069649..1c9030a4631b8 100644
> --- a/drivers/gpu/drm/radeon/ni.c
> +++ b/drivers/gpu/drm/radeon/ni.c
> @@ -877,7 +877,7 @@ int tn_get_temp(struct radeon_device *rdev)
> static void cayman_gpu_init(struct radeon_device *rdev)
> {
> u32 gb_addr_config = 0;
> - u32 mc_shared_chmap, mc_arb_ramcfg;
> + u32 mc_arb_ramcfg;
> u32 cgts_tcc_disable;
> u32 sx_debug_1;
> u32 smx_dc_ctl0;
> @@ -1002,7 +1002,7 @@ static void cayman_gpu_init(struct radeon_device *rdev)
>
> evergreen_fix_pci_max_read_req_size(rdev);
>
> - mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
> + RREG32(MC_SHARED_CHMAP);
> mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
>
> tmp = (mc_arb_ramcfg & NOOFCOLS_MASK) >> NOOFCOLS_SHIFT;
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 25/30] drm/radeon/sumo_dpm: Move 'sumo_get_pi()'s prototype into shared header
2020-11-10 19:31 ` [PATCH 25/30] drm/radeon/sumo_dpm: Move 'sumo_get_pi()'s prototype into " Lee Jones
@ 2020-11-11 0:05 ` Alex Deucher
0 siblings, 0 replies; 52+ messages in thread
From: Alex Deucher @ 2020-11-11 0:05 UTC (permalink / raw)
To: Lee Jones
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, Nov 10, 2020 at 2:32 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/radeon/sumo_dpm.c:81:25: warning: no previous prototype for ‘sumo_get_pi’ [-Wmissing-prototypes]
> 81 | struct sumo_power_info *sumo_get_pi(struct radeon_device *rdev)
> | ^~~~~~~~~~~
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/radeon/sumo_dpm.h | 1 +
> drivers/gpu/drm/radeon/sumo_smc.c | 2 --
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/sumo_dpm.h b/drivers/gpu/drm/radeon/sumo_dpm.h
> index f1651135a47ab..db29d37ae2703 100644
> --- a/drivers/gpu/drm/radeon/sumo_dpm.h
> +++ b/drivers/gpu/drm/radeon/sumo_dpm.h
> @@ -207,6 +207,7 @@ u32 sumo_get_sleep_divider_from_id(u32 id);
> u32 sumo_get_sleep_divider_id_from_clock(struct radeon_device *rdev,
> u32 sclk,
> u32 min_sclk_in_sr);
> +struct sumo_power_info *sumo_get_pi(struct radeon_device *rdev);
>
> /* sumo_smc.c */
> void sumo_initialize_m3_arb(struct radeon_device *rdev);
> diff --git a/drivers/gpu/drm/radeon/sumo_smc.c b/drivers/gpu/drm/radeon/sumo_smc.c
> index d781407057366..78d8716067318 100644
> --- a/drivers/gpu/drm/radeon/sumo_smc.c
> +++ b/drivers/gpu/drm/radeon/sumo_smc.c
> @@ -30,8 +30,6 @@
> #define SUMO_SMU_SERVICE_ROUTINE_ALTVDDNB_NOTIFY 27
> #define SUMO_SMU_SERVICE_ROUTINE_GFX_SRV_ID_20 20
>
> -struct sumo_power_info *sumo_get_pi(struct radeon_device *rdev);
> -
> static void sumo_send_msg_to_smu(struct radeon_device *rdev, u32 id)
> {
> u32 gfx_int_req;
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH 01/30] drm/radeon/evergreen: Add comment for 'evergreen_page_flip()'s 'async' param
2020-11-10 22:52 ` Alex Deucher
@ 2020-11-11 7:16 ` Lee Jones
0 siblings, 0 replies; 52+ messages in thread
From: Lee Jones @ 2020-11-11 7:16 UTC (permalink / raw)
To: Alex Deucher
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Christian König
On Tue, 10 Nov 2020, Alex Deucher wrote:
> On Tue, Nov 10, 2020 at 2:31 PM Lee Jones <lee.jones@linaro.org> wrote:
> >
> > Fixes the following W=1 kernel build warning(s):
> >
> > drivers/gpu/drm/radeon/evergreen.c: In function ‘evergreen_gpu_init’:
> > drivers/gpu/drm/radeon/evergreen.c:1419: warning: Function parameter or member 'async' not described in 'evergreen_page_flip'
> >
> > Cc: Alex Deucher <alexander.deucher@amd.com>
> > Cc: "Christian König" <christian.koenig@amd.com>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Cc: amd-gfx@lists.freedesktop.org
> > Cc: dri-devel@lists.freedesktop.org
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
>
> Applied with minor fixups. Thanks!
Superstar! Thanks Alex.
Once these are all in -next, I'll rebase and fix the stragglers.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 52+ messages in thread
end of thread, other threads:[~2020-11-11 7:17 UTC | newest]
Thread overview: 52+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-10 19:30 [PATCH 00/30] [Set 4] Rid W=1 warnings from GPU Lee Jones
2020-11-10 19:30 ` [PATCH 01/30] drm/radeon/evergreen: Add comment for 'evergreen_page_flip()'s 'async' param Lee Jones
2020-11-10 22:52 ` Alex Deucher
2020-11-11 7:16 ` Lee Jones
2020-11-10 19:30 ` [PATCH 02/30] drm/radeon/evergreen: Remove set but unused variable 'mc_shared_chmap' Lee Jones
2020-11-10 22:50 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 03/30] drm/radeon/ni: Demote vague attempt at function header doc Lee Jones
2020-11-10 23:32 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 04/30] drm/radeon/si: Remove set but unused variable 'mc_shared_chmap' Lee Jones
2020-11-10 22:53 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 05/30] drm/radeon/cik: " Lee Jones
2020-11-10 23:33 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 06/30] drm/radeon/trinity_dpm: Remove some defined but never used arrays Lee Jones
2020-11-10 23:38 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 07/30] drm/radeon/kv_dpm: Strip out unused functions and their tables Lee Jones
2020-11-10 23:37 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 08/30] drm/radeon/ci_dpm: Remove set but unused variable 'dpm_event_src' Lee Jones
2020-11-10 23:42 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 09/30] drm/radeon/radeon_vm: Fix some function parameter documentation Lee Jones
2020-11-10 23:36 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 10/30] drm/radeon/radeon_sync: Add description for function param 'rdev' Lee Jones
2020-11-10 23:40 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 11/30] drm/radeon/radeon_ib: Supply description for 'radeon_ib_get's get param Lee Jones
2020-11-10 23:41 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 12/30] drm/radeon/radeon_dp_mst: Remove unused variable 'ret' from radeon_mst_encoder_dpms() Lee Jones
2020-11-10 23:39 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 13/30] drm/radeon/radeon_mn: Supply description for 'cur_seq' even if it is unused Lee Jones
2020-11-10 23:52 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 14/30] drm/radeon/evergreen_dma: Fix doc-rot of function parameter 'resv' Lee Jones
2020-11-10 23:57 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 15/30] drm/radeon/cik_sdma: Demote vague attempt at kernel-doc Lee Jones
2020-11-10 23:56 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 16/30] drm/radeon/r100: Fix some kernel-doc formatting, misnaming and missing issues Lee Jones
2020-11-10 23:54 ` Alex Deucher
2020-11-10 19:30 ` [PATCH 17/30] drm/radeon/r600_cs: Fix some doc-rot and supply missing function param docs Lee Jones
2020-11-10 23:55 ` Alex Deucher
2020-11-10 19:31 ` [PATCH 18/30] drm/radeon/evergreen_cs: Fix misnaming issues surrounding 'p' param Lee Jones
2020-11-10 23:57 ` Alex Deucher
2020-11-10 19:31 ` [PATCH 19/30] drm/radeon/radeon_drv: Move 'radeon_mmap()'s prototype to shared header Lee Jones
2020-11-10 19:31 ` [PATCH 20/30] drm/radeon/radeon_drv: Move 'radeon_driver_irq_handler_kms's prototype into " Lee Jones
2020-11-10 19:31 ` [PATCH 21/30] drm/radeon/atom: Move 'radeon_atom_hw_i2c_*()'s prototypes " Lee Jones
2020-11-10 19:31 ` [PATCH 22/30] drm/radeon/radeon_gem: Move 'radeon_gem_prime_*()'s prototypes to " Lee Jones
2020-11-10 19:31 ` [PATCH 23/30] drm/radeon/evergreen_hdmi: Move 'evergreen_*()' and 'dce4_*()' HDMI " Lee Jones
2020-11-10 19:31 ` [PATCH 24/30] drm/radeon/rv770: Move 'rv770_get_*()'s " Lee Jones
2020-11-10 19:31 ` [PATCH 25/30] drm/radeon/sumo_dpm: Move 'sumo_get_pi()'s prototype into " Lee Jones
2020-11-11 0:05 ` Alex Deucher
2020-11-10 19:31 ` [PATCH 26/30] drm/radeon/ni_dpm: Move 'ni_get_{pi,ps}()'s " Lee Jones
2020-11-10 19:31 ` [PATCH 27/30] drm/radeon/ni: Remove set but unused variable 'mc_shared_chmap' Lee Jones
2020-11-11 0:03 ` Alex Deucher
2020-11-10 19:31 ` [PATCH 28/30] drm/radeon/evergreen: Move 'cayman_*()'s prototypes to shared header Lee Jones
2020-11-10 19:31 ` [PATCH 29/30] drm/radeon/r600_dma: Move 'r600_gpu_check_soft_reset()'s prototype to shared location Lee Jones
2020-11-10 19:31 ` [PATCH 30/30] drm/radeon/cik: Move 'r600_ih_ring_{alloc,fini}()'s prototypes to shared header Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).