This is a resend. All of these patches have been sent before. The vmwgfx ones were even applied, but were dropped for some reason. Lee Jones (53): drm/nouveau/nvkm/subdev/bios/init: Demote obvious abuse of kernel-doc drm/nouveau/dispnv50/disp: Remove unused variable 'ret' drm/msm/dp/dp_display: Remove unused variable 'hpd' drm/amd/display/dc/bios/command_table: Remove unused variable include: drm: drm_atomic: Make use of 'new_plane_state' drm/nouveau/nvkm/subdev/volt/gk20a: Demote non-conformant kernel-doc headers drm/amd/display/dc/bios/command_table: Remove unused variable and associated comment drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from the stack drm/amd/display/dc/dce/dce_aux: Remove duplicate line causing 'field overwritten' issue drm/amd/display/dc/dce80/dce80_resource: Make local functions static drm/nouveau/nvkm/engine/gr/gf100: Demote non-conformant kernel-doc header drm/nouveau/nouveau_bo: Remove unused variables 'dev' drm/nouveau/nouveau_display: Remove set but unused variable 'width' drm/nouveau/dispnv04/crtc: Demote non-conforming kernel-doc headers drm/nouveau/dispnv50/disp: Remove unused variable 'ret' from function returning void drm/nouveau/dispnv50/headc57d: Make local function 'headc57d_olut' static drm/nouveau/nv50_display: Remove superfluous prototype for local static functions drm/nouveau/dispnv50/disp: Include header containing our prototypes drm/nouveau/nouveau_ioc32: File headers are not good candidates for kernel-doc drm/nouveau/nouveau_svm: Remove unused variable 'ret' from void function drm/nouveau/nouveau_ioc32: Demote kernel-doc abuse to standard comment block drm/vmwgfx/vmwgfx_execbuf: Fix some kernel-doc related issues drm/vmwgfx/vmwgfx_kms: Remove unused variable 'ret' from 'vmw_du_primary_plane_atomic_check()' drm/vmwgfx/vmwgfx_kms: Mark vmw_{cursor,primary}_plane_formats as __maybe_unused drm/vmwgfx/vmwgfx_drv: Fix some kernel-doc misdemeanours drm/vmwgfx/vmwgfx_ioctl: Provide missing '@' sign required by kernel-doc drm/vmwgfx/vmwgfx_resource: Fix worthy function headers demote some others drm/vmwgfx/vmwgfx_ttm_buffer: Supply some missing parameter descriptions drm/vmwgfx/vmwgfx_fifo: Demote non-conformant kernel-doc header drm/vmwgfx/vmwgfx_ldu: Supply descriptions for 'state' function parameter drm/vmwgfx/vmwgfx_kms: Update worthy function headers and demote others drm/vmwgfx/vmwgfx_overlay: Demote kernel-doc abuses to standard comment blocks drm/vmwgfx/vmwgfx_fence: Add, remove and demote various documentation params/headers drm/vmwgfx/vmwgfx_bo: Remove superfluous param description and supply another drm/vmwgfx/vmwgfx_context: Demote kernel-doc abuses drm/vmwgfx/vmwgfx_scrn: Demote unworthy kernel-doc headers and update others drm/vmwgfx/vmwgfx_surface: Fix some kernel-doc related issues drm/vmwgfx/vmwgfx_cmdbuf_res: Rename param description and remove another drm/vmwgfx/vmwgfx_shader: Demote kernel-doc abuses and fix-up worthy headers drm/vmwgfx/vmwgfx_cmdbuf: Fix a bunch of missing or incorrectly formatted/named params drm/vmwgfx/vmwgfx_cmdbuf_res: Remove unused variable 'ret' drm/vmwgfx/vmwgfx_stdu: Add some missing param/member descriptions drm/vmwgfx/vmwgfx_cmdbuf: Fix misnaming of 'headers' should be plural drm/vmwgfx/vmwgfx_cotable: Fix a couple of simple documentation problems drm/vmwgfx/vmwgfx_so: Add description for 'vmw_view's 'rcu' member drm/vmwgfx/vmwgfx_binding: Provide some missing param descriptions and remove others drm/vmwgfx/vmwgfx_msg: Fix misspelling of 'msg' drm/vmwgfx/vmwgfx_blit: Add description for 'vmw_bo_cpu_blit's 'diff' param drm/vmwgfx/vmwgfx_validation: Add some missing struct member/function param descriptions drm/vmwgfx/ttm_object: Demote half-assed headers and fix-up another drm/vmwgfx/vmwgfx_thp: Add description for 'vmw_thp_manager's member 'manager' drm/vmwgfx/ttm_object: Reorder header to immediately precede its struct .../drm/amd/display/dc/bios/command_table.c | 16 +- .../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1151 +++++++++-------- drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 1 - .../drm/amd/display/dc/dce80/dce80_resource.c | 16 +- drivers/gpu/drm/msm/dp/dp_display.c | 3 - drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 10 +- drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 - drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- drivers/gpu/drm/nouveau/nouveau_ioc32.c | 4 +- drivers/gpu/drm/nouveau/nouveau_svm.c | 5 +- drivers/gpu/drm/nouveau/nv50_display.h | 3 - .../gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 2 +- .../gpu/drm/nouveau/nvkm/subdev/bios/init.c | 204 +-- .../gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 4 +- drivers/gpu/drm/vmwgfx/ttm_object.c | 25 +- drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 14 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 20 +- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 18 +- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 16 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 16 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 10 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 10 +- drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 17 +- drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 5 +- include/drm/drm_atomic.h | 3 +- 44 files changed, 818 insertions(+), 847 deletions(-) Cc: Alex Deucher <alexander.deucher at amd.com> Cc: amd-gfx at lists.freedesktop.org Cc: Anthony Koo <Anthony.Koo at amd.com> Cc: Ben Skeggs <bskeggs at redhat.com> Cc: "Christian K?nig" <christian.koenig at amd.com> Cc: Colin Ian King <colin.king at canonical.com> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: Dave Airlie <airlied at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: dri-devel at lists.freedesktop.org Cc: freedreno at lists.freedesktop.org Cc: Harry Wentland <harry.wentland at amd.com> Cc: Jeremy Kolb <jkolb at brandeis.edu> Cc: Kuogee Hsieh <khsieh at codeaurora.org> Cc: Lee Jones <lee.jones at linaro.org> Cc: Leo Li <sunpeng.li at amd.com> Cc: linaro-mm-sig at lists.linaro.org Cc: linux-arm-msm at vger.kernel.org Cc: linux-media at vger.kernel.org Cc: Lyude Paul <lyude at redhat.com> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com> Cc: Maxime Ripard <mripard at kernel.org> Cc: nouveau at lists.freedesktop.org Cc: Qinglang Miao <miaoqinglang at huawei.com> Cc: Rob Clark <rob.clark at linaro.org> Cc: Rob Clark <robdclark at gmail.com> Cc: Roland Scheidegger <sroland at vmware.com> Cc: Sean Paul <sean at poorly.run> Cc: Sumit Semwal <sumit.semwal at linaro.org> Cc: Thomas Zimmermann <tzimmermann at suse.de> Cc: VMware Graphics <linux-graphics-maintainer at vmware.com> Cc: Zack Rusin <zackr at vmware.com> -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 01/53] drm/nouveau/nvkm/subdev/bios/init: Demote obvious abuse of kernel-doc
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: Function parameter or member 'init' not described in 'init_done' drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c:622: warning: Function parameter or member 'init' not described in 'init_io_restrict_prog' drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c:659: warning: Function parameter or member 'init' not described in 'init_repeat' drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c:685: warning: Function parameter or member 'init' not described in 'init_io_restrict_pll' drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c:725: warning: Function parameter or member 'init' not described in 'init_end_repeat' NB: Trimmed for brevity (lots of these!) Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- .../gpu/drm/nouveau/nvkm/subdev/bios/init.c | 204 ++++++------------ 1 file changed, 68 insertions(+), 136 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c index 9de74f41dcd2a..5a91dc4e5c8ec 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c @@ -575,9 +575,8 @@ init_tmds_reg(struct nvbios_init *init, u8 tmds) * init opcode handlers *****************************************************************************/ -/** +/* * init_reserved - stub for various unknown/unused single-byte opcodes - * */ static void init_reserved(struct nvbios_init *init) @@ -602,9 +601,8 @@ init_reserved(struct nvbios_init *init) init->offset += length; } -/** +/* * INIT_DONE - opcode 0x71 - * */ static void init_done(struct nvbios_init *init) @@ -613,9 +611,8 @@ init_done(struct nvbios_init *init) init->offset = 0x0000; } -/** +/* * INIT_IO_RESTRICT_PROG - opcode 0x32 - * */ static void init_io_restrict_prog(struct nvbios_init *init) @@ -650,9 +647,8 @@ init_io_restrict_prog(struct nvbios_init *init) trace("}]\n"); } -/** +/* * INIT_REPEAT - opcode 0x33 - * */ static void init_repeat(struct nvbios_init *init) @@ -676,9 +672,8 @@ init_repeat(struct nvbios_init *init) init->repeat = repeat; } -/** +/* * INIT_IO_RESTRICT_PLL - opcode 0x34 - * */ static void init_io_restrict_pll(struct nvbios_init *init) @@ -716,9 +711,8 @@ init_io_restrict_pll(struct nvbios_init *init) trace("}]\n"); } -/** +/* * INIT_END_REPEAT - opcode 0x36 - * */ static void init_end_repeat(struct nvbios_init *init) @@ -732,9 +726,8 @@ init_end_repeat(struct nvbios_init *init) } } -/** +/* * INIT_COPY - opcode 0x37 - * */ static void init_copy(struct nvbios_init *init) @@ -759,9 +752,8 @@ init_copy(struct nvbios_init *init) init_wrvgai(init, port, index, data); } -/** +/* * INIT_NOT - opcode 0x38 - * */ static void init_not(struct nvbios_init *init) @@ -771,9 +763,8 @@ init_not(struct nvbios_init *init) init_exec_inv(init); } -/** +/* * INIT_IO_FLAG_CONDITION - opcode 0x39 - * */ static void init_io_flag_condition(struct nvbios_init *init) @@ -788,9 +779,8 @@ init_io_flag_condition(struct nvbios_init *init) init_exec_set(init, false); } -/** +/* * INIT_GENERIC_CONDITION - opcode 0x3a - * */ static void init_generic_condition(struct nvbios_init *init) @@ -840,9 +830,8 @@ init_generic_condition(struct nvbios_init *init) } } -/** +/* * INIT_IO_MASK_OR - opcode 0x3b - * */ static void init_io_mask_or(struct nvbios_init *init) @@ -859,9 +848,8 @@ init_io_mask_or(struct nvbios_init *init) init_wrvgai(init, 0x03d4, index, data &= ~(1 << or)); } -/** +/* * INIT_IO_OR - opcode 0x3c - * */ static void init_io_or(struct nvbios_init *init) @@ -878,9 +866,8 @@ init_io_or(struct nvbios_init *init) init_wrvgai(init, 0x03d4, index, data | (1 << or)); } -/** +/* * INIT_ANDN_REG - opcode 0x47 - * */ static void init_andn_reg(struct nvbios_init *init) @@ -895,9 +882,8 @@ init_andn_reg(struct nvbios_init *init) init_mask(init, reg, mask, 0); } -/** +/* * INIT_OR_REG - opcode 0x48 - * */ static void init_or_reg(struct nvbios_init *init) @@ -912,9 +898,8 @@ init_or_reg(struct nvbios_init *init) init_mask(init, reg, 0, mask); } -/** +/* * INIT_INDEX_ADDRESS_LATCHED - opcode 0x49 - * */ static void init_idx_addr_latched(struct nvbios_init *init) @@ -942,9 +927,8 @@ init_idx_addr_latched(struct nvbios_init *init) } } -/** +/* * INIT_IO_RESTRICT_PLL2 - opcode 0x4a - * */ static void init_io_restrict_pll2(struct nvbios_init *init) @@ -977,9 +961,8 @@ init_io_restrict_pll2(struct nvbios_init *init) trace("}]\n"); } -/** +/* * INIT_PLL2 - opcode 0x4b - * */ static void init_pll2(struct nvbios_init *init) @@ -994,9 +977,8 @@ init_pll2(struct nvbios_init *init) init_prog_pll(init, reg, freq); } -/** +/* * INIT_I2C_BYTE - opcode 0x4c - * */ static void init_i2c_byte(struct nvbios_init *init) @@ -1025,9 +1007,8 @@ init_i2c_byte(struct nvbios_init *init) } } -/** +/* * INIT_ZM_I2C_BYTE - opcode 0x4d - * */ static void init_zm_i2c_byte(struct nvbios_init *init) @@ -1051,9 +1032,8 @@ init_zm_i2c_byte(struct nvbios_init *init) } } -/** +/* * INIT_ZM_I2C - opcode 0x4e - * */ static void init_zm_i2c(struct nvbios_init *init) @@ -1085,9 +1065,8 @@ init_zm_i2c(struct nvbios_init *init) } } -/** +/* * INIT_TMDS - opcode 0x4f - * */ static void init_tmds(struct nvbios_init *init) @@ -1111,9 +1090,8 @@ init_tmds(struct nvbios_init *init) init_wr32(init, reg + 0, addr); } -/** +/* * INIT_ZM_TMDS_GROUP - opcode 0x50 - * */ static void init_zm_tmds_group(struct nvbios_init *init) @@ -1138,9 +1116,8 @@ init_zm_tmds_group(struct nvbios_init *init) } } -/** +/* * INIT_CR_INDEX_ADDRESS_LATCHED - opcode 0x51 - * */ static void init_cr_idx_adr_latch(struct nvbios_init *init) @@ -1168,9 +1145,8 @@ init_cr_idx_adr_latch(struct nvbios_init *init) init_wrvgai(init, 0x03d4, addr0, save0); } -/** +/* * INIT_CR - opcode 0x52 - * */ static void init_cr(struct nvbios_init *init) @@ -1188,9 +1164,8 @@ init_cr(struct nvbios_init *init) init_wrvgai(init, 0x03d4, addr, val | data); } -/** +/* * INIT_ZM_CR - opcode 0x53 - * */ static void init_zm_cr(struct nvbios_init *init) @@ -1205,9 +1180,8 @@ init_zm_cr(struct nvbios_init *init) init_wrvgai(init, 0x03d4, addr, data); } -/** +/* * INIT_ZM_CR_GROUP - opcode 0x54 - * */ static void init_zm_cr_group(struct nvbios_init *init) @@ -1229,9 +1203,8 @@ init_zm_cr_group(struct nvbios_init *init) } } -/** +/* * INIT_CONDITION_TIME - opcode 0x56 - * */ static void init_condition_time(struct nvbios_init *init) @@ -1256,9 +1229,8 @@ init_condition_time(struct nvbios_init *init) init_exec_set(init, false); } -/** +/* * INIT_LTIME - opcode 0x57 - * */ static void init_ltime(struct nvbios_init *init) @@ -1273,9 +1245,8 @@ init_ltime(struct nvbios_init *init) mdelay(msec); } -/** +/* * INIT_ZM_REG_SEQUENCE - opcode 0x58 - * */ static void init_zm_reg_sequence(struct nvbios_init *init) @@ -1298,9 +1269,8 @@ init_zm_reg_sequence(struct nvbios_init *init) } } -/** +/* * INIT_PLL_INDIRECT - opcode 0x59 - * */ static void init_pll_indirect(struct nvbios_init *init) @@ -1317,9 +1287,8 @@ init_pll_indirect(struct nvbios_init *init) init_prog_pll(init, reg, freq); } -/** +/* * INIT_ZM_REG_INDIRECT - opcode 0x5a - * */ static void init_zm_reg_indirect(struct nvbios_init *init) @@ -1336,9 +1305,8 @@ init_zm_reg_indirect(struct nvbios_init *init) init_wr32(init, addr, data); } -/** +/* * INIT_SUB_DIRECT - opcode 0x5b - * */ static void init_sub_direct(struct nvbios_init *init) @@ -1362,9 +1330,8 @@ init_sub_direct(struct nvbios_init *init) init->offset += 3; } -/** +/* * INIT_JUMP - opcode 0x5c - * */ static void init_jump(struct nvbios_init *init) @@ -1380,9 +1347,8 @@ init_jump(struct nvbios_init *init) init->offset += 3; } -/** +/* * INIT_I2C_IF - opcode 0x5e - * */ static void init_i2c_if(struct nvbios_init *init) @@ -1407,9 +1373,8 @@ init_i2c_if(struct nvbios_init *init) init_exec_force(init, false); } -/** +/* * INIT_COPY_NV_REG - opcode 0x5f - * */ static void init_copy_nv_reg(struct nvbios_init *init) @@ -1433,9 +1398,8 @@ init_copy_nv_reg(struct nvbios_init *init) init_mask(init, dreg, ~dmask, (data & smask) ^ sxor); } -/** +/* * INIT_ZM_INDEX_IO - opcode 0x62 - * */ static void init_zm_index_io(struct nvbios_init *init) @@ -1451,9 +1415,8 @@ init_zm_index_io(struct nvbios_init *init) init_wrvgai(init, port, index, data); } -/** +/* * INIT_COMPUTE_MEM - opcode 0x63 - * */ static void init_compute_mem(struct nvbios_init *init) @@ -1469,9 +1432,8 @@ init_compute_mem(struct nvbios_init *init) init_exec_force(init, false); } -/** +/* * INIT_RESET - opcode 0x65 - * */ static void init_reset(struct nvbios_init *init) @@ -1496,9 +1458,8 @@ init_reset(struct nvbios_init *init) init_exec_force(init, false); } -/** +/* * INIT_CONFIGURE_MEM - opcode 0x66 - * */ static u16 init_configure_mem_clk(struct nvbios_init *init) @@ -1555,9 +1516,8 @@ init_configure_mem(struct nvbios_init *init) init_exec_force(init, false); } -/** +/* * INIT_CONFIGURE_CLK - opcode 0x67 - * */ static void init_configure_clk(struct nvbios_init *init) @@ -1589,9 +1549,8 @@ init_configure_clk(struct nvbios_init *init) init_exec_force(init, false); } -/** +/* * INIT_CONFIGURE_PREINIT - opcode 0x68 - * */ static void init_configure_preinit(struct nvbios_init *init) @@ -1615,9 +1574,8 @@ init_configure_preinit(struct nvbios_init *init) init_exec_force(init, false); } -/** +/* * INIT_IO - opcode 0x69 - * */ static void init_io(struct nvbios_init *init) @@ -1655,9 +1613,8 @@ init_io(struct nvbios_init *init) init_wrport(init, port, data | value); } -/** +/* * INIT_SUB - opcode 0x6b - * */ static void init_sub(struct nvbios_init *init) @@ -1682,9 +1639,8 @@ init_sub(struct nvbios_init *init) init->offset += 2; } -/** +/* * INIT_RAM_CONDITION - opcode 0x6d - * */ static void init_ram_condition(struct nvbios_init *init) @@ -1701,9 +1657,8 @@ init_ram_condition(struct nvbios_init *init) init_exec_set(init, false); } -/** +/* * INIT_NV_REG - opcode 0x6e - * */ static void init_nv_reg(struct nvbios_init *init) @@ -1719,9 +1674,8 @@ init_nv_reg(struct nvbios_init *init) init_mask(init, reg, ~mask, data); } -/** +/* * INIT_MACRO - opcode 0x6f - * */ static void init_macro(struct nvbios_init *init) @@ -1743,9 +1697,8 @@ init_macro(struct nvbios_init *init) init->offset += 2; } -/** +/* * INIT_RESUME - opcode 0x72 - * */ static void init_resume(struct nvbios_init *init) @@ -1755,9 +1708,8 @@ init_resume(struct nvbios_init *init) init_exec_set(init, true); } -/** +/* * INIT_STRAP_CONDITION - opcode 0x73 - * */ static void init_strap_condition(struct nvbios_init *init) @@ -1773,9 +1725,8 @@ init_strap_condition(struct nvbios_init *init) init_exec_set(init, false); } -/** +/* * INIT_TIME - opcode 0x74 - * */ static void init_time(struct nvbios_init *init) @@ -1794,9 +1745,8 @@ init_time(struct nvbios_init *init) } } -/** +/* * INIT_CONDITION - opcode 0x75 - * */ static void init_condition(struct nvbios_init *init) @@ -1811,9 +1761,8 @@ init_condition(struct nvbios_init *init) init_exec_set(init, false); } -/** +/* * INIT_IO_CONDITION - opcode 0x76 - * */ static void init_io_condition(struct nvbios_init *init) @@ -1828,9 +1777,8 @@ init_io_condition(struct nvbios_init *init) init_exec_set(init, false); } -/** +/* * INIT_ZM_REG16 - opcode 0x77 - * */ static void init_zm_reg16(struct nvbios_init *init) @@ -1845,9 +1793,8 @@ init_zm_reg16(struct nvbios_init *init) init_wr32(init, addr, data); } -/** +/* * INIT_INDEX_IO - opcode 0x78 - * */ static void init_index_io(struct nvbios_init *init) @@ -1867,9 +1814,8 @@ init_index_io(struct nvbios_init *init) init_wrvgai(init, port, index, data | value); } -/** +/* * INIT_PLL - opcode 0x79 - * */ static void init_pll(struct nvbios_init *init) @@ -1884,9 +1830,8 @@ init_pll(struct nvbios_init *init) init_prog_pll(init, reg, freq); } -/** +/* * INIT_ZM_REG - opcode 0x7a - * */ static void init_zm_reg(struct nvbios_init *init) @@ -1904,9 +1849,8 @@ init_zm_reg(struct nvbios_init *init) init_wr32(init, addr, data); } -/** +/* * INIT_RAM_RESTRICT_PLL - opcde 0x87 - * */ static void init_ram_restrict_pll(struct nvbios_init *init) @@ -1934,9 +1878,8 @@ init_ram_restrict_pll(struct nvbios_init *init) } } -/** +/* * INIT_RESET_BEGUN - opcode 0x8c - * */ static void init_reset_begun(struct nvbios_init *init) @@ -1945,9 +1888,8 @@ init_reset_begun(struct nvbios_init *init) init->offset += 1; } -/** +/* * INIT_RESET_END - opcode 0x8d - * */ static void init_reset_end(struct nvbios_init *init) @@ -1956,9 +1898,8 @@ init_reset_end(struct nvbios_init *init) init->offset += 1; } -/** +/* * INIT_GPIO - opcode 0x8e - * */ static void init_gpio(struct nvbios_init *init) @@ -1972,9 +1913,8 @@ init_gpio(struct nvbios_init *init) nvkm_gpio_reset(gpio, DCB_GPIO_UNUSED); } -/** +/* * INIT_RAM_RESTRICT_ZM_GROUP - opcode 0x8f - * */ static void init_ram_restrict_zm_reg_group(struct nvbios_init *init) @@ -2010,9 +1950,8 @@ init_ram_restrict_zm_reg_group(struct nvbios_init *init) } } -/** +/* * INIT_COPY_ZM_REG - opcode 0x90 - * */ static void init_copy_zm_reg(struct nvbios_init *init) @@ -2027,9 +1966,8 @@ init_copy_zm_reg(struct nvbios_init *init) init_wr32(init, dreg, init_rd32(init, sreg)); } -/** +/* * INIT_ZM_REG_GROUP - opcode 0x91 - * */ static void init_zm_reg_group(struct nvbios_init *init) @@ -2049,9 +1987,8 @@ init_zm_reg_group(struct nvbios_init *init) } } -/** +/* * INIT_XLAT - opcode 0x96 - * */ static void init_xlat(struct nvbios_init *init) @@ -2077,9 +2014,8 @@ init_xlat(struct nvbios_init *init) init_mask(init, daddr, ~dmask, data); } -/** +/* * INIT_ZM_MASK_ADD - opcode 0x97 - * */ static void init_zm_mask_add(struct nvbios_init *init) @@ -2098,9 +2034,8 @@ init_zm_mask_add(struct nvbios_init *init) init_wr32(init, addr, data); } -/** +/* * INIT_AUXCH - opcode 0x98 - * */ static void init_auxch(struct nvbios_init *init) @@ -2122,9 +2057,8 @@ init_auxch(struct nvbios_init *init) } } -/** +/* * INIT_AUXCH - opcode 0x99 - * */ static void init_zm_auxch(struct nvbios_init *init) @@ -2144,9 +2078,8 @@ init_zm_auxch(struct nvbios_init *init) } } -/** +/* * INIT_I2C_LONG_IF - opcode 0x9a - * */ static void init_i2c_long_if(struct nvbios_init *init) @@ -2183,9 +2116,8 @@ init_i2c_long_if(struct nvbios_init *init) init_exec_set(init, false); } -/** +/* * INIT_GPIO_NE - opcode 0xa9 - * */ static void init_gpio_ne(struct nvbios_init *init) -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 02/53] drm/nouveau/dispnv50/disp: Remove unused variable 'ret'
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/dispnv50/disp.c:1381:6: warning: variable ?ret? set but not used [-Wunused-but-set-variable] Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 196612addfd61..c51efca82ac78 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -1410,10 +1410,9 @@ nv50_mstm_prepare(struct nv50_mstm *mstm) { struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); struct drm_encoder *encoder; - int ret; NV_ATOMIC(drm, "%s: mstm prepare\n", mstm->outp->base.base.name); - ret = drm_dp_update_payload_part1(&mstm->mgr); + drm_dp_update_payload_part1(&mstm->mgr); drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) { -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 06/53] drm/nouveau/nvkm/subdev/volt/gk20a: Demote non-conformant kernel-doc headers
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:53: warning: Function parameter or member 'speedo' not described in 'gk20a_volt_get_cvb_voltage' drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:53: warning: Function parameter or member 's_scale' not described in 'gk20a_volt_get_cvb_voltage' drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:53: warning: Function parameter or member 'coef' not described in 'gk20a_volt_get_cvb_voltage' drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:69: warning: Function parameter or member 'speedo' not described in 'gk20a_volt_get_cvb_t_voltage' drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:69: warning: Function parameter or member 'temp' not described in 'gk20a_volt_get_cvb_t_voltage' drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:69: warning: Function parameter or member 's_scale' not described in 'gk20a_volt_get_cvb_t_voltage' drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:69: warning: Function parameter or member 't_scale' not described in 'gk20a_volt_get_cvb_t_voltage' drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c:69: warning: Function parameter or member 'coef' not described in 'gk20a_volt_get_cvb_t_voltage' Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c index 8c2faa9645111..ccac88da88648 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c @@ -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) -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 12/53] drm/nouveau/nvkm/engine/gr/gf100: Demote non-conformant kernel-doc header
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c:992: warning: Function parameter or member 'gr' not described in 'gf100_gr_wait_idle' Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c index 397ff4fe9df89..69e6008f99196 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c @@ -982,7 +982,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. -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 13/53] drm/nouveau/nouveau_bo: Remove unused variables 'dev'
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/nouveau_bo.c: In function ?nouveau_ttm_tt_populate?: drivers/gpu/drm/nouveau/nouveau_bo.c:1228:17: warning: variable ?dev? set but not used [-Wunused-but-set-variable] drivers/gpu/drm/nouveau/nouveau_bo.c: In function ?nouveau_ttm_tt_unpopulate?: drivers/gpu/drm/nouveau/nouveau_bo.c:1252:17: warning: variable ?dev? set but not used [-Wunused-but-set-variable] Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: Sumit Semwal <sumit.semwal at linaro.org> Cc: "Christian K?nig" <christian.koenig at amd.com> Cc: Jeremy Kolb <jkolb at brandeis.edu> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Cc: linux-media at vger.kernel.org Cc: linaro-mm-sig at lists.linaro.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 2375711877cf3..0b94f8ae77291 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1251,7 +1251,6 @@ nouveau_ttm_tt_populate(struct ttm_bo_device *bdev, { struct ttm_tt *ttm_dma = (void *)ttm; struct nouveau_drm *drm; - struct device *dev; bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); if (ttm_tt_is_populated(ttm)) @@ -1264,7 +1263,6 @@ nouveau_ttm_tt_populate(struct ttm_bo_device *bdev, } drm = nouveau_bdev(bdev); - dev = drm->dev->dev; return ttm_pool_alloc(&drm->ttm.bdev.pool, ttm, ctx); } @@ -1274,14 +1272,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_bo_device *bdev, struct ttm_tt *ttm) { struct nouveau_drm *drm; - struct device *dev; bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); if (slave) return; drm = nouveau_bdev(bdev); - dev = drm->dev->dev; return ttm_pool_free(&drm->ttm.bdev.pool, ttm); } -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 14/53] drm/nouveau/nouveau_display: Remove set but unused variable 'width'
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/nouveau_display.c: In function ?nouveau_framebuffer_new?: drivers/gpu/drm/nouveau/nouveau_display.c:309:15: warning: variable ?width? set but not used [-Wunused-but-set-variable] Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/nouveau_display.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 17831ee897ea4..0849f367631a9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -306,7 +306,7 @@ nouveau_framebuffer_new(struct drm_device *dev, struct nouveau_bo *nvbo = nouveau_gem_object(gem); struct drm_framebuffer *fb; const struct drm_format_info *info; - unsigned int width, height, i; + unsigned int height, i; uint32_t tile_mode; uint8_t kind; int ret; @@ -346,9 +346,9 @@ nouveau_framebuffer_new(struct drm_device *dev, info = drm_get_format_info(dev, mode_cmd); for (i = 0; i < info->num_planes; i++) { - width = drm_format_info_plane_width(info, - mode_cmd->width, - i); + drm_format_info_plane_width(info, + mode_cmd->width, + i); height = drm_format_info_plane_height(info, mode_cmd->height, i); -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 15/53] drm/nouveau/dispnv04/crtc: Demote non-conforming kernel-doc headers
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/dispnv04/crtc.c:462: warning: Function parameter or member 'crtc' not described in 'nv_crtc_mode_set_regs' drivers/gpu/drm/nouveau/dispnv04/crtc.c:462: warning: Function parameter or member 'mode' not described in 'nv_crtc_mode_set_regs' drivers/gpu/drm/nouveau/dispnv04/crtc.c:640: warning: Function parameter or member 'crtc' not described in 'nv_crtc_mode_set' drivers/gpu/drm/nouveau/dispnv04/crtc.c:640: warning: Function parameter or member 'mode' not described in 'nv_crtc_mode_set' drivers/gpu/drm/nouveau/dispnv04/crtc.c:640: warning: Function parameter or member 'adjusted_mode' not described in 'nv_crtc_mode_set' drivers/gpu/drm/nouveau/dispnv04/crtc.c:640: warning: Function parameter or member 'x' not described in 'nv_crtc_mode_set' drivers/gpu/drm/nouveau/dispnv04/crtc.c:640: warning: Function parameter or member 'y' not described in 'nv_crtc_mode_set' drivers/gpu/drm/nouveau/dispnv04/crtc.c:640: warning: Function parameter or member 'old_fb' not described in 'nv_crtc_mode_set' Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c index f9e962fd94d0d..f9a276ea5a9e0 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c +++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c @@ -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. -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 16/53] drm/nouveau/dispnv50/disp: Remove unused variable 'ret' from function returning void
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/dispnv50/disp.c: In function ?nv50_mstm_cleanup?: drivers/gpu/drm/nouveau/dispnv50/disp.c:1357:6: warning: variable ?ret? set but not used [-Wunused-but-set-variable] Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index c51efca82ac78..828f48d5bdd4e 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -1386,12 +1386,11 @@ nv50_mstm_cleanup(struct nv50_mstm *mstm) { struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); struct drm_encoder *encoder; - int ret; NV_ATOMIC(drm, "%s: mstm cleanup\n", mstm->outp->base.base.name); - ret = drm_dp_check_act_status(&mstm->mgr); + drm_dp_check_act_status(&mstm->mgr); - ret = drm_dp_update_payload_part2(&mstm->mgr); + drm_dp_update_payload_part2(&mstm->mgr); drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) { -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 17/53] drm/nouveau/dispnv50/headc57d: Make local function 'headc57d_olut' static
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/dispnv50/headc57d.c:173:1: warning: no previous prototype for ?headc57d_olut? [-Wmissing-prototypes] Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: Lyude Paul <lyude at redhat.com> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c index fd51527b56b83..bdcfd240d61c8 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c +++ b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c @@ -169,7 +169,7 @@ headc57d_olut_load(struct drm_color_lut *in, int size, void __iomem *mem) writew(readw(mem - 4), mem + 4); } -bool +static bool headc57d_olut(struct nv50_head *head, struct nv50_head_atom *asyh, int size) { if (size != 0 && size != 256 && size != 1024) -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 18/53] drm/nouveau/nv50_display: Remove superfluous prototype for local static functions
Fixes the following build error: drivers/gpu/drm/nouveau/dispnv50/disp.c:2530:1: error: conflicting types for ?nv50_display_fini? In file included from drivers/gpu/drm/nouveau/dispnv50/disp.c:71: drivers/gpu/drm/nouveau/nv50_display.h:36:6: note: previous declaration of ?nv50_display_fini? was her In file included from drivers/gpu/drm/nouveau/dispnv50/disp.c:71: drivers/gpu/drm/nouveau/nv50_display.h:35:6: note: previous declaration of ?nv50_display_init? was here drivers/gpu/drm/nouveau/dispnv50/disp.c:2581:1: error: static declaration of ?nv50_display_destroy? follows non-static declaration In file included from drivers/gpu/drm/nouveau/dispnv50/disp.c:71: drivers/gpu/drm/nouveau/nv50_display.h:34:6: note: previous declaration of ?nv50_display_destroy? was here Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/nv50_display.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv50_display.h b/drivers/gpu/drm/nouveau/nv50_display.h index fbd3b15583bc8..2421401d12636 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.h +++ b/drivers/gpu/drm/nouveau/nv50_display.h @@ -31,7 +31,4 @@ #include "nouveau_reg.h" int nv50_display_create(struct drm_device *); -void nv50_display_destroy(struct drm_device *); -int nv50_display_init(struct drm_device *); -void nv50_display_fini(struct drm_device *); #endif /* __NV50_DISPLAY_H__ */ -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 19/53] drm/nouveau/dispnv50/disp: Include header containing our prototypes
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/dispnv50/disp.c:2599:1: warning: no previous prototype for ?nv50_display_create? [-Wmissing-prototypes] Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 828f48d5bdd4e..cd16431422198 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -68,6 +68,8 @@ #include <subdev/bios/dp.h> +#include "nv50_display.h" + /****************************************************************************** * EVO channel *****************************************************************************/ -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 20/53] drm/nouveau/nouveau_ioc32: File headers are not good candidates for kernel-doc
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/nouveau_ioc32.c:2: warning: Cannot understand * file mga_ioc32.c Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c index adf01ca9e035d..8ddf9b2325a42 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c @@ -1,4 +1,4 @@ -/** +/* * \file mga_ioc32.c * * 32-bit ioctl compatibility routines for the MGA DRM. -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 21/53] drm/nouveau/nouveau_svm: Remove unused variable 'ret' from void function
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/nouveau_svm.c: In function ?nouveau_pfns_map?: drivers/gpu/drm/nouveau/nouveau_svm.c:810:6: warning: variable ?ret? set but not used [-Wunused-but-set-variable] Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/nouveau_svm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c index 1c3f890377d2c..26af6ee915368 100644 --- a/drivers/gpu/drm/nouveau/nouveau_svm.c +++ b/drivers/gpu/drm/nouveau/nouveau_svm.c @@ -811,7 +811,6 @@ nouveau_pfns_map(struct nouveau_svmm *svmm, struct mm_struct *mm, unsigned long addr, u64 *pfns, unsigned long npages) { struct nouveau_pfnmap_args *args = nouveau_pfns_to_args(pfns); - int ret; args->p.addr = addr; args->p.size = npages << PAGE_SHIFT; @@ -819,8 +818,8 @@ nouveau_pfns_map(struct nouveau_svmm *svmm, struct mm_struct *mm, mutex_lock(&svmm->mutex); svmm->vmm->vmm.object.client->super = true; - ret = nvif_object_ioctl(&svmm->vmm->vmm.object, args, sizeof(*args) + - npages * sizeof(args->p.phys[0]), NULL); + nvif_object_ioctl(&svmm->vmm->vmm.object, args, sizeof(*args) + + npages * sizeof(args->p.phys[0]), NULL); svmm->vmm->vmm.object.client->super = false; mutex_unlock(&svmm->mutex); -- 2.27.0
Lee Jones
2021-Mar-03 13:42 UTC
[Nouveau] [PATCH 22/53] drm/nouveau/nouveau_ioc32: Demote kernel-doc abuse to standard comment block
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/nouveau/nouveau_ioc32.c:52: warning: Function parameter or member 'filp' not described in 'nouveau_compat_ioctl' drivers/gpu/drm/nouveau/nouveau_ioc32.c:52: warning: Function parameter or member 'cmd' not described in 'nouveau_compat_ioctl' drivers/gpu/drm/nouveau/nouveau_ioc32.c:52: warning: Function parameter or member 'arg' not described in 'nouveau_compat_ioctl' Cc: Ben Skeggs <bskeggs at redhat.com> Cc: David Airlie <airlied at linux.ie> Cc: Daniel Vetter <daniel at ffwll.ch> Cc: dri-devel at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones at linaro.org> --- drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c index 8ddf9b2325a42..2af3615c5205c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c @@ -38,7 +38,7 @@ #include "nouveau_ioctl.h" -/** +/* * Called whenever a 32-bit process running under a 64-bit kernel * performs an ioctl on /dev/dri/card<n>. * -- 2.27.0
Roland Scheidegger
2021-Mar-05 15:33 UTC
[Nouveau] [RESEND 00/53] Rid GPU from W=1 warnings
The vmwgfx ones look all good to me, so for 23-53: Reviewed-by: Roland Scheidegger <sroland at vmware.com> That said, they were already signed off by Zack, so not sure what happened here. Roland On 03.03.21 14:42, Lee Jones wrote:> This is a resend. All of these patches have been sent before. > > The vmwgfx ones were even applied, but were dropped for some reason. > > Lee Jones (53): > drm/nouveau/nvkm/subdev/bios/init: Demote obvious abuse of kernel-doc > drm/nouveau/dispnv50/disp: Remove unused variable 'ret' > drm/msm/dp/dp_display: Remove unused variable 'hpd' > drm/amd/display/dc/bios/command_table: Remove unused variable > include: drm: drm_atomic: Make use of 'new_plane_state' > drm/nouveau/nvkm/subdev/volt/gk20a: Demote non-conformant kernel-doc > headers > drm/amd/display/dc/bios/command_table: Remove unused variable and > associated comment > drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the > stack to the heap > drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from > the stack > drm/amd/display/dc/dce/dce_aux: Remove duplicate line causing 'field > overwritten' issue > drm/amd/display/dc/dce80/dce80_resource: Make local functions static > drm/nouveau/nvkm/engine/gr/gf100: Demote non-conformant kernel-doc > header > drm/nouveau/nouveau_bo: Remove unused variables 'dev' > drm/nouveau/nouveau_display: Remove set but unused variable 'width' > drm/nouveau/dispnv04/crtc: Demote non-conforming kernel-doc headers > drm/nouveau/dispnv50/disp: Remove unused variable 'ret' from function > returning void > drm/nouveau/dispnv50/headc57d: Make local function 'headc57d_olut' > static > drm/nouveau/nv50_display: Remove superfluous prototype for local > static functions > drm/nouveau/dispnv50/disp: Include header containing our prototypes > drm/nouveau/nouveau_ioc32: File headers are not good candidates for > kernel-doc > drm/nouveau/nouveau_svm: Remove unused variable 'ret' from void > function > drm/nouveau/nouveau_ioc32: Demote kernel-doc abuse to standard comment > block > drm/vmwgfx/vmwgfx_execbuf: Fix some kernel-doc related issues > drm/vmwgfx/vmwgfx_kms: Remove unused variable 'ret' from > 'vmw_du_primary_plane_atomic_check()' > drm/vmwgfx/vmwgfx_kms: Mark vmw_{cursor,primary}_plane_formats as > __maybe_unused > drm/vmwgfx/vmwgfx_drv: Fix some kernel-doc misdemeanours > drm/vmwgfx/vmwgfx_ioctl: Provide missing '@' sign required by > kernel-doc > drm/vmwgfx/vmwgfx_resource: Fix worthy function headers demote some > others > drm/vmwgfx/vmwgfx_ttm_buffer: Supply some missing parameter > descriptions > drm/vmwgfx/vmwgfx_fifo: Demote non-conformant kernel-doc header > drm/vmwgfx/vmwgfx_ldu: Supply descriptions for 'state' function > parameter > drm/vmwgfx/vmwgfx_kms: Update worthy function headers and demote > others > drm/vmwgfx/vmwgfx_overlay: Demote kernel-doc abuses to standard > comment blocks > drm/vmwgfx/vmwgfx_fence: Add, remove and demote various documentation > params/headers > drm/vmwgfx/vmwgfx_bo: Remove superfluous param description and supply > another > drm/vmwgfx/vmwgfx_context: Demote kernel-doc abuses > drm/vmwgfx/vmwgfx_scrn: Demote unworthy kernel-doc headers and update > others > drm/vmwgfx/vmwgfx_surface: Fix some kernel-doc related issues > drm/vmwgfx/vmwgfx_cmdbuf_res: Rename param description and remove > another > drm/vmwgfx/vmwgfx_shader: Demote kernel-doc abuses and fix-up worthy > headers > drm/vmwgfx/vmwgfx_cmdbuf: Fix a bunch of missing or incorrectly > formatted/named params > drm/vmwgfx/vmwgfx_cmdbuf_res: Remove unused variable 'ret' > drm/vmwgfx/vmwgfx_stdu: Add some missing param/member descriptions > drm/vmwgfx/vmwgfx_cmdbuf: Fix misnaming of 'headers' should be plural > drm/vmwgfx/vmwgfx_cotable: Fix a couple of simple documentation > problems > drm/vmwgfx/vmwgfx_so: Add description for 'vmw_view's 'rcu' member > drm/vmwgfx/vmwgfx_binding: Provide some missing param descriptions and > remove others > drm/vmwgfx/vmwgfx_msg: Fix misspelling of 'msg' > drm/vmwgfx/vmwgfx_blit: Add description for 'vmw_bo_cpu_blit's 'diff' > param > drm/vmwgfx/vmwgfx_validation: Add some missing struct member/function > param descriptions > drm/vmwgfx/ttm_object: Demote half-assed headers and fix-up another > drm/vmwgfx/vmwgfx_thp: Add description for 'vmw_thp_manager's member > 'manager' > drm/vmwgfx/ttm_object: Reorder header to immediately precede its > struct > > .../drm/amd/display/dc/bios/command_table.c | 16 +- > .../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1151 +++++++++-------- > drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 1 - > .../drm/amd/display/dc/dce80/dce80_resource.c | 16 +- > drivers/gpu/drm/msm/dp/dp_display.c | 3 - > drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 +- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 10 +- > drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_bo.c | 4 - > drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- > drivers/gpu/drm/nouveau/nouveau_ioc32.c | 4 +- > drivers/gpu/drm/nouveau/nouveau_svm.c | 5 +- > drivers/gpu/drm/nouveau/nv50_display.h | 3 - > .../gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 2 +- > .../gpu/drm/nouveau/nvkm/subdev/bios/init.c | 204 +-- > .../gpu/drm/nouveau/nvkm/subdev/volt/gk20a.c | 4 +- > drivers/gpu/drm/vmwgfx/ttm_object.c | 25 +- > drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 9 +- > drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 1 + > drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 14 +- > drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 8 +- > drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 6 +- > drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +- > drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 20 +- > drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 18 +- > drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 16 +- > drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- > drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- > drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 16 +- > drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 10 +- > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 10 +- > drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 10 +- > drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 1 + > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +- > drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 17 +- > drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 + > drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 + > drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 5 +- > include/drm/drm_atomic.h | 3 +- > 44 files changed, 818 insertions(+), 847 deletions(-) > > Cc: Alex Deucher <alexander.deucher at amd.com> > Cc: amd-gfx at lists.freedesktop.org > Cc: Anthony Koo <Anthony.Koo at amd.com> > Cc: Ben Skeggs <bskeggs at redhat.com> > Cc: "Christian K?nig" <christian.koenig at amd.com> > Cc: Colin Ian King <colin.king at canonical.com> > Cc: Daniel Vetter <daniel at ffwll.ch> > Cc: Dave Airlie <airlied at redhat.com> > Cc: David Airlie <airlied at linux.ie> > Cc: dri-devel at lists.freedesktop.org > Cc: freedreno at lists.freedesktop.org > Cc: Harry Wentland <harry.wentland at amd.com> > Cc: Jeremy Kolb <jkolb at brandeis.edu> > Cc: Kuogee Hsieh <khsieh at codeaurora.org> > Cc: Lee Jones <lee.jones at linaro.org> > Cc: Leo Li <sunpeng.li at amd.com> > Cc: linaro-mm-sig at lists.linaro.org > Cc: linux-arm-msm at vger.kernel.org > Cc: linux-media at vger.kernel.org > Cc: Lyude Paul <lyude at redhat.com> > Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com> > Cc: Maxime Ripard <mripard at kernel.org> > Cc: nouveau at lists.freedesktop.org > Cc: Qinglang Miao <miaoqinglang at huawei.com> > Cc: Rob Clark <rob.clark at linaro.org> > Cc: Rob Clark <robdclark at gmail.com> > Cc: Roland Scheidegger <sroland at vmware.com> > Cc: Sean Paul <sean at poorly.run> > Cc: Sumit Semwal <sumit.semwal at linaro.org> > Cc: Thomas Zimmermann <tzimmermann at suse.de> > Cc: VMware Graphics <linux-graphics-maintainer at vmware.com> > Cc: Zack Rusin <zackr at vmware.com> >