Rid W=1 warnings from GPU
Subsystems (12)
cover Rid W=1 warnings from GPU
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.
Lee Jones (20):
drm/xlnx/zynqmp_disp: Use correct kerneldoc formatting in zynqmp_disp drm/nouveau/nvkm/subdev/acr/lsfw: Remove unused variable 'loc' drm/nouveau/nvkm/subdev/bios/init: Demote a bunch of kernel-doc abuses drm/nouveau/nvkm/subdev/volt/gk20a: Demote kerneldoc abuses drm/nouveau/nvkm/engine/gr/gf100: Demote kerneldoc abuse drm/nouveau/dispnv04/crtc: Demote kerneldoc abuses drm/radeon/radeon_ttm: Remove unused variable 'rbo' from
radeon_bo_move()
drm/amd/amdgpu/sdma_v6_0: Demote a bunch of half-completed function
headers
drm/tests/drm_kunit_helpers: Place correct function name in the
comment header
drm/scheduler/sched_main: Provide short description of missing param
'result'
drm/amd/amdgpu/amdgpu_doorbell_mgr: Correct misdocumented param
'doorbell_index'
drm/amd/amdgpu/amdgpu_device: Provide suitable description for param
'xcc_id'
drm/tests/drm_kunit_helpers: Correct possible double-entry typo in
'ddrm_kunit_helper_acquire_ctx_alloc'
drm/imx/ipuv3/imx-ldb: Increase buffer size to ensure all possible
values can be stored
drm/tegra/hub: Increase buffer size to ensure all possible values can
be stored
drm/drm_connector: Provide short description of param
'supported_colorspaces'
drm/amd/amdgpu/amdgpu_ras: Increase buffer size to account for all
possible values
drm/drm_gpuva_mgr: Remove set but unused variable 'prev' drm/amd/amdgpu/amdgpu_sdma: Increase buffer size to account for all
possible values
drm/amd/amdgpu/imu_v11_0: Increase buffer size to ensure all possible
values can be stored
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + .../gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 8 +- drivers/gpu/drm/drm_connector.c | 2 + drivers/gpu/drm/drm_gpuva_mgr.c | 10 +- drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 +- .../gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c | 3 +- .../gpu/drm/nouveau/nvkm/subdev/bios/init.c | 136 +++++++++--------- .../gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 4 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 - drivers/gpu/drm/scheduler/sched_main.c | 1 + drivers/gpu/drm/tegra/hub.c | 2 +- drivers/gpu/drm/tests/drm_kunit_helpers.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_disp.c | 6 +- 19 files changed, 96 insertions(+), 97 deletions(-)
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
PATCH 1/20 drm/xlnx/zynqmp_disp: Use correct kerneldoc formatting in zynqmp_disp
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/xlnx/zynqmp_disp.c:151: warning: Function parameter or member 'blend' not described in 'zynqmp_disp' drivers/gpu/drm/xlnx/zynqmp_disp.c:151: warning: Function parameter or member 'avbuf' not described in 'zynqmp_disp' drivers/gpu/drm/xlnx/zynqmp_disp.c:151: warning: Function parameter or member 'audio' not described in 'zynqmp_disp'
---
Cc: Hyun Kwon <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/xlnx/zynqmp_disp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/xlnx/zynqmp_disp.c +3 -3
@@ -128,9 +128,9 @@ struct zynqmp_disp_layer {* struct zynqmp_disp - Display controller * @dev: Device structure * @dpsub: Display subsystem -* @blend.base: Register I/O base address for the blender -* @avbuf.base: Register I/O base address for the audio/video buffer manager -* @audio.base: Registers I/O base address for the audio mixer +* @blend: .base: Register I/O base address for the blender +* @avbuf: .base: Register I/O base address for the audio/video buffer manager +* @audio: .base: Registers I/O base address for the audio mixer * @layers: Layers (planes) */ struct zynqmp_disp {
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Laurent Pinchart
maintainerRe: [PATCH 01/20] drm/xlnx/zynqmp_disp: Use correct kerneldoc formatting in zynqmp_disp
Hi Lee,
Thank you for the patch.
Quoted 24 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/xlnx/zynqmp_disp.c:151: warning: Function parameter or member 'blend' not described in 'zynqmp_disp'drivers/gpu/drm/xlnx/zynqmp_disp.c:151: warning: Function parameter or member 'avbuf' not described in 'zynqmp_disp'drivers/gpu/drm/xlnx/zynqmp_disp.c:151: warning: Function parameter or member 'audio' not described in 'zynqmp_disp'Signed-off-by Lee Jones <[email protected]>---
Cc: Hyun Kwon <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/xlnx/zynqmp_disp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/xlnx/zynqmp_disp.c +0
-0
drivers/gpu/drm/xlnx/zynqmp_disp.c struct zynqmp_disp_layer { · line 133
Quoted 9 lines
drivers/gpu/drm/xlnx/zynqmp_disp.c +3
-3@@ -128,9 +128,9 @@ struct zynqmp_disp_layer {* struct zynqmp_disp - Display controller * @dev: Device structure * @dpsub: Display subsystem -* @blend.base: Register I/O base address for the blender -* @avbuf.base: Register I/O base address for the audio/video buffer manager -* @audio.base: Registers I/O base address for the audio mixer +* @blend: .base: Register I/O base address for the blender +* @avbuf: .base: Register I/O base address for the audio/video buffer manager +* @audio: .base: Registers I/O base address for the audio mixer
This is really a hack to work around the warning, and not a clean fix. kerneldoc is still today unable, as far as I understand, to document nested structures. That's annoying, and the warning is a good way to remind us that it needs to be fixed. I'd be tempted to keep the warning for that reason.
Quoted 3 lines
drivers/gpu/drm/xlnx/zynqmp_disp.c +0
-0* @layers: Layers (planes) */ struct zynqmp_disp {
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCH 01/20] drm/xlnx/zynqmp_disp: Use correct kerneldoc formatting in zynqmp_disp
Hi--
Quoted 34 lines · Laurent Pinchart
Hi Lee,
Thank you for the patch.
Quoted 29 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/xlnx/zynqmp_disp.c:151: warning: Function parameter or member 'blend' not described in 'zynqmp_disp'drivers/gpu/drm/xlnx/zynqmp_disp.c:151: warning: Function parameter or member 'avbuf' not described in 'zynqmp_disp'drivers/gpu/drm/xlnx/zynqmp_disp.c:151: warning: Function parameter or member 'audio' not described in 'zynqmp_disp'Signed-off-by Lee Jones <[email protected]>---
Cc: Hyun Kwon <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/xlnx/zynqmp_disp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/xlnx/zynqmp_disp.c +0
-2@@ -128,9 +128,9 @@ struct zynqmp_disp_layer {* struct zynqmp_disp - Display controller * @dev: Device structure * @dpsub: Display subsystem -* @blend.base: Register I/O base address for the blender -* @avbuf.base: Register I/O base address for the audio/video buffer manager
Quoted 8 lines
drivers/gpu/drm/xlnx/zynqmp_disp.c struct zynqmp_disp_layer { · line 133
Quoted 4 lines
drivers/gpu/drm/xlnx/zynqmp_disp.c +3
-1-* @audio.base: Registers I/O base address for the audio mixer +* @blend: .base: Register I/O base address for the blender +* @avbuf: .base: Register I/O base address for the audio/video buffer manager +* @audio: .base: Registers I/O base address for the audio mixer This is really a hack to work around the warning, and not a clean fix. kerneldoc is still today unable, as far as I understand, to document nested structures. That's annoying, and the warning is a good way to
kernel-doc for nested structs/unions is documented in Documentation/doc-guide/kernel-doc.rst.
This isn't pretty, but this fixes the warnings for me: (massage the descriptions as you see fit)
--- drivers/gpu/drm/xlnx/zynqmp_disp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/xlnx/zynqmp_disp.c +3 -0
@@ -128,8 +128,11 @@ struct zynqmp_disp_layer {* struct zynqmp_disp - Display controller * @dev: Device structure * @dpsub: Display subsystem +* @blend: blender struct * @blend.base: Register I/O base address for the blender +* @avbuf: audio/video buffer manager struct * @avbuf.base: Register I/O base address for the audio/video buffer manager +* @audio: audio mixer struct * @audio.base: Registers I/O base address for the audio mixer * @layers: Layers (planes) */
Quoted 7 lines
remind us that it needs to be fixed. I'd be tempted to keep the warning for that reason.
Quoted 3 lines
drivers/gpu/drm/xlnx/zynqmp_disp.c +0
-0* @layers: Layers (planes) */ struct zynqmp_disp {
Signature · 1 line
~Randy
PATCH 2/20 drm/nouveau/nvkm/subdev/acr/lsfw: Remove unused variable 'loc'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c: In function ‘nvkm_acr_lsfw_load_sig_image_desc_v2’:
drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c:221:21: warning: variable ‘loc’ set but not used [-Wunused-but-set-variable]
---
Cc: Ben Skeggs <[email protected]>
Cc: Karol Herbst <[email protected]>
Cc: Lyude Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Gourav Samaiya <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c +1 -2
@@ -218,7 +218,7 @@ nvkm_acr_lsfw_load_sig_image_desc_v2(struct nvkm_subdev *subdev,const struct firmware *hsbl;const struct nvfw_ls_hsbl_bin_hdr *hdr;const struct nvfw_ls_hsbl_hdr *hshdr; -u32 loc, sig, cnt, *meta; +u32 sig, cnt, *meta; ret =nvkm_firmware_load_name (subdev, path,"hs_bl_sig" , ver, &hsbl);if (ret)
@@ -227,7 +227,6 @@ nvkm_acr_lsfw_load_sig_image_desc_v2(struct nvkm_subdev *subdev, hdr =nvfw_ls_hsbl_bin_hdr (subdev, hsbl->data); hshdr =nvfw_ls_hsbl_hdr (subdev, hsbl->data + hdr->header_offset); meta = (u32 *)(hsbl->data + hshdr->meta_data_offset); - loc = *(u32 *)(hsbl->data + hshdr->patch_loc); sig = *(u32 *)(hsbl->data + hshdr->patch_sig); cnt = *(u32 *)(hsbl->data + hshdr->num_sig);
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
PATCH 3/20 drm/nouveau/nvkm/subdev/bios/init: Demote a bunch of kernel-doc abuses
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c:584: warning: Function parameter or member 'init' not described in 'init_reserved' drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c:611: warning: expecting prototype for INIT_DONE(). Prototype was for init_done() instead [Snipped ~140 lines for brevity]
---
Cc: Ben Skeggs <[email protected]>
Cc: Karol Herbst <[email protected]>
Cc: Lyude Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- .../gpu/drm/nouveau/nvkm/subdev/bios/init.c | 136 +++++++++--------- 1 file changed, 68 insertions(+), 68 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c +68 -68
@@ -575,7 +575,7 @@ init_tmds_reg(struct nvbios_init *init, u8 tmds)* init opcode handlers *****************************************************************************/ -/** +/* * init_reserved - stub for various unknown/unused single-byte opcodes * */
@@ -602,7 +602,7 @@ init_reserved(struct nvbios_init *init) init->offset += length; } -/** +/* * INIT_DONE - opcode 0x71 * */
@@ -613,7 +613,7 @@ init_done(struct nvbios_init *init) init->offset =0x0000 ; } -/** +/* * INIT_IO_RESTRICT_PROG - opcode 0x32 * */
@@ -650,7 +650,7 @@ init_io_restrict_prog(struct nvbios_init *init)trace ("}]\n" ); } -/** +/* * INIT_REPEAT - opcode 0x33 * */
@@ -676,7 +676,7 @@ init_repeat(struct nvbios_init *init) init->repeat = repeat; } -/** +/* * INIT_IO_RESTRICT_PLL - opcode 0x34 * */
@@ -716,7 +716,7 @@ init_io_restrict_pll(struct nvbios_init *init)trace ("}]\n" ); } -/** +/* * INIT_END_REPEAT - opcode 0x36 * */
@@ -732,7 +732,7 @@ init_end_repeat(struct nvbios_init *init) } } -/** +/* * INIT_COPY - opcode 0x37 * */
@@ -759,7 +759,7 @@ init_copy(struct nvbios_init *init)init_wrvgai (init, port, index, data); } -/** +/* * INIT_NOT - opcode 0x38 * */
@@ -771,7 +771,7 @@ init_not(struct nvbios_init *init)init_exec_inv (init); } -/** +/* * INIT_IO_FLAG_CONDITION - opcode 0x39 * */
@@ -788,7 +788,7 @@ init_io_flag_condition(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_GENERIC_CONDITION - opcode 0x3a * */
@@ -840,7 +840,7 @@ init_generic_condition(struct nvbios_init *init) } } -/** +/* * INIT_IO_MASK_OR - opcode 0x3b * */
@@ -859,7 +859,7 @@ init_io_mask_or(struct nvbios_init *init)init_wrvgai (init,0x03d4 , index, data &= ~(1 << or)); } -/** +/* * INIT_IO_OR - opcode 0x3c * */
@@ -878,7 +878,7 @@ init_io_or(struct nvbios_init *init)init_wrvgai (init,0x03d4 , index, data | (1 << or)); } -/** +/* * INIT_ANDN_REG - opcode 0x47 * */
@@ -895,7 +895,7 @@ init_andn_reg(struct nvbios_init *init)init_mask (init, reg, mask,0 ); } -/** +/* * INIT_OR_REG - opcode 0x48 * */
@@ -912,7 +912,7 @@ init_or_reg(struct nvbios_init *init)init_mask (init, reg,0 , mask); } -/** +/* * INIT_INDEX_ADDRESS_LATCHED - opcode 0x49 * */
@@ -942,7 +942,7 @@ init_idx_addr_latched(struct nvbios_init *init) } } -/** +/* * INIT_IO_RESTRICT_PLL2 - opcode 0x4a * */
@@ -977,7 +977,7 @@ init_io_restrict_pll2(struct nvbios_init *init)trace ("}]\n" ); } -/** +/* * INIT_PLL2 - opcode 0x4b * */
@@ -994,7 +994,7 @@ init_pll2(struct nvbios_init *init)init_prog_pll (init, reg, freq); } -/** +/* * INIT_I2C_BYTE - opcode 0x4c * */
@@ -1025,7 +1025,7 @@ init_i2c_byte(struct nvbios_init *init) } } -/** +/* * INIT_ZM_I2C_BYTE - opcode 0x4d * */
@@ -1051,7 +1051,7 @@ init_zm_i2c_byte(struct nvbios_init *init) } } -/** +/* * INIT_ZM_I2C - opcode 0x4e * */
@@ -1085,7 +1085,7 @@ init_zm_i2c(struct nvbios_init *init) } } -/** +/* * INIT_TMDS - opcode 0x4f * */
@@ -1111,7 +1111,7 @@ init_tmds(struct nvbios_init *init)init_wr32 (init, reg +0 , addr); } -/** +/* * INIT_ZM_TMDS_GROUP - opcode 0x50 * */
@@ -1138,7 +1138,7 @@ init_zm_tmds_group(struct nvbios_init *init) } } -/** +/* * INIT_CR_INDEX_ADDRESS_LATCHED - opcode 0x51 * */
@@ -1168,7 +1168,7 @@ init_cr_idx_adr_latch(struct nvbios_init *init)init_wrvgai (init,0x03d4 , addr0, save0); } -/** +/* * INIT_CR - opcode 0x52 * */
@@ -1188,7 +1188,7 @@ init_cr(struct nvbios_init *init)init_wrvgai (init,0x03d4 , addr, val | data); } -/** +/* * INIT_ZM_CR - opcode 0x53 * */
@@ -1205,7 +1205,7 @@ init_zm_cr(struct nvbios_init *init)init_wrvgai (init,0x03d4 , addr, data); } -/** +/* * INIT_ZM_CR_GROUP - opcode 0x54 * */
@@ -1229,7 +1229,7 @@ init_zm_cr_group(struct nvbios_init *init) } } -/** +/* * INIT_CONDITION_TIME - opcode 0x56 * */
@@ -1256,7 +1256,7 @@ init_condition_time(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_LTIME - opcode 0x57 * */
@@ -1273,7 +1273,7 @@ init_ltime(struct nvbios_init *init)mdelay (msec); } -/** +/* * INIT_ZM_REG_SEQUENCE - opcode 0x58 * */
@@ -1298,7 +1298,7 @@ init_zm_reg_sequence(struct nvbios_init *init) } } -/** +/* * INIT_PLL_INDIRECT - opcode 0x59 * */
@@ -1317,7 +1317,7 @@ init_pll_indirect(struct nvbios_init *init)init_prog_pll (init, reg, freq); } -/** +/* * INIT_ZM_REG_INDIRECT - opcode 0x5a * */
@@ -1336,7 +1336,7 @@ init_zm_reg_indirect(struct nvbios_init *init)init_wr32 (init, addr, data); } -/** +/* * INIT_SUB_DIRECT - opcode 0x5b * */
@@ -1362,7 +1362,7 @@ init_sub_direct(struct nvbios_init *init) init->offset +=3 ; } -/** +/* * INIT_JUMP - opcode 0x5c * */
@@ -1380,7 +1380,7 @@ init_jump(struct nvbios_init *init) init->offset +=3 ; } -/** +/* * INIT_I2C_IF - opcode 0x5e * */
@@ -1407,7 +1407,7 @@ init_i2c_if(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_COPY_NV_REG - opcode 0x5f * */
@@ -1433,7 +1433,7 @@ init_copy_nv_reg(struct nvbios_init *init)init_mask (init, dreg, ~dmask, (data & smask) ^ sxor); } -/** +/* * INIT_ZM_INDEX_IO - opcode 0x62 * */
@@ -1451,7 +1451,7 @@ init_zm_index_io(struct nvbios_init *init)init_wrvgai (init, port, index, data); } -/** +/* * INIT_COMPUTE_MEM - opcode 0x63 * */
@@ -1469,7 +1469,7 @@ init_compute_mem(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_RESET - opcode 0x65 * */
@@ -1496,7 +1496,7 @@ init_reset(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_CONFIGURE_MEM - opcode 0x66 * */
@@ -1555,7 +1555,7 @@ init_configure_mem(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_CONFIGURE_CLK - opcode 0x67 * */
@@ -1589,7 +1589,7 @@ init_configure_clk(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_CONFIGURE_PREINIT - opcode 0x68 * */
@@ -1615,7 +1615,7 @@ init_configure_preinit(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_IO - opcode 0x69 * */
@@ -1655,7 +1655,7 @@ init_io(struct nvbios_init *init)init_wrport (init, port, data | value); } -/** +/* * INIT_SUB - opcode 0x6b * */
@@ -1682,7 +1682,7 @@ init_sub(struct nvbios_init *init) init->offset +=2 ; } -/** +/* * INIT_RAM_CONDITION - opcode 0x6d * */
@@ -1701,7 +1701,7 @@ init_ram_condition(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_NV_REG - opcode 0x6e * */
@@ -1719,7 +1719,7 @@ init_nv_reg(struct nvbios_init *init)init_mask (init, reg, ~mask, data); } -/** +/* * INIT_MACRO - opcode 0x6f * */
@@ -1743,7 +1743,7 @@ init_macro(struct nvbios_init *init) init->offset +=2 ; } -/** +/* * INIT_RESUME - opcode 0x72 * */
@@ -1755,7 +1755,7 @@ init_resume(struct nvbios_init *init)init_exec_set (init, true); } -/** +/* * INIT_STRAP_CONDITION - opcode 0x73 * */
@@ -1773,7 +1773,7 @@ init_strap_condition(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_TIME - opcode 0x74 * */
@@ -1794,7 +1794,7 @@ init_time(struct nvbios_init *init) } } -/** +/* * INIT_CONDITION - opcode 0x75 * */
@@ -1811,7 +1811,7 @@ init_condition(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_IO_CONDITION - opcode 0x76 * */
@@ -1828,7 +1828,7 @@ init_io_condition(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_ZM_REG16 - opcode 0x77 * */
@@ -1845,7 +1845,7 @@ init_zm_reg16(struct nvbios_init *init)init_wr32 (init, addr, data); } -/** +/* * INIT_INDEX_IO - opcode 0x78 * */
@@ -1867,7 +1867,7 @@ init_index_io(struct nvbios_init *init)init_wrvgai (init, port, index, data | value); } -/** +/* * INIT_PLL - opcode 0x79 * */
@@ -1884,7 +1884,7 @@ init_pll(struct nvbios_init *init)init_prog_pll (init, reg, freq); } -/** +/* * INIT_ZM_REG - opcode 0x7a * */
@@ -1904,7 +1904,7 @@ init_zm_reg(struct nvbios_init *init)init_wr32 (init, addr, data); } -/** +/* * INIT_RAM_RESTRICT_PLL - opcde 0x87 * */
@@ -1934,7 +1934,7 @@ init_ram_restrict_pll(struct nvbios_init *init) } } -/** +/* * INIT_RESET_BEGUN - opcode 0x8c * */
@@ -1945,7 +1945,7 @@ init_reset_begun(struct nvbios_init *init) init->offset +=1 ; } -/** +/* * INIT_RESET_END - opcode 0x8d * */
@@ -1956,7 +1956,7 @@ init_reset_end(struct nvbios_init *init) init->offset +=1 ; } -/** +/* * INIT_GPIO - opcode 0x8e * */
@@ -1972,7 +1972,7 @@ init_gpio(struct nvbios_init *init)nvkm_gpio_reset (gpio,DCB_GPIO_UNUSED ); } -/** +/* * INIT_RAM_RESTRICT_ZM_GROUP - opcode 0x8f * */
@@ -2010,7 +2010,7 @@ init_ram_restrict_zm_reg_group(struct nvbios_init *init) } } -/** +/* * INIT_COPY_ZM_REG - opcode 0x90 * */
@@ -2027,7 +2027,7 @@ init_copy_zm_reg(struct nvbios_init *init)init_wr32 (init, dreg,init_rd32 (init, sreg)); } -/** +/* * INIT_ZM_REG_GROUP - opcode 0x91 * */
@@ -2049,7 +2049,7 @@ init_zm_reg_group(struct nvbios_init *init) } } -/** +/* * INIT_XLAT - opcode 0x96 * */
@@ -2077,7 +2077,7 @@ init_xlat(struct nvbios_init *init)init_mask (init, daddr, ~dmask, data); } -/** +/* * INIT_ZM_MASK_ADD - opcode 0x97 * */
@@ -2098,7 +2098,7 @@ init_zm_mask_add(struct nvbios_init *init)init_wr32 (init, addr, data); } -/** +/* * INIT_AUXCH - opcode 0x98 * */
@@ -2122,7 +2122,7 @@ init_auxch(struct nvbios_init *init) } } -/** +/* * INIT_AUXCH - opcode 0x99 * */
@@ -2144,7 +2144,7 @@ init_zm_auxch(struct nvbios_init *init) } } -/** +/* * INIT_I2C_LONG_IF - opcode 0x9a * */
@@ -2183,7 +2183,7 @@ init_i2c_long_if(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_GPIO_NE - opcode 0xa9 * */
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Re: [PATCH 03/20] drm/nouveau/nvkm/subdev/bios/init: Demote a bunch of kernel-doc abuses
Quoted 637 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c:584: warning: Function parameter or member 'init' not described in 'init_reserved'drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c:611: warning: expecting prototype forINIT_DONE(). Prototype was forinit_done()instead [Snipped ~140 lines for brevity]Signed-off-by Lee Jones <[email protected]>---
Cc: Ben Skeggs <[email protected]>
Cc: Karol Herbst <[email protected]>
Cc: Lyude Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]--- .../gpu/drm/nouveau/nvkm/subdev/bios/init.c | 136 +++++++++--------- 1 file changed, 68 insertions(+), 68 deletions(-)drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c +68
-69@@ -575,7 +575,7 @@ init_tmds_reg(struct nvbios_init *init, u8 tmds)* init opcode handlers *****************************************************************************/ -/** +/* * init_reserved - stub for various unknown/unused single-byte opcodes * */ @@ -602,7 +602,7 @@ init_reserved(struct nvbios_init *init) init->offset += length; } -/** +/* * INIT_DONE - opcode 0x71 * */ @@ -613,7 +613,7 @@ init_done(struct nvbios_init *init) init->offset =0x0000 ; } -/** +/* * INIT_IO_RESTRICT_PROG - opcode 0x32 * */ @@ -650,7 +650,7 @@ init_io_restrict_prog(struct nvbios_init *init)trace ("}]\n" ); } -/** +/* * INIT_REPEAT - opcode 0x33 * */ @@ -676,7 +676,7 @@ init_repeat(struct nvbios_init *init) init->repeat = repeat; } -/** +/* * INIT_IO_RESTRICT_PLL - opcode 0x34 * */ @@ -716,7 +716,7 @@ init_io_restrict_pll(struct nvbios_init *init)trace ("}]\n" ); } -/** +/* * INIT_END_REPEAT - opcode 0x36 * */ @@ -732,7 +732,7 @@ init_end_repeat(struct nvbios_init *init) } } -/** +/* * INIT_COPY - opcode 0x37 * */ @@ -759,7 +759,7 @@ init_copy(struct nvbios_init *init)init_wrvgai (init, port, index, data); } -/** +/* * INIT_NOT - opcode 0x38 * */ @@ -771,7 +771,7 @@ init_not(struct nvbios_init *init)init_exec_inv (init); } -/** +/* * INIT_IO_FLAG_CONDITION - opcode 0x39 * */ @@ -788,7 +788,7 @@ init_io_flag_condition(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_GENERIC_CONDITION - opcode 0x3a * */ @@ -840,7 +840,7 @@ init_generic_condition(struct nvbios_init *init) } } -/** +/* * INIT_IO_MASK_OR - opcode 0x3b * */ @@ -859,7 +859,7 @@ init_io_mask_or(struct nvbios_init *init)init_wrvgai (init,0x03d4 , index, data &= ~(1 << or)); } -/** +/* * INIT_IO_OR - opcode 0x3c * */ @@ -878,7 +878,7 @@ init_io_or(struct nvbios_init *init)init_wrvgai (init,0x03d4 , index, data | (1 << or)); } -/** +/* * INIT_ANDN_REG - opcode 0x47 * */ @@ -895,7 +895,7 @@ init_andn_reg(struct nvbios_init *init)init_mask (init, reg, mask,0 ); } -/** +/* * INIT_OR_REG - opcode 0x48 * */ @@ -912,7 +912,7 @@ init_or_reg(struct nvbios_init *init)init_mask (init, reg,0 , mask); } -/** +/* * INIT_INDEX_ADDRESS_LATCHED - opcode 0x49 * */ @@ -942,7 +942,7 @@ init_idx_addr_latched(struct nvbios_init *init) } } -/** +/* * INIT_IO_RESTRICT_PLL2 - opcode 0x4a * */ @@ -977,7 +977,7 @@ init_io_restrict_pll2(struct nvbios_init *init)trace ("}]\n" ); } -/** +/* * INIT_PLL2 - opcode 0x4b * */ @@ -994,7 +994,7 @@ init_pll2(struct nvbios_init *init)init_prog_pll (init, reg, freq); } -/** +/* * INIT_I2C_BYTE - opcode 0x4c * */ @@ -1025,7 +1025,7 @@ init_i2c_byte(struct nvbios_init *init) } } -/** +/* * INIT_ZM_I2C_BYTE - opcode 0x4d * */ @@ -1051,7 +1051,7 @@ init_zm_i2c_byte(struct nvbios_init *init) } } -/** +/* * INIT_ZM_I2C - opcode 0x4e * */ @@ -1085,7 +1085,7 @@ init_zm_i2c(struct nvbios_init *init) } } -/** +/* * INIT_TMDS - opcode 0x4f * */ @@ -1111,7 +1111,7 @@ init_tmds(struct nvbios_init *init)init_wr32 (init, reg +0 , addr); } -/** +/* * INIT_ZM_TMDS_GROUP - opcode 0x50 * */ @@ -1138,7 +1138,7 @@ init_zm_tmds_group(struct nvbios_init *init) } } -/** +/* * INIT_CR_INDEX_ADDRESS_LATCHED - opcode 0x51 * */ @@ -1168,7 +1168,7 @@ init_cr_idx_adr_latch(struct nvbios_init *init)init_wrvgai (init,0x03d4 , addr0, save0); } -/** +/* * INIT_CR - opcode 0x52 * */ @@ -1188,7 +1188,7 @@ init_cr(struct nvbios_init *init)init_wrvgai (init,0x03d4 , addr, val | data); } -/** +/* * INIT_ZM_CR - opcode 0x53 * */ @@ -1205,7 +1205,7 @@ init_zm_cr(struct nvbios_init *init)init_wrvgai (init,0x03d4 , addr, data); } -/** +/* * INIT_ZM_CR_GROUP - opcode 0x54 * */ @@ -1229,7 +1229,7 @@ init_zm_cr_group(struct nvbios_init *init) } } -/** +/* * INIT_CONDITION_TIME - opcode 0x56 * */ @@ -1256,7 +1256,7 @@ init_condition_time(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_LTIME - opcode 0x57 * */ @@ -1273,7 +1273,7 @@ init_ltime(struct nvbios_init *init)mdelay (msec); } -/** +/* * INIT_ZM_REG_SEQUENCE - opcode 0x58 * */ @@ -1298,7 +1298,7 @@ init_zm_reg_sequence(struct nvbios_init *init) } } -/** +/* * INIT_PLL_INDIRECT - opcode 0x59 * */ @@ -1317,7 +1317,7 @@ init_pll_indirect(struct nvbios_init *init)init_prog_pll (init, reg, freq); } -/** +/* * INIT_ZM_REG_INDIRECT - opcode 0x5a * */ @@ -1336,7 +1336,7 @@ init_zm_reg_indirect(struct nvbios_init *init)init_wr32 (init, addr, data); } -/** +/* * INIT_SUB_DIRECT - opcode 0x5b * */ @@ -1362,7 +1362,7 @@ init_sub_direct(struct nvbios_init *init) init->offset +=3 ; } -/** +/* * INIT_JUMP - opcode 0x5c * */ @@ -1380,7 +1380,7 @@ init_jump(struct nvbios_init *init) init->offset +=3 ; } -/** +/* * INIT_I2C_IF - opcode 0x5e * */ @@ -1407,7 +1407,7 @@ init_i2c_if(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_COPY_NV_REG - opcode 0x5f * */ @@ -1433,7 +1433,7 @@ init_copy_nv_reg(struct nvbios_init *init)init_mask (init, dreg, ~dmask, (data & smask) ^ sxor); } -/** +/* * INIT_ZM_INDEX_IO - opcode 0x62 * */ @@ -1451,7 +1451,7 @@ init_zm_index_io(struct nvbios_init *init)init_wrvgai (init, port, index, data); } -/** +/* * INIT_COMPUTE_MEM - opcode 0x63 * */ @@ -1469,7 +1469,7 @@ init_compute_mem(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_RESET - opcode 0x65 * */ @@ -1496,7 +1496,7 @@ init_reset(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_CONFIGURE_MEM - opcode 0x66 * */ @@ -1555,7 +1555,7 @@ init_configure_mem(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_CONFIGURE_CLK - opcode 0x67 * */ @@ -1589,7 +1589,7 @@ init_configure_clk(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_CONFIGURE_PREINIT - opcode 0x68 * */ @@ -1615,7 +1615,7 @@ init_configure_preinit(struct nvbios_init *init)init_exec_force (init, false); } -/** +/* * INIT_IO - opcode 0x69 * */ @@ -1655,7 +1655,7 @@ init_io(struct nvbios_init *init)init_wrport (init, port, data | value); } -/** +/* * INIT_SUB - opcode 0x6b * */ @@ -1682,7 +1682,7 @@ init_sub(struct nvbios_init *init) init->offset +=2 ; } -/** +/* * INIT_RAM_CONDITION - opcode 0x6d * */ @@ -1701,7 +1701,7 @@ init_ram_condition(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_NV_REG - opcode 0x6e * */ @@ -1719,7 +1719,7 @@ init_nv_reg(struct nvbios_init *init)init_mask (init, reg, ~mask, data); } -/** +/* * INIT_MACRO - opcode 0x6f * */ @@ -1743,7 +1743,7 @@ init_macro(struct nvbios_init *init) init->offset +=2 ; } -/** +/* * INIT_RESUME - opcode 0x72 * */ @@ -1755,7 +1755,7 @@ init_resume(struct nvbios_init *init)init_exec_set (init, true); } -/** +/* * INIT_STRAP_CONDITION - opcode 0x73 * */ @@ -1773,7 +1773,7 @@ init_strap_condition(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_TIME - opcode 0x74 * */ @@ -1794,7 +1794,7 @@ init_time(struct nvbios_init *init) } } -/** +/* * INIT_CONDITION - opcode 0x75 * */ @@ -1811,7 +1811,7 @@ init_condition(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_IO_CONDITION - opcode 0x76 * */ @@ -1828,7 +1828,7 @@ init_io_condition(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_ZM_REG16 - opcode 0x77 * */ @@ -1845,7 +1845,7 @@ init_zm_reg16(struct nvbios_init *init)init_wr32 (init, addr, data); } -/** +/* * INIT_INDEX_IO - opcode 0x78 * */ @@ -1867,7 +1867,7 @@ init_index_io(struct nvbios_init *init)init_wrvgai (init, port, index, data | value); } -/** +/* * INIT_PLL - opcode 0x79 * */ @@ -1884,7 +1884,7 @@ init_pll(struct nvbios_init *init)init_prog_pll (init, reg, freq); } -/** +/* * INIT_ZM_REG - opcode 0x7a * */ @@ -1904,7 +1904,7 @@ init_zm_reg(struct nvbios_init *init)init_wr32 (init, addr, data); } -/** +/* * INIT_RAM_RESTRICT_PLL - opcde 0x87 * */ @@ -1934,7 +1934,7 @@ init_ram_restrict_pll(struct nvbios_init *init) } } -/** +/* * INIT_RESET_BEGUN - opcode 0x8c * */ @@ -1945,7 +1945,7 @@ init_reset_begun(struct nvbios_init *init) init->offset +=1 ; } -/** +/* * INIT_RESET_END - opcode 0x8d * */ @@ -1956,7 +1956,7 @@ init_reset_end(struct nvbios_init *init) init->offset +=1 ; } -/** +/* * INIT_GPIO - opcode 0x8e * */ @@ -1972,7 +1972,7 @@ init_gpio(struct nvbios_init *init)nvkm_gpio_reset (gpio,DCB_GPIO_UNUSED ); } -/** +/* * INIT_RAM_RESTRICT_ZM_GROUP - opcode 0x8f * */ @@ -2010,7 +2010,7 @@ init_ram_restrict_zm_reg_group(struct nvbios_init *init) } } -/** +/* * INIT_COPY_ZM_REG - opcode 0x90 * */ @@ -2027,7 +2027,7 @@ init_copy_zm_reg(struct nvbios_init *init)init_wr32 (init, dreg,init_rd32 (init, sreg)); } -/** +/* * INIT_ZM_REG_GROUP - opcode 0x91 * */ @@ -2049,7 +2049,7 @@ init_zm_reg_group(struct nvbios_init *init) } } -/** +/* * INIT_XLAT - opcode 0x96 * */ @@ -2077,7 +2077,7 @@ init_xlat(struct nvbios_init *init)init_mask (init, daddr, ~dmask, data); } -/** +/* * INIT_ZM_MASK_ADD - opcode 0x97 * */ @@ -2098,7 +2098,7 @@ init_zm_mask_add(struct nvbios_init *init)init_wr32 (init, addr, data); } -/** +/* * INIT_AUXCH - opcode 0x98 * */ @@ -2122,7 +2122,7 @@ init_auxch(struct nvbios_init *init) } } -/** +/* * INIT_AUXCH - opcode 0x99 * */ @@ -2144,7 +2144,7 @@ init_zm_auxch(struct nvbios_init *init) } } -/** +/* * INIT_I2C_LONG_IF - opcode 0x9a * */ @@ -2183,7 +2183,7 @@ init_i2c_long_if(struct nvbios_init *init)init_exec_set (init, false); } -/** +/* * INIT_GPIO_NE - opcode 0xa9 * */ --
Quoted 2 lines
2.42.0.rc1.204.g551eb34607-goog
PATCH 4/20 drm/nouveau/nvkm/subdev/volt/gk20a: Demote kerneldoc abuses
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:49: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:62: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
---
Cc: Ben Skeggs <[email protected]>
Cc: Karol Herbst <[email protected]>
Cc: Lyude Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c +2 -2
@@ -45,7 +45,7 @@ static const struct cvb_coef gk20a_cvb_coef[] = { /* 852 */ { 1608418, -21643, -269, 0, 763, -48}, }; -/** +/* * cvb_mv = ((c2 * speedo / s_scale + c1) * speedo / s_scale + c0) */ static inline int
@@ -58,7 +58,7 @@ gk20a_volt_get_cvb_voltage(int speedo, int s_scale, const struct cvb_coef *coef)return mv; } -/** +/* * cvb_t_mv = * ((c2 * speedo / s_scale + c1) * speedo / s_scale + c0) + * ((c3 * speedo / s_scale + c4 + c5 * T / t_scale) * T / t_scale)
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Re: [PATCH 04/20] drm/nouveau/nvkm/subdev/volt/gk20a: Demote kerneldoc abuses
Quoted 42 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:49: warning: This comment starts with '/**', but isn't a kernel-doc comment. ReferDocumentation/doc-guide/kernel-doc.rstdrivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:62: warning: This comment starts with '/**', but isn't a kernel-doc comment. ReferDocumentation/doc-guide/kernel-doc.rstSigned-off-by Lee Jones <[email protected]>---
Cc: Ben Skeggs <[email protected]>
Cc: Karol Herbst <[email protected]>
Cc: Lyude Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c +2
-3@@ -45,7 +45,7 @@ static const struct cvb_coef gk20a_cvb_coef[] = { /* 852 */ { 1608418, -21643, -269, 0, 763, -48}, }; -/** +/* * cvb_mv = ((c2 * speedo / s_scale + c1) * speedo / s_scale + c0) */ static inline int@@ -58,7 +58,7 @@ gk20a_volt_get_cvb_voltage(int speedo, int s_scale, const struct cvb_coef *coef)return mv; } -/** +/* * cvb_t_mv = * ((c2 * speedo / s_scale + c1) * speedo / s_scale + c0) + * ((c3 * speedo / s_scale + c4 + c5 * T / t_scale) * T / t_scale) --
Quoted 2 lines
2.42.0.rc1.204.g551eb34607-goog
PATCH 5/20 drm/nouveau/nvkm/engine/gr/gf100: Demote kerneldoc abuse
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c:1044: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
---
Cc: Ben Skeggs <[email protected]>
Cc: Karol Herbst <[email protected]>
Cc: Lyude Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +1 -1
@@ -1040,7 +1040,7 @@ gf100_gr_zbc_init(struct gf100_gr *gr) } } -/** +/* * Wait until GR goes idle. GR is considered idle if it is disabled by the * MC (0x200) register, or GR is not busy and a context switch is not in * progress.
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Re: [PATCH 05/20] drm/nouveau/nvkm/engine/gr/gf100: Demote kerneldoc abuse
Quoted 32 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c:1044: warning: This comment starts with '/**', but isn't a kernel-doc comment. ReferDocumentation/doc-guide/kernel-doc.rstSigned-off-by Lee Jones <[email protected]>---
Cc: Ben Skeggs <[email protected]>
Cc: Karol Herbst <[email protected]>
Cc: Lyude Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +1
-2@@ -1040,7 +1040,7 @@ gf100_gr_zbc_init(struct gf100_gr *gr) } } -/** +/* * Wait until GR goes idle. GR is considered idle if it is disabled by the * MC (0x200) register, or GR is not busy and a context switch is not in * progress. --
Quoted 2 lines
2.42.0.rc1.204.g551eb34607-goog
PATCH 6/20 drm/nouveau/dispnv04/crtc: Demote kerneldoc abuses
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/dispnv04/crtc.c:453: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst drivers/gpu/drm/nouveau/dispnv04/crtc.c:629: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
---
Cc: Ben Skeggs <[email protected]>
Cc: Karol Herbst <[email protected]>
Cc: Lyude Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/dispnv04/crtc.c +2 -2
@@ -449,7 +449,7 @@ nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct drm_display_mode *mode) regp->Attribute[NV_CIO_AR_CSEL_INDEX ] =0x00 ; } -/** +/* * Sets up registers for the given mode/adjusted_mode pair. * * The clocks, CRTCs and outputs attached to this CRTC must be off.
@@ -625,7 +625,7 @@ nv_crtc_swap_fbs(struct drm_crtc *crtc, struct drm_framebuffer *old_fb)return ret; } -/** +/* * Sets up registers for the given mode/adjusted_mode pair. * * The clocks, CRTCs and outputs attached to this CRTC must be off.
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Re: [PATCH 06/20] drm/nouveau/dispnv04/crtc: Demote kerneldoc abuses
Quoted 42 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/dispnv04/crtc.c:453: warning: This comment starts with '/**', but isn't a kernel-doc comment. ReferDocumentation/doc-guide/kernel-doc.rstdrivers/gpu/drm/nouveau/dispnv04/crtc.c:629: warning: This comment starts with '/**', but isn't a kernel-doc comment. ReferDocumentation/doc-guide/kernel-doc.rstSigned-off-by Lee Jones <[email protected]>---
Cc: Ben Skeggs <[email protected]>
Cc: Karol Herbst <[email protected]>
Cc: Lyude Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/nouveau/dispnv04/crtc.c +2
-3@@ -449,7 +449,7 @@ nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct drm_display_mode *mode) regp->Attribute[NV_CIO_AR_CSEL_INDEX ] =0x00 ; } -/** +/* * Sets up registers for the given mode/adjusted_mode pair. * * The clocks, CRTCs and outputs attached to this CRTC must be off. @@ -625,7 +625,7 @@ nv_crtc_swap_fbs(struct drm_crtc *crtc, struct drm_framebuffer *old_fb)return ret; } -/** +/* * Sets up registers for the given mode/adjusted_mode pair. * * The clocks, CRTCs and outputs attached to this CRTC must be off. --
Quoted 2 lines
2.42.0.rc1.204.g551eb34607-goog
PATCH 7/20 drm/radeon/radeon_ttm: Remove unused variable 'rbo' from radeon_bo_move()
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/radeon_ttm.c: In function ‘radeon_bo_move’:
drivers/gpu/drm/radeon/radeon_ttm.c:201:27: warning: variable ‘rbo’ set but not used [-Wunused-but-set-variable]
---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Jerome Glisse <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/radeon/radeon_ttm.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/radeon/radeon_ttm.c +0 -2
@@ -197,7 +197,6 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, {struct ttm_resource *old_mem = bo->resource;struct radeon_device *rdev; -struct radeon_bo *rbo;int r;if (new_mem->mem_type ==TTM_PL_TT ) {
@@ -210,7 +209,6 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,if (r)return r; - rbo = container_of(bo, struct radeon_bo, tbo); rdev =radeon_get_rdev (bo->bdev);if (!old_mem || (old_mem->mem_type ==TTM_PL_SYSTEM && bo->ttm ==NULL )) {
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Alex Deucher
AppliedRe: [PATCH 07/20] drm/radeon/radeon_ttm: Remove unused variable 'rbo' from radeon_bo_move()
Applied. Thanks!
Quoted 43 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/radeon/radeon_ttm.c: In function ‘radeon_bo_move’:
drivers/gpu/drm/radeon/radeon_ttm.c:201:27: warning: variable ‘rbo’ set but not used [-Wunused-but-set-variable]Signed-off-by Lee Jones <[email protected]>---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Jerome Glisse <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/radeon/radeon_ttm.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/radeon/radeon_ttm.c +0
-3@@ -197,7 +197,6 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, {struct ttm_resource *old_mem = bo->resource;struct radeon_device *rdev; -struct radeon_bo *rbo;int r;if (new_mem->mem_type ==TTM_PL_TT ) {@@ -210,7 +209,6 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,if (r)return r; - rbo = container_of(bo, struct radeon_bo, tbo); rdev =radeon_get_rdev (bo->bdev);if (!old_mem || (old_mem->mem_type ==TTM_PL_SYSTEM && bo->ttm ==NULL )) { --2.42.0.rc1.204.g551eb34607-goog
PATCH 8/20 drm/amd/amdgpu/sdma_v6_0: Demote a bunch of half-completed function headers
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c:248: warning: Function parameter or member 'job' not described in 'sdma_v6_0_ring_emit_ib' drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c:248: warning: Function parameter or member 'flags' not described in 'sdma_v6_0_ring_emit_ib' drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c:945: warning: Function parameter or member 'timeout' not described in 'sdma_v6_0_ring_test_ib' drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c:1124: warning: Function parameter or member 'ring' not described in 'sdma_v6_0_ring_pad_ib' drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c:1175: warning: Function parameter or member 'vmid' not described in 'sdma_v6_0_ring_emit_vm_flush' drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c:1175: warning: Function parameter or member 'pd_addr' not described in 'sdma_v6_0_ring_emit_vm_flush'
---
--- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +4 -4
@@ -234,7 +234,7 @@ static void sdma_v6_0_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count)amdgpu_ring_write (ring, ring->funcs->nop); } -/** +/* * sdma_v6_0_ring_emit_ib - Schedule an IB on the DMA engine * * @ring: amdgpu ring pointer
@@ -937,7 +937,7 @@ static int sdma_v6_0_ring_test_ring(struct amdgpu_ring *ring)return r; } -/** +/* * sdma_v6_0_ring_test_ib - test an IB on the DMA engine * * @ring: amdgpu_ring structure holding ring information
@@ -1119,7 +1119,7 @@ static void sdma_v6_0_vm_set_pte_pde(struct amdgpu_ib *ib, ib->ptr[ib->length_dw++] = count -1 ;/* number of entries */ } -/** +/* * sdma_v6_0_ring_pad_ib - pad the IB * @ib: indirect buffer to fill with padding * @ring: amdgpu ring pointer
@@ -1168,7 +1168,7 @@ static void sdma_v6_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring) SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */ } -/** +/* * sdma_v6_0_ring_emit_vm_flush - vm flush using sDMA * * @ring: amdgpu_ring pointer
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
PATCH 9/20 drm/tests/drm_kunit_helpers: Place correct function name in the comment header
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/tests/drm_kunit_helpers.c:172: warning: expecting prototype for drm_kunit_helper_context_alloc(). Prototype was for drm_kunit_helper_acquire_ctx_alloc() instead
---
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: "Maíra Canal" <[email protected]>
Cc: [email protected]
--- drivers/gpu/drm/tests/drm_kunit_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/tests/drm_kunit_helpers.c +1 -1
@@ -156,7 +156,7 @@ static void action_drm_release_context(void *ptr) }/** -* drm_kunit_helper_context_alloc - Allocates an acquire context +* ddrm_kunit_helper_acquire_ctx_alloc - Allocates an acquire context * @test: The test context object * * Allocates and initializes a modeset acquire context.
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
PATCH 10/20 drm/scheduler/sched_main: Provide short description of missing param 'result'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/scheduler/sched_main.c:266: warning: Function parameter or member 'result' not described in 'drm_sched_job_done'
---
Cc: Luben Tuikov <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/scheduler/sched_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/scheduler/sched_main.c +1 -0
@@ -259,6 +259,7 @@ drm_sched_rq_select_entity_fifo(struct drm_sched_rq *rq)/** * drm_sched_job_done - complete a job * @s_job: pointer to the job which is done +* @result: fence error to forward and set * * Finish the job's fence and wake up the worker thread. */
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Re: [Linaro-mm-sig] [PATCH 10/20] drm/scheduler/sched_main: Provide short description of missing param 'result'
Am 24.08.23 um 09:36 schrieb Lee Jones:
Quoted 5 lines
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/scheduler/sched_main.c:266: warning: Function parameter or member 'result' not described in 'drm_sched_job_done'Signed-off-by Lee Jones <[email protected]>
Quoted 25 lines
---
Cc: Luben Tuikov <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/scheduler/sched_main.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/scheduler/sched_main.c +1
-0@@ -259,6 +259,7 @@ drm_sched_rq_select_entity_fifo(struct drm_sched_rq *rq)/** * drm_sched_job_done - complete a job * @s_job: pointer to the job which is done +* @result: fence error to forward and set * * Finish the job's fence and wake up the worker thread. */
PATCH 11/20 drm/amd/amdgpu/amdgpu_doorbell_mgr: Correct misdocumented param 'doorbell_index'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c:123: warning: Function parameter or member 'doorbell_index' not described in 'amdgpu_doorbell_index_on_bar' drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c:123: warning: Excess function parameter 'db_index' description in 'amdgpu_doorbell_index_on_bar'
---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Shashank Sharma <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c +1 -1
@@ -113,7 +113,7 @@ void amdgpu_mm_wdoorbell64(struct amdgpu_device *adev, u32 index, u64 v)* * @adev: amdgpu_device pointer * @db_bo: doorbell object's bo -* @db_index: doorbell relative index in this doorbell object +* @doorbell_index: doorbell relative index in this doorbell object * * returns doorbell's absolute index in BAR */
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
RE: [PATCH 11/20] drm/amd/amdgpu/amdgpu_doorbell_mgr: Correct misdocumented param 'doorbell_index'
[AMD Official Use Only - General]
Regards
Shashank
-----Original Message-----
From: Lee Jones <[email protected]>
Sent: Thursday, August 24, 2023 9:37 AM
To: [email protected]
Cc: [email protected]; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Sharma, Shashank <[email protected]>; [email protected]; [email protected]
Subject: [PATCH 11/20] drm/amd/amdgpu/amdgpu_doorbell_mgr: Correct misdocumented param 'doorbell_index'
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c:123: warning: Function parameter or member 'doorbell_index' not described in 'amdgpu_doorbell_index_on_bar' drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c:123: warning: Excess function parameter 'db_index' description in 'amdgpu_doorbell_index_on_bar'
---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Shashank Sharma <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c +1 -1
@@ -113,7 +113,7 @@ void amdgpu_mm_wdoorbell64(struct amdgpu_device *adev, u32 index, u64 v)* * @adev: amdgpu_device pointer * @db_bo: doorbell object's bo -* @db_index: doorbell relative index in this doorbell object +* @doorbell_index: doorbell relative index in this doorbell object * * returns doorbell's absolute index in BAR */
--
2.42.0.rc1.204.g551eb34607-goog
Alex Deucher
AppliedRe: [PATCH 11/20] drm/amd/amdgpu/amdgpu_doorbell_mgr: Correct misdocumented param 'doorbell_index'
Applied. Thanks!
Quoted 49 lines · Shashank
[AMD Official Use Only - General]
Reviewed-by : Shashank Sharma <[email protected]>Regards
Shashank
-----Original Message-----
From: Lee Jones <[email protected]>
Sent: Thursday, August 24, 2023 9:37 AM
To: [email protected]
Cc: [email protected]; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Sharma, Shashank <[email protected]>; [email protected]; [email protected]
Subject: [PATCH 11/20] drm/amd/amdgpu/amdgpu_doorbell_mgr: Correct misdocumented param 'doorbell_index'Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c:123: warning: Function parameter or member 'doorbell_index' not described in 'amdgpu_doorbell_index_on_bar'drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c:123: warning: Excess function parameter 'db_index' description in 'amdgpu_doorbell_index_on_bar'Signed-off-by Lee Jones <[email protected]>---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Shashank Sharma <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c +1
-2@@ -113,7 +113,7 @@ void amdgpu_mm_wdoorbell64(struct amdgpu_device *adev, u32 index, u64 v)* * @adev: amdgpu_device pointer * @db_bo: doorbell object's bo -* @db_index: doorbell relative index in this doorbell object +* @doorbell_index: doorbell relative index in this doorbell object * * returns doorbell's absolute index in BAR */ --2.42.0.rc1.204.g551eb34607-goog
PATCH 12/20 drm/amd/amdgpu/amdgpu_device: Provide suitable description for param 'xcc_id'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:516: warning: Function parameter or member 'xcc_id' not described in 'amdgpu_mm_wreg_mmio_rlc'
---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -0
@@ -507,6 +507,7 @@ void amdgpu_device_wreg(struct amdgpu_device *adev,* @adev: amdgpu_device pointer * @reg: mmio/rlc register * @v: value to write +* @xcc_id: xcc accelerated compute core id * * this function is invoked only for the debugfs register access */
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Alex Deucher
AppliedRe: [PATCH 12/20] drm/amd/amdgpu/amdgpu_device: Provide suitable description for param 'xcc_id'
Applied. Thanks!
Quoted 36 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:516: warning: Function parameter or member 'xcc_id' not described in 'amdgpu_mm_wreg_mmio_rlc'Signed-off-by Lee Jones <[email protected]>---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1@@ -507,6 +507,7 @@ void amdgpu_device_wreg(struct amdgpu_device *adev,* @adev: amdgpu_device pointer * @reg: mmio/rlc register * @v: value to write +* @xcc_id: xcc accelerated compute core id * * this function is invoked only for the debugfs register access */ --2.42.0.rc1.204.g551eb34607-goog
PATCH 13/20 drm/tests/drm_kunit_helpers: Correct possible double-entry typo in 'ddrm_kunit_helper_acquire_ctx_alloc'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/tests/drm_kunit_helpers.c:172: warning: expecting prototype for ddrm_kunit_helper_acquire_ctx_alloc(). Prototype was for drm_kunit_helper_acquire_ctx_alloc() instead
---
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: "Maíra Canal" <[email protected]>
Cc: [email protected]
--- drivers/gpu/drm/tests/drm_kunit_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/tests/drm_kunit_helpers.c +1 -1
@@ -156,7 +156,7 @@ static void action_drm_release_context(void *ptr) }/** -* ddrm_kunit_helper_acquire_ctx_alloc - Allocates an acquire context +* drm_kunit_helper_acquire_ctx_alloc - Allocates an acquire context * @test: The test context object * * Allocates and initializes a modeset acquire context.
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Maxime Ripard
maintainerRe: [PATCH 13/20] drm/tests/drm_kunit_helpers: Correct possible double-entry typo in 'ddrm_kunit_helper_acquire_ctx_alloc'
Hi,
Quoted 20 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/tests/drm_kunit_helpers.c:172: warning: expecting prototype forddrm_kunit_helper_acquire_ctx_alloc(). Prototype was fordrm_kunit_helper_acquire_ctx_alloc()insteadSigned-off-by Lee Jones <[email protected]>---
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: "Maíra Canal" <[email protected]>
Cc: [email protected]--- drivers/gpu/drm/tests/drm_kunit_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/tests/drm_kunit_helpers.c +0
-0
drivers/gpu/drm/tests/drm_kunit_helpers.c static void action_drm_release_context(void *ptr) · line 162
Quoted 8 lines
drivers/gpu/drm/tests/drm_kunit_helpers.c +1
-1@@ -156,7 +156,7 @@ static void action_drm_release_context(void *ptr) }/** -* ddrm_kunit_helper_acquire_ctx_alloc - Allocates an acquire context +* drm_kunit_helper_acquire_ctx_alloc - Allocates an acquire context * @test: The test context object * * Allocates and initializes a modeset acquire context.
The typo was added by your patch 9.
I've applied and squashed them both
Maxime
Re: [PATCH 13/20] drm/tests/drm_kunit_helpers: Correct possible double-entry typo in 'ddrm_kunit_helper_acquire_ctx_alloc'
Quoted 25 lines · Maxime Ripard
Hi,
Quoted 22 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/tests/drm_kunit_helpers.c:172: warning: expecting prototype forddrm_kunit_helper_acquire_ctx_alloc(). Prototype was fordrm_kunit_helper_acquire_ctx_alloc()insteadSigned-off-by Lee Jones <[email protected]>---
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: "Maíra Canal" <[email protected]>
Cc: [email protected]--- drivers/gpu/drm/tests/drm_kunit_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/tests/drm_kunit_helpers.c +0
-0@@ -156,7 +156,7 @@ static void action_drm_release_context(void *ptr) }
Quoted 8 lines
drivers/gpu/drm/tests/drm_kunit_helpers.c static void action_drm_release_context(void *ptr) · line 162
Quoted 6 lines
drivers/gpu/drm/tests/drm_kunit_helpers.c +1
-1/** -* ddrm_kunit_helper_acquire_ctx_alloc - Allocates an acquire context +* drm_kunit_helper_acquire_ctx_alloc - Allocates an acquire context * @test: The test context object * * Allocates and initializes a modeset acquire context. The typo was added by your patch 9.
Whoops! Good catch.
Quoted 2 lines
I've applied and squashed them both
Perfect, thank you.
Signature · 1 line
Lee Jones [李琼斯]
PATCH 14/20 drm/imx/ipuv3/imx-ldb: Increase buffer size to ensure all possible values can be stored
In reply to Lee JonesWhen converting from int to string, we must allow for up to 10-chars (2147483647).
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/imx/ipuv3/imx-ldb.c: In function ‘imx_ldb_probe’:
drivers/gpu/drm/imx/ipuv3/imx-ldb.c:659:39: warning: ‘_sel’ directive writing 4 bytes into a region of size between 3 and 13 [-Wformat-overflow=] drivers/gpu/drm/imx/ipuv3/imx-ldb.c:659:17: note: ‘sprintf’ output between 8 and 18 bytes into a destination of size 16
---
Cc: Philipp Zabel <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/imx/ipuv3/imx-ldb.c +1 -1
@@ -654,7 +654,7 @@ static int imx_ldb_probe(struct platform_device *pdev)* Map them all to di0_sel...di3_sel. */ for (i =0 ; i <4 ; i++) { -char clkname[16 ]; +char clkname[18 ];sprintf (clkname,"di%d_sel" , i); imx_ldb->clk_sel[i] =devm_clk_get (imx_ldb->dev, clkname);
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
PATCH 15/20 drm/tegra/hub: Increase buffer size to ensure all possible values can be stored
In reply to Lee JonesWhen converting from int to string, we must allow for up to 10-chars (2147483647).
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/tegra/hub.c: In function ‘tegra_display_hub_probe’:
drivers/gpu/drm/tegra/hub.c:1106:47: warning: ‘%u’ directive output may be truncated writing between 1 and 10 bytes into a region of size 4 [-Wformat-truncation=] drivers/gpu/drm/tegra/hub.c:1106:42: note: directive argument in the range [0, 4294967294]
drivers/gpu/drm/tegra/hub.c:1106:17: note: ‘snprintf’ output between 6 and 15 bytes into a destination of size 8
---
Cc: Thierry Reding <[email protected]>
Cc: Mikko Perttunen <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Jonathan Hunter <[email protected]>
Cc: Philipp Zabel <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/tegra/hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/tegra/hub.c +1 -1
@@ -1101,7 +1101,7 @@ static int tegra_display_hub_probe(struct platform_device *pdev)for (i =0 ; i < hub->soc->num_wgrps; i++) {struct tegra_windowgroup *wgrp = &hub->wgrps[i]; -char id[8 ]; +char id[16 ];snprintf (id,sizeof (id),"wgrp%u" , i);mutex_init (&wgrp->lock);
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Re: [PATCH 15/20] drm/tegra/hub: Increase buffer size to ensure all possible values can be stored
Quoted 8 lines · Lee Jones
When converting from int to string, we must allow for up to 10-chars (2147483647).
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/tegra/hub.c: In function ‘tegra_display_hub_probe’:
drivers/gpu/drm/tegra/hub.c:1106:47: warning: ‘%u’ directive output may be truncated writing between 1 and 10 bytes into a region of size 4 [-Wformat-truncation=]drivers/gpu/drm/tegra/hub.c:1106:42: note: directive argument in the range [0, 4294967294]
drivers/gpu/drm/tegra/hub.c:1106:17: note: ‘snprintf’ output between 6 and 15 bytes into a destination of size 8
I wish there was (perhaps there is?) a better way to annotate that i will always be within a given range. In practice this is always going to be smaller than 10 and even in future hardware I wouldn't expect this to ever exceed anything like 32 or 64, so 8 characters is already generous.
Thierry
Quoted 31 lines
Signed-off-by Lee Jones <[email protected]>---
Cc: Thierry Reding <[email protected]>
Cc: Mikko Perttunen <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Jonathan Hunter <[email protected]>
Cc: Philipp Zabel <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/tegra/hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/tegra/hub.c +1
-1@@ -1101,7 +1101,7 @@ static int tegra_display_hub_probe(struct platform_device *pdev)for (i =0 ; i < hub->soc->num_wgrps; i++) {struct tegra_windowgroup *wgrp = &hub->wgrps[i]; -char id[8 ]; +char id[16 ];snprintf (id,sizeof (id),"wgrp%u" , i);mutex_init (&wgrp->lock);Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Re: [PATCH 15/20] drm/tegra/hub: Increase buffer size to ensure all possible values can be stored
Quoted 10 lines · Thierry Reding
Quoted 8 lines · Lee Jones
When converting from int to string, we must allow for up to 10-chars (2147483647).
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/tegra/hub.c: In function ‘tegra_display_hub_probe’:
drivers/gpu/drm/tegra/hub.c:1106:47: warning: ‘%u’ directive output may be truncated writing between 1 and 10 bytes into a region of size 4 [-Wformat-truncation=]drivers/gpu/drm/tegra/hub.c:1106:42: note: directive argument in the range [0, 4294967294]
drivers/gpu/drm/tegra/hub.c:1106:17: note: ‘snprintf’ output between 6 and 15 bytes into a destination of size 8
Quoted 4 lines
I wish there was (perhaps there is?) a better way to annotate that i will always be within a given range. In practice this is always going to be smaller than 10 and even in future hardware I wouldn't expect this to ever exceed anything like 32 or 64, so 8 characters is already generous.
I assume you could do
snprintf(id, sizeof(id), "wgrp%u", (unsigned char)i);
but it's perhaps less obvious than just increasing the size of the buffer.
BR,
Jani.
Quoted 34 lines
Thierry
Quoted 31 lines
Signed-off-by Lee Jones <[email protected]>---
Cc: Thierry Reding <[email protected]>
Cc: Mikko Perttunen <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Jonathan Hunter <[email protected]>
Cc: Philipp Zabel <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/tegra/hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/tegra/hub.c +1
-1@@ -1101,7 +1101,7 @@ static int tegra_display_hub_probe(struct platform_device *pdev)for (i =0 ; i < hub->soc->num_wgrps; i++) {struct tegra_windowgroup *wgrp = &hub->wgrps[i]; -char id[8 ]; +char id[16 ];snprintf (id,sizeof (id),"wgrp%u" , i);mutex_init (&wgrp->lock);Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [PATCH 15/20] drm/tegra/hub: Increase buffer size to ensure all possible values can be stored
Quoted 16 lines · Jani Nikula
Quoted 10 lines · Thierry Reding
Quoted 8 lines · Lee Jones
When converting from int to string, we must allow for up to 10-chars (2147483647).
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/tegra/hub.c: In function ‘tegra_display_hub_probe’:
drivers/gpu/drm/tegra/hub.c:1106:47: warning: ‘%u’ directive output may be truncated writing between 1 and 10 bytes into a region of size 4 [-Wformat-truncation=]drivers/gpu/drm/tegra/hub.c:1106:42: note: directive argument in the range [0, 4294967294]
drivers/gpu/drm/tegra/hub.c:1106:17: note: ‘snprintf’ output between 6 and 15 bytes into a destination of size 8Quoted 4 lines
I wish there was (perhaps there is?) a better way to annotate that i will always be within a given range. In practice this is always going to be smaller than 10 and even in future hardware I wouldn't expect this to ever exceed anything like 32 or 64, so 8 characters is already generous.
Quoted 6 lines
I assume you could do
snprintf(id, sizeof(id), "wgrp%u", (unsigned char)i);but it's perhaps less obvious than just increasing the size of the buffer.
I had the very same thought process.
Signature · 1 line
Lee Jones [李琼斯]
Re: [PATCH 15/20] drm/tegra/hub: Increase buffer size to ensure all possible values can be stored
Quoted 18 lines · Lee Jones
Quoted 16 lines · Jani Nikula
Quoted 14 lines · Thierry Reding
Quoted 8 lines · Lee Jones
When converting from int to string, we must allow for up to 10-chars (2147483647).
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/tegra/hub.c: In function ‘tegra_display_hub_probe’:
drivers/gpu/drm/tegra/hub.c:1106:47: warning: ‘%u’ directive output may be truncated writing between 1 and 10 bytes into a region of size 4 [-Wformat-truncation=]drivers/gpu/drm/tegra/hub.c:1106:42: note: directive argument in the range [0, 4294967294]
drivers/gpu/drm/tegra/hub.c:1106:17: note: ‘snprintf’ output between 6 and 15 bytes into a destination of size 8I wish there was (perhaps there is?) a better way to annotate that i will always be within a given range. In practice this is always going to be smaller than 10 and even in future hardware I wouldn't expect this to ever exceed anything like 32 or 64, so 8 characters is already generous.
Quoted 8 lines
Quoted 6 lines
I assume you could do
snprintf(id, sizeof(id), "wgrp%u", (unsigned char)i);but it's perhaps less obvious than just increasing the size of the buffer.
I had the very same thought process.
It's not a big deal, this happens all on the stack, so adding a couple of bytes isn't going to hurt very much. Still with all the tooling that we have it'd be nice if something could be added. Perhaps an alternative would be to reject values for num_wgrp that are bigger than 32. With that the compiler might have enough information not to warn about this.
Anyway, no need to spend any more time on this, I'm fine with the patch as-is.
Thierry
PATCH 16/20 drm/drm_connector: Provide short description of param 'supported_colorspaces'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/drm_connector.c:2215: warning: Function parameter or member 'supported_colorspaces' not described in 'drm_mode_create_hdmi_colorspace_property' drivers/gpu/drm/drm_connector.c:2239: warning: Function parameter or member 'supported_colorspaces' not described in 'drm_mode_create_dp_colorspace_property'
---
Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
--- drivers/gpu/drm/drm_connector.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_connector.c +2 -0
@@ -2203,6 +2203,7 @@ static int drm_mode_create_colorspace_property(struct drm_connector *connector,/** * drm_mode_create_hdmi_colorspace_property - create hdmi colorspace property * @connector: connector to create the Colorspace property on. +* @supported_colorspaces: bitmap of supported color spaces * * Called by a driver the first time it's needed, must be attached to desired * HDMI connectors.
@@ -2227,6 +2228,7 @@ EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property);/** * drm_mode_create_dp_colorspace_property - create dp colorspace property * @connector: connector to create the Colorspace property on. +* @supported_colorspaces: bitmap of supported color spaces * * Called by a driver the first time it's needed, must be attached to desired * DP connectors.
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Re: (subset) [PATCH 16/20] drm/drm_connector: Provide short description of param 'supported_colorspaces'
Quoted 6 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/drm_connector.c:2215: warning: Function parameter or member 'supported_colorspaces' not described in 'drm_mode_create_hdmi_colorspace_property'drivers/gpu/drm/drm_connector.c:2239: warning: Function parameter or member 'supported_colorspaces' not described in 'drm_mode_create_dp_colorspace_property'
Applied to drm/drm-misc (drm-misc-fixes).
Thanks!
Maxime
PATCH 17/20 drm/amd/amdgpu/amdgpu_ras: Increase buffer size to account for all possible values
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c: In function ‘amdgpu_ras_sysfs_create’:
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1406:20: warning: ‘_err_count’ directive output may be truncated writing 10 bytes into a region of size between 1 and 32 [-Wformat-truncation=] drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1405:9: note: ‘snprintf’ output between 11 and 42 bytes into a destination of size 32
---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Hawking Zhang <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +1 -1
@@ -436,7 +436,7 @@ struct amdgpu_ras { };struct ras_fs_data { -char sysfs_name[32 ]; +char sysfs_name[48 ];char debugfs_name[32 ]; };
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Alex Deucher
AppliedRe: [PATCH 17/20] drm/amd/amdgpu/amdgpu_ras: Increase buffer size to account for all possible values
Applied. Thanks!
Quoted 37 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c: In function ‘amdgpu_ras_sysfs_create’:
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1406:20: warning: ‘_err_count’ directive output may be truncated writing 10 bytes into a region of size between 1 and 32 [-Wformat-truncation=]drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1405:9: note: ‘snprintf’ output between 11 and 42 bytes into a destination of size 32Signed-off-by Lee Jones <[email protected]>---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Hawking Zhang <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +1
-2@@ -436,7 +436,7 @@ struct amdgpu_ras { };struct ras_fs_data { -char sysfs_name[32 ]; +char sysfs_name[48 ];char debugfs_name[32 ]; }; --2.42.0.rc1.204.g551eb34607-goog
PATCH 18/20 drm/drm_gpuva_mgr: Remove set but unused variable 'prev'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/drm_gpuva_mgr.c: In function ‘__drm_gpuva_sm_map’:
drivers/gpu/drm/drm_gpuva_mgr.c:1079:39: warning: variable ‘prev’ set but not used [-Wunused-but-set-variable]
---
Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: Danilo Krummrich <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/drm_gpuva_mgr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_gpuva_mgr.c +4 -6
@@ -1076,7 +1076,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, u64 req_addr, u64 req_range, struct drm_gem_object *req_obj, u64 req_offset) { - struct drm_gpuva *va, *next, *prev = NULL; + struct drm_gpuva *va, *next;u64 req_end = req_addr + req_range;int ret;
@@ -1106,7 +1106,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_unmap_cb (ops, priv, va, merge);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {
@@ -1151,7 +1151,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_remap_cb (ops, priv, &p,NULL , &u);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {
@@ -1184,7 +1184,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_unmap_cb (ops, priv, va, merge);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {
@@ -1205,8 +1205,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,break ; } } -next: - prev = va; } return op_map_cb(ops, priv,
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Re: [PATCH 18/20] drm/drm_gpuva_mgr: Remove set but unused variable 'prev'
Hi Lee,
Quoted 4 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/drm_gpuva_mgr.c: In function ‘__drm_gpuva_sm_map’:
drivers/gpu/drm/drm_gpuva_mgr.c:1079:39: warning: variable ‘prev’ set but not used [-Wunused-but-set-variable]
Thanks for fixing this up.
However, I already had a patch in the queue addressing the warning, which I already applied to drm-misc/drm-misc-next-fixes.
- Danilo
Quoted 67 lines
Signed-off-by Lee Jones <[email protected]>---
Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: Danilo Krummrich <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/drm_gpuva_mgr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)drivers/gpu/drm/drm_gpuva_mgr.c +4
-6@@ -1076,7 +1076,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, u64 req_addr, u64 req_range, struct drm_gem_object *req_obj, u64 req_offset) { - struct drm_gpuva *va, *next, *prev = NULL; + struct drm_gpuva *va, *next;u64 req_end = req_addr + req_range;int ret;@@ -1106,7 +1106,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_unmap_cb (ops, priv, va, merge);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {@@ -1151,7 +1151,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_remap_cb (ops, priv, &p,NULL , &u);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {@@ -1184,7 +1184,7 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr, ret =op_unmap_cb (ops, priv, va, merge);if (ret)return ret; - goto next; +continue ; }if (end > req_end) {@@ -1205,8 +1205,6 @@ __drm_gpuva_sm_map(struct drm_gpuva_manager *mgr,break ; } } -next: - prev = va; } return op_map_cb(ops, priv,
PATCH 19/20 drm/amd/amdgpu/amdgpu_sdma: Increase buffer size to account for all possible values
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c: In function ‘amdgpu_sdma_init_microcode’:
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c:217:64: warning: ‘.bin’ directive output may be truncated writing 4 bytes into a region of size between 0 and 32 [-Wformat-truncation=] drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c:217:17: note: ‘snprintf’ output between 13 and 52 bytes into a destination of size 40 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c:215:66: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=] drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c:215:17: note: ‘snprintf’ output between 12 and 41 bytes into a destination of size 40
---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +1 -1
@@ -208,7 +208,7 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev,const struct sdma_firmware_header_v2_0 *sdma_hdr;uint16_t version_major;char ucode_prefix[30 ]; -char fw_name[40 ]; +char fw_name[52 ];amdgpu_ucode_ip_version_decode (adev,SDMA0_HWIP , ucode_prefix,sizeof (ucode_prefix));if (instance ==0 )
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Alex Deucher
AppliedRe: [PATCH 19/20] drm/amd/amdgpu/amdgpu_sdma: Increase buffer size to account for all possible values
Applied. Thanks!
Quoted 38 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c: In function ‘amdgpu_sdma_init_microcode’:
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c:217:64: warning: ‘.bin’ directive output may be truncated writing 4 bytes into a region of size between 0 and 32 [-Wformat-truncation=]drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c:217:17: note: ‘snprintf’ output between 13 and 52 bytes into a destination of size 40drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c:215:66: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c:215:17: note: ‘snprintf’ output between 12 and 41 bytes into a destination of size 40Signed-off-by Lee Jones <[email protected]>---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +1
-2@@ -208,7 +208,7 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev,const struct sdma_firmware_header_v2_0 *sdma_hdr;uint16_t version_major;char ucode_prefix[30 ]; -char fw_name[40 ]; +char fw_name[52 ];amdgpu_ucode_ip_version_decode (adev,SDMA0_HWIP , ucode_prefix,sizeof (ucode_prefix));if (instance ==0 ) --2.42.0.rc1.204.g551eb34607-goog
PATCH 20/20 drm/amd/amdgpu/imu_v11_0: Increase buffer size to ensure all possible values can be stored
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c: In function ‘imu_v11_0_init_microcode’:
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c:52:54: warning: ‘_imu.bin’ directive output may be truncated writing 8 bytes into a region of size between 4 and 33 [-Wformat-truncation=] drivers/gpu/drm/amd/amdgpu/imu_v11_0.c:52:9: note: ‘snprintf’ output between 16 and 45 bytes into a destination of size 40
---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Mario Limonciello <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c +1 -1
@@ -39,7 +39,7 @@ MODULE_FIRMWARE("amdgpu/gc_11_0_4_imu.bin");static int imu_v11_0_init_microcode (struct amdgpu_device *adev) { -char fw_name[40 ]; +char fw_name[45 ];char ucode_prefix[30 ];int err;const struct imu_firmware_header_v1_0 *imu_hdr;
Signature · 1 line
2.42.0.rc1.204.g551eb34607-goog
Alex Deucher
AppliedRe: [PATCH 20/20] drm/amd/amdgpu/imu_v11_0: Increase buffer size to ensure all possible values can be stored
Applied. Thanks!
Quoted 37 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c: In function ‘imu_v11_0_init_microcode’:
drivers/gpu/drm/amd/amdgpu/imu_v11_0.c:52:54: warning: ‘_imu.bin’ directive output may be truncated writing 8 bytes into a region of size between 4 and 33 [-Wformat-truncation=]drivers/gpu/drm/amd/amdgpu/imu_v11_0.c:52:9: note: ‘snprintf’ output between 16 and 45 bytes into a destination of size 40Signed-off-by Lee Jones <[email protected]>---
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "Pan, Xinhui" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Mario Limonciello <[email protected]>
Cc: [email protected]
Cc: [email protected]--- drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/imu_v11_0.c +1
-2@@ -39,7 +39,7 @@ MODULE_FIRMWARE("amdgpu/gc_11_0_4_imu.bin");static int imu_v11_0_init_microcode (struct amdgpu_device *adev) { -char fw_name[40 ]; +char fw_name[45 ];char ucode_prefix[30 ];int err;const struct imu_firmware_header_v1_0 *imu_hdr; --2.42.0.rc1.204.g551eb34607-goog
Quoted 45 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
Cc Alex Deucher <[email protected]>Cc Ben Skeggs <[email protected]>Cc "Christian König" <[email protected]>Cc Daniel Vetter <[email protected]>Cc Danilo Krummrich <[email protected]>Cc David Airlie <[email protected]>Cc Fabio Estevam <[email protected]>Cc Gourav Samaiya <[email protected]>Cc Hawking Zhang <[email protected]>Cc Hyun Kwon <[email protected]>Cc Jerome Glisse <[email protected]>Cc Jonathan Hunter <[email protected]>Cc Karol Herbst <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Luben Tuikov <[email protected]>Cc Lyude Paul <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc "Maíra Canal" <[email protected]>Cc Mario Limonciello <[email protected]>Cc Maxime Ripard <[email protected]>Cc Michal Simek <[email protected]>Cc Mikko Perttunen <[email protected]>Cc NXP Linux Team <[email protected]>Cc "Pan, Xinhui" <[email protected]>Cc Pengutronix Kernel Team <[email protected]>Cc Philipp Zabel <[email protected]>Cc Sascha Hauer <[email protected]>Cc Shashank Sharma <[email protected]>Cc Shawn Guo <[email protected]>Cc Stanley Yang <[email protected]>Cc Sumit Semwal <[email protected]>Cc Thierry Reding <[email protected]>Cc Thomas Zimmermann <[email protected]>
Quoted 1 line
[...]
Applied to drm/drm-misc (drm-misc-fixes).
Thanks!
Maxime
Maxime Ripard
maintainerHi,
Quoted 46 lines · Maxime Ripard
Quoted 45 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
Cc Alex Deucher <[email protected]>Cc Ben Skeggs <[email protected]>Cc "Christian König" <[email protected]>Cc Daniel Vetter <[email protected]>Cc Danilo Krummrich <[email protected]>Cc David Airlie <[email protected]>Cc Fabio Estevam <[email protected]>Cc Gourav Samaiya <[email protected]>Cc Hawking Zhang <[email protected]>Cc Hyun Kwon <[email protected]>Cc Jerome Glisse <[email protected]>Cc Jonathan Hunter <[email protected]>Cc Karol Herbst <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Luben Tuikov <[email protected]>Cc Lyude Paul <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc "Maíra Canal" <[email protected]>Cc Mario Limonciello <[email protected]>Cc Maxime Ripard <[email protected]>Cc Michal Simek <[email protected]>Cc Mikko Perttunen <[email protected]>Cc NXP Linux Team <[email protected]>Cc "Pan, Xinhui" <[email protected]>Cc Pengutronix Kernel Team <[email protected]>Cc Philipp Zabel <[email protected]>Cc Sascha Hauer <[email protected]>Cc Shashank Sharma <[email protected]>Cc Shawn Guo <[email protected]>Cc Stanley Yang <[email protected]>Cc Sumit Semwal <[email protected]>Cc Thierry Reding <[email protected]>Cc Thomas Zimmermann <[email protected]>
Quoted 3 lines
Quoted 1 line
[...]
Applied to drm/drm-misc (drm-misc-fixes).
I got confused with b4 usage, but that wasn't actually applied. Only the three patches I explicitly mentioned were, sorry for the confusion.
Maxime
Quoted 49 lines · Maxime Ripard
Hi,
Quoted 46 lines · Maxime Ripard
Quoted 45 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
Cc Alex Deucher <[email protected]>Cc Ben Skeggs <[email protected]>Cc "Christian König" <[email protected]>Cc Daniel Vetter <[email protected]>Cc Danilo Krummrich <[email protected]>Cc David Airlie <[email protected]>Cc Fabio Estevam <[email protected]>Cc Gourav Samaiya <[email protected]>Cc Hawking Zhang <[email protected]>Cc Hyun Kwon <[email protected]>Cc Jerome Glisse <[email protected]>Cc Jonathan Hunter <[email protected]>Cc Karol Herbst <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Luben Tuikov <[email protected]>Cc Lyude Paul <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc "Maíra Canal" <[email protected]>Cc Mario Limonciello <[email protected]>Cc Maxime Ripard <[email protected]>Cc Michal Simek <[email protected]>Cc Mikko Perttunen <[email protected]>Cc NXP Linux Team <[email protected]>Cc "Pan, Xinhui" <[email protected]>Cc Pengutronix Kernel Team <[email protected]>Cc Philipp Zabel <[email protected]>Cc Sascha Hauer <[email protected]>Cc Shashank Sharma <[email protected]>Cc Shawn Guo <[email protected]>Cc Stanley Yang <[email protected]>Cc Sumit Semwal <[email protected]>Cc Thierry Reding <[email protected]>Cc Thomas Zimmermann <[email protected]>
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
[...]
Applied to drm/drm-misc (drm-misc-fixes).
I got confused with b4 usage, but that wasn't actually applied. Only the three patches I explicitly mentioned were, sorry for the confusion.
:)
Thanks Maxime.
Signature · 1 line
Lee Jones [李琼斯]
Quoted 3 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
The next question is, how do we keep it W=1 clean going forward?
Most people don't use W=1 because it's too noisy, so it's a bit of a catch-22.
In i915, we enable a lot of W=1 warnings using subdir-ccflags-y in our Makefile. For CI/developer use we also enable kernel-doc warnings by default.
Should we start enabling some of those warning flags in drm/Makefile to to keep the entire subsystem warning free?
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Maxime Ripard
maintainerQuoted 10 lines · Jani Nikula
Quoted 3 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
The next question is, how do we keep it W=1 clean going forward?
Most people don't use W=1 because it's too noisy, so it's a bit of a catch-22.
Quoted 6 lines
In i915, we enable a lot of W=1 warnings using subdir-ccflags-y in our
Makefile. For CI/developer use we also enable kernel-doc warnings by default.Should we start enabling some of those warning flags in drm/Makefile to to keep the entire subsystem warning free?
I think that's a good idea. At least the documentation fixes I just merged could have been easily caught before submission.
Maxime
Quoted 6 lines · Jani Nikula
Quoted 3 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
The next question is, how do we keep it W=1 clean going forward?
My plan was to fix them all, then move each warning to W=0.
Arnd recently submitted a set doing just that for a bunch of them.
https://lore.kernel.org/all/[email protected]/
I like to think a bunch of this is built on top of my previous efforts.
GPU is a particularly tricky though - the warnings seem to come in faster than I can squash them. Maybe the maintainers can find a way to test new patches on merge?
Quoted 9 lines
Most people don't use W=1 because it's too noisy, so it's a bit of a catch-22.
In i915, we enable a lot of W=1 warnings using subdir-ccflags-y in our
Makefile. For CI/developer use we also enable kernel-doc warnings by default.Should we start enabling some of those warning flags in drm/Makefile to to keep the entire subsystem warning free?
That would we awesome! We'd just need buy-in.
Signature · 1 line
Lee Jones [李琼斯]
Quoted 10 lines · Lee Jones
Quoted 6 lines · Jani Nikula
Quoted 3 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
The next question is, how do we keep it W=1 clean going forward?
My plan was to fix them all, then move each warning to W=0.
Some history:
- Starting with v5.8-rc1: 18867 - 2020-07-01: 18089 - 2020-07-07: 17288 - 2020-07-17: 15762 - 2020-07-20: 15724 - 2020-07-23: 15116 - 2020-08-12: 15184 - 2020-10-19: 10909 - 2020-11-04: 9385 - 2021-01-04: 5478 - 2021-01-12 4749 - 2021-01-29 4911 - 2021-04-07 3594 - 2021-05-20 2938 - 2021-07-01 2587 - 2023-02-10 2587 - 2023-08-22 1650
Quoted 21 lines
Arnd recently submitted a set doing just that for a bunch of them.
https://lore.kernel.org/all/[email protected]/
I like to think a bunch of this is built on top of my previous efforts.
GPU is a particularly tricky though - the warnings seem to come in faster than I can squash them. Maybe the maintainers can find a way to test new patches on merge?
Quoted 9 lines
Most people don't use W=1 because it's too noisy, so it's a bit of a catch-22.
In i915, we enable a lot of W=1 warnings using subdir-ccflags-y in our
Makefile. For CI/developer use we also enable kernel-doc warnings by default.Should we start enabling some of those warning flags in drm/Makefile to to keep the entire subsystem warning free?
That would we awesome! We'd just need buy-in.
Signature · 1 line
Lee Jones [李琼斯]
Quoted 13 lines · Lee Jones
Quoted 6 lines · Jani Nikula
Quoted 3 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
The next question is, how do we keep it W=1 clean going forward?
My plan was to fix them all, then move each warning to W=0.
Arnd recently submitted a set doing just that for a bunch of them.
Quoted 7 lines
https://lore.kernel.org/all/[email protected]/
I like to think a bunch of this is built on top of my previous efforts.
GPU is a particularly tricky though - the warnings seem to come in faster than I can squash them. Maybe the maintainers can find a way to test new patches on merge?
I guess on that note, do you know if there is a way to run scripts/kernel-doc on patches instead of whole files? That would make much easier to block new kernel-doc issues from appearing.
Quoted 13 lines
Quoted 10 lines
Most people don't use W=1 because it's too noisy, so it's a bit of a catch-22.
In i915, we enable a lot of W=1 warnings using subdir-ccflags-y in our
Makefile. For CI/developer use we also enable kernel-doc warnings by default.Should we start enabling some of those warning flags in drm/Makefile to to keep the entire subsystem warning free?
That would we awesome! We'd just need buy-in.
Signature · 1 line
Hamza
Quoted 19 lines · Hamza Mahfooz
Quoted 17 lines · Lee Jones
Quoted 6 lines · Jani Nikula
Quoted 3 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
The next question is, how do we keep it W=1 clean going forward?
My plan was to fix them all, then move each warning to W=0.
Arnd recently submitted a set doing just that for a bunch of them.
https://lore.kernel.org/all/[email protected]/
I like to think a bunch of this is built on top of my previous efforts.
Quoted 7 lines
Quoted 3 lines
GPU is a particularly tricky though - the warnings seem to come in faster than I can squash them. Maybe the maintainers can find a way to test new patches on merge?
I guess on that note, do you know if there is a way to run
scripts/kernel-docon patches instead of whole files? That would make much easier to block new kernel-doc issues from appearing.
Not off hand.
When I run builds on patches I author, I run them twice concurrently. Once on the commit I'm basing on and once on the HEAD of my patchset. I then diff the two. So as long as the number of errors and warnings stay the same or reduce, we're golden.
Perhaps the same method could be used with kernel-doc?
Signature · 1 line
Lee Jones [李琼斯]
Quoted 12 lines · Lee Jones
Quoted 6 lines · Jani Nikula
Quoted 3 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
The next question is, how do we keep it W=1 clean going forward?
My plan was to fix them all, then move each warning to W=0.
Arnd recently submitted a set doing just that for a bunch of them.
Quoted 7 lines
https://lore.kernel.org/all/[email protected]/
I like to think a bunch of this is built on top of my previous efforts.
GPU is a particularly tricky though - the warnings seem to come in faster than I can squash them. Maybe the maintainers can find a way to test new patches on merge?
One approach for this which has proved effective in Mesa and other projects is to make warnings fatal in CI which must pass for any changes to be merged. There is ongoing work toward introducing this for the DRM subsystem, using gitlab.freedesktop.org CI.
Signature · 2 lines
Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and Xwayland developer