Rid GPU from W=1 warnings
Subsystems (8)
cover Rid GPU from W=1 warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is a resend of the remaining patches.
All of these patches have been sent before.
Lee Jones (19):
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'
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/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/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
.../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 +++++++++-------- .../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 +- include/drm/drm_atomic.h | 3 +- 15 files changed, 692 insertions(+), 734 deletions(-)
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/19 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!)
--- .../gpu/drm/nouveau/nvkm/subdev/bios/init.c | 204 ++++++------------ 1 file changed, 68 insertions(+), 136 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c +68 -136
@@ -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)
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 01/19] drm/nouveau/nvkm/subdev/bios/init: Demote obvious abuse of kernel-doc
Quoted 777 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: 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 <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Lee Jones <[email protected]>--- .../gpu/drm/nouveau/nvkm/subdev/bios/init.c | 204 ++++++------------ 1 file changed, 68 insertions(+), 136 deletions(-)drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c +68
-137@@ -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
Quoted 5 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
PATCH 2/19 drm/nouveau/dispnv50/disp: Remove unused variable 'ret'
In reply to Lee JonesFixes 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]
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -2
@@ -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 ) {
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/19 drm/msm/dp/dp_display: Remove unused variable 'hpd'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/msm/dp/dp_display.c: In function ‘dp_display_usbpd_attention_cb’:
drivers/gpu/drm/msm/dp/dp_display.c:496:19: warning: variable ‘hpd’ set but not used [-Wunused-but-set-variable]
--- drivers/gpu/drm/msm/dp/dp_display.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +0 -3
@@ -493,7 +493,6 @@ static int dp_display_usbpd_attention_cb(struct device *dev)int rc =0 ;u32 sink_request;struct dp_display_private *dp; -struct dp_usbpd *hpd;if (!dev) {DRM_ERROR ("invalid dev\n" );
@@ -507,8 +506,6 @@ static int dp_display_usbpd_attention_cb(struct device *dev)return -ENODEV ; } - hpd = dp->usbpd; -/* check for any test request issued by sink */ rc =dp_link_process_request (dp->link);if (!rc) {
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/19 include: drm: drm_atomic: Make use of 'new_plane_state'
In reply to Lee JonesIn the macro for_each_oldnew_plane_in_state() 'new_plane_state' is provided as a container for state->planes[i].new_state, but is not utilised in some use-cases, so we fake-use it instead.
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function ‘amdgpu_dm_commit_cursors’:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:7649:44: warning: variable ‘new_plane_state’ set but not used [-Wunused-but-set-variable]
--- include/drm/drm_atomic.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/drm/drm_atomic.h +2 -1
@@ -871,7 +871,8 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p); ((plane) = (__state)->planes[__i].ptr, \ (void )(plane)/* Only to avoid unused-but-set-variable warning */ , \ (old_plane_state) = (__state)->planes[__i].old_state,\ - (new_plane_state) = (__state)->planes[__i].new_state, 1)) + (new_plane_state) = (__state)->planes[__i].new_state, \ + (void)(new_plane_state) /* Only to avoid unused-but-set-variable warning */, 1))/** * for_each_oldnew_plane_in_state_reverse - iterate over all planes in an atomic
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 04/19] include: drm: drm_atomic: Make use of 'new_plane_state'
Quoted 26 lines · Lee Jones
In the macro
for_each_oldnew_plane_in_state()'new_plane_state' is provided as a container for state->planes[i].new_state, but is not utilised in some use-cases, so we fake-use it instead.Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function ‘amdgpu_dm_commit_cursors’:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:7649:44: warning: variable ‘new_plane_state’ 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 Rob Clark <[email protected]>Signed-off-by Lee Jones <[email protected]>--- include/drm/drm_atomic.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)include/drm/drm_atomic.h +0
-0
include/drm/drm_atomic.h void drm_state_dump(struct drm_device *dev, struct drm_printer *p); · line 875
Quoted 6 lines
include/drm/drm_atomic.h +2
-1@@ -871,7 +871,8 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p); ((plane) = (__state)->planes[__i].ptr, \ (void )(plane)/* Only to avoid unused-but-set-variable warning */ , \ (old_plane_state) = (__state)->planes[__i].old_state,\ - (new_plane_state) = (__state)->planes[__i].new_state, 1)) + (new_plane_state) = (__state)->planes[__i].new_state, \ + (void)(new_plane_state) /* Only to avoid unused-but-set-variable warning */, 1))
In this case you can just switch the code to usefor_each_old_plane_in_state() instead.
Quoted 10 lines
include/drm/drm_atomic.h +0
-0/** * for_each_oldnew_plane_in_state_reverse - iterate over all planes in an atomic Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 5/19 drm/nouveau/nvkm/subdev/volt/gk20a: Demote non-conformant kernel-doc headers
In reply to Lee JonesFixes 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'
--- 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 · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 05/19] drm/nouveau/nvkm/subdev/volt/gk20a: Demote non-conformant kernel-doc headers
Quoted 47 lines · Lee Jones
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 <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Lee Jones <[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) -- 2.27.0
Quoted 5 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
PATCH 6/19 drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c: In function ‘calculate_bandwidth’:
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c:2016:1: warning: the frame size of 1216 bytes is larger than 1024 bytes [-Wframe-larger-than=]
--- .../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +28 -4
@@ -98,16 +98,16 @@ static void calculate_bandwidth(int32_t num_cursor_lines;int32_t i, j, k; -struct bw_fixed yclk[3 ]; -struct bw_fixed sclk[8 ]; +struct bw_fixed *yclk; +struct bw_fixed *sclk;bool d0_underlay_enable;bool d1_underlay_enable;bool fbc_enabled;bool lpt_enabled;enum bw_defines sclk_message;enum bw_defines yclk_message; -enum bw_defines tiling_mode[maximum_number_of_surfaces]; -enum bw_defines surface_type[maximum_number_of_surfaces]; +enum bw_defines *tiling_mode; +enum bw_defines *surface_type;enum bw_defines voltage;enum bw_defines pipe_check;enum bw_defines hsr_check;
@@ -122,6 +122,22 @@ static void calculate_bandwidth(int32_t number_of_displays_enabled_with_margin =0 ;int32_t number_of_aligned_displays_with_no_margin =0 ; + yclk =kcalloc (3 ,sizeof (*yclk),GFP_KERNEL ); +if (!yclk) +return ; + + sclk =kcalloc (8 ,sizeof (*sclk),GFP_KERNEL ); +if (!sclk) + goto free_yclk; + + tiling_mode =kcalloc (maximum_number_of_surfaces,sizeof (*tiling_mode),GFP_KERNEL ); +if (!tiling_mode) + goto free_sclk; + + surface_type =kcalloc (maximum_number_of_surfaces,sizeof (*surface_type),GFP_KERNEL ); +if (!surface_type) + goto free_tiling_mode; + yclk[low] = vbios->low_yclk; yclk[mid] = vbios->mid_yclk; yclk[high] = vbios->high_yclk;
@@ -2013,6 +2029,14 @@ static void calculate_bandwidth( } } } + +kfree (surface_type); +free_tiling_mode: +kfree (tiling_mode); +free_yclk: +kfree (yclk); +free_sclk: +kfree (sclk); }/*******************************************************************************
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 06/19] drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap
+ Harry, Nick
Quoted 55 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c: In function ‘calculate_bandwidth’:
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c:2016:1: warning: the frame size of 1216 bytes is larger than 1024 bytes [-Wframe-larger-than=]Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Colin Ian King <[email protected]>Signed-off-by Lee Jones <[email protected]>--- .../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +10
-4@@ -98,16 +98,16 @@ static void calculate_bandwidth(int32_t num_cursor_lines;int32_t i, j, k; -struct bw_fixed yclk[3 ]; -struct bw_fixed sclk[8 ]; +struct bw_fixed *yclk; +struct bw_fixed *sclk;bool d0_underlay_enable;bool d1_underlay_enable;bool fbc_enabled;bool lpt_enabled;enum bw_defines sclk_message;enum bw_defines yclk_message; -enum bw_defines tiling_mode[maximum_number_of_surfaces]; -enum bw_defines surface_type[maximum_number_of_surfaces]; +enum bw_defines *tiling_mode; +enum bw_defines *surface_type;enum bw_defines voltage;enum bw_defines pipe_check;enum bw_defines hsr_check;@@ -122,6 +122,22 @@ static void calculate_bandwidth(int32_t number_of_displays_enabled_with_margin =0 ;int32_t number_of_aligned_displays_with_no_margin =0 ; + yclk =kcalloc (3 ,sizeof (*yclk),GFP_KERNEL ); +if (!yclk) +return ; + + sclk =kcalloc (8 ,sizeof (*sclk),GFP_KERNEL ); +if (!sclk)
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c static void calculate_bandwidth( · line 140
Quoted 10 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +10
-0+ goto free_yclk; + + tiling_mode =kcalloc (maximum_number_of_surfaces,sizeof (*tiling_mode),GFP_KERNEL ); +if (!tiling_mode) + goto free_sclk; + + surface_type =kcalloc (maximum_number_of_surfaces,sizeof (*surface_type),GFP_KERNEL ); +if (!surface_type) + goto free_tiling_mode; +
Harry or Nick can correct me if I'm wrong, but for this patch and the next one, I think this can be called from an atomic context.
Alex
Quoted 21 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +8
-1yclk[low] = vbios->low_yclk; yclk[mid] = vbios->mid_yclk; yclk[high] = vbios->high_yclk;@@ -2013,6 +2029,14 @@ static void calculate_bandwidth( } } } + +kfree (surface_type); +free_tiling_mode: +kfree (tiling_mode); +free_yclk: +kfree (yclk); +free_sclk: +kfree (sclk); }/******************************************************************************* -- 2.27.0
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 06/19] drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap
Quoted 64 lines · Alex Deucher
+ Harry, Nick
Quoted 61 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c: In function ‘calculate_bandwidth’:
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c:2016:1: warning: the frame size of 1216 bytes is larger than 1024 bytes [-Wframe-larger-than=]Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Colin Ian King <[email protected]>Signed-off-by Lee Jones <[email protected]>--- .../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +16
-4@@ -98,16 +98,16 @@ static void calculate_bandwidth(int32_t num_cursor_lines;int32_t i, j, k; -struct bw_fixed yclk[3 ]; -struct bw_fixed sclk[8 ]; +struct bw_fixed *yclk; +struct bw_fixed *sclk;bool d0_underlay_enable;bool d1_underlay_enable;bool fbc_enabled;bool lpt_enabled;enum bw_defines sclk_message;enum bw_defines yclk_message; -enum bw_defines tiling_mode[maximum_number_of_surfaces]; -enum bw_defines surface_type[maximum_number_of_surfaces]; +enum bw_defines *tiling_mode; +enum bw_defines *surface_type;enum bw_defines voltage;enum bw_defines pipe_check;enum bw_defines hsr_check;@@ -122,6 +122,22 @@ static void calculate_bandwidth(int32_t number_of_displays_enabled_with_margin =0 ;int32_t number_of_aligned_displays_with_no_margin =0 ; + yclk =kcalloc (3 ,sizeof (*yclk),GFP_KERNEL ); +if (!yclk) +return ; + + sclk =kcalloc (8 ,sizeof (*sclk),GFP_KERNEL ); +if (!sclk) + goto free_yclk; + + tiling_mode =kcalloc (maximum_number_of_surfaces,sizeof (*tiling_mode),GFP_KERNEL ); +if (!tiling_mode) + goto free_sclk; +
Quoted 9 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c static void calculate_bandwidth( · line 140
Quoted 4 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +4
-0+ surface_type =kcalloc (maximum_number_of_surfaces,sizeof (*surface_type),GFP_KERNEL ); +if (!surface_type) + goto free_tiling_mode; +Harry or Nick can correct me if I'm wrong, but for this patch and the next one, I think this can be called from an atomic context.
From what I can see this doesn't seem the case. If I'm missing something someone please correct me.
This and the next (06/19) patch are both
Harry
Quoted 19 lines
Alex
Quoted 17 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +8
-0yclk[low] = vbios->low_yclk; yclk[mid] = vbios->mid_yclk; yclk[high] = vbios->high_yclk;@@ -2013,6 +2029,14 @@ static void calculate_bandwidth( } } } + +kfree (surface_type); +free_tiling_mode: +kfree (tiling_mode); +free_yclk: +kfree (yclk); +free_sclk: +kfree (sclk); }
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +0
-1/******************************************************************************* -- 2.27.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel>
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 06/19] drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap
Quoted 76 lines · Harry Wentland
Quoted 64 lines · Alex Deucher
+ Harry, Nick
Quoted 61 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c: In function ‘calculate_bandwidth’:
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c:2016:1: warning: the frame size of 1216 bytes is larger than 1024 bytes [-Wframe-larger-than=]Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Colin Ian King <[email protected]>Signed-off-by Lee Jones <[email protected]>--- .../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +16
-4@@ -98,16 +98,16 @@ static void calculate_bandwidth(int32_t num_cursor_lines;int32_t i, j, k; -struct bw_fixed yclk[3 ]; -struct bw_fixed sclk[8 ]; +struct bw_fixed *yclk; +struct bw_fixed *sclk;bool d0_underlay_enable;bool d1_underlay_enable;bool fbc_enabled;bool lpt_enabled;enum bw_defines sclk_message;enum bw_defines yclk_message; -enum bw_defines tiling_mode[maximum_number_of_surfaces]; -enum bw_defines surface_type[maximum_number_of_surfaces]; +enum bw_defines *tiling_mode; +enum bw_defines *surface_type;enum bw_defines voltage;enum bw_defines pipe_check;enum bw_defines hsr_check;@@ -122,6 +122,22 @@ static void calculate_bandwidth(int32_t number_of_displays_enabled_with_margin =0 ;int32_t number_of_aligned_displays_with_no_margin =0 ; + yclk =kcalloc (3 ,sizeof (*yclk),GFP_KERNEL ); +if (!yclk) +return ; + + sclk =kcalloc (8 ,sizeof (*sclk),GFP_KERNEL ); +if (!sclk) + goto free_yclk; + + tiling_mode =kcalloc (maximum_number_of_surfaces,sizeof (*tiling_mode),GFP_KERNEL ); +if (!tiling_mode) + goto free_sclk; +Quoted 9 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c static void calculate_bandwidth( · line 140
Quoted 4 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +4
-0+ surface_type =kcalloc (maximum_number_of_surfaces,sizeof (*surface_type),GFP_KERNEL ); +if (!surface_type) + goto free_tiling_mode; +Harry or Nick can correct me if I'm wrong, but for this patch and the next one, I think this can be called from an atomic context.
Quoted 5 lines
From what I can see this doesn't seem the case. If I'm missing
something someone please correct me.This and the next (06/19) patch are both
Reviewed-by Harry Wentland <[email protected]>
Thanks. I've applied them.
Alex
Quoted 22 lines
Harry
Quoted 19 lines
Alex
Quoted 17 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +8
-0yclk[low] = vbios->low_yclk; yclk[mid] = vbios->mid_yclk; yclk[high] = vbios->high_yclk;@@ -2013,6 +2029,14 @@ static void calculate_bandwidth( } } } + +kfree (surface_type); +free_tiling_mode: +kfree (tiling_mode); +free_yclk: +kfree (yclk); +free_sclk: +kfree (sclk); }
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +0
-1/******************************************************************************* -- 2.27.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel>
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
maintainerRe: [PATCH 06/19] drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap
In reply to Harry WentlandAm 19.03.21 um 19:26 schrieb Harry Wentland:
Quoted 78 lines · Alex Deucher
Quoted 67 lines
+ Harry, Nick
Quoted 64 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c: In function ‘calculate_bandwidth’:drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c:2016:1: warning: the frame size of 1216 bytes is larger than 1024 bytes [-Wframe-larger-than=]Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Colin Ian King <[email protected]>Signed-off-by Lee Jones <[email protected]>---
.../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 32
++++++++++++++++---1 file changed, 28 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +17
-4@@ -98,16 +98,16 @@ static void calculate_bandwidth( int32_t num_cursor_lines; int32_t i, j, k; - struct bw_fixed yclk[3]; - struct bw_fixed sclk[8]; + struct bw_fixed *yclk; + struct bw_fixed *sclk; bool d0_underlay_enable; bool d1_underlay_enable; bool fbc_enabled; bool lpt_enabled; enum bw_defines sclk_message; enum bw_defines yclk_message; - enum bw_defines tiling_mode[maximum_number_of_surfaces]; - enum bw_defines surface_type[maximum_number_of_surfaces]; + enum bw_defines *tiling_mode; + enum bw_defines *surface_type; enum bw_defines voltage; enum bw_defines pipe_check; enum bw_defines hsr_check;@@ -122,6 +122,22 @@ static void calculate_bandwidth( int32_t number_of_displays_enabled_with_margin = 0; int32_t number_of_aligned_displays_with_no_margin = 0; + yclk = kcalloc(3, sizeof(*yclk), GFP_KERNEL); + if (!yclk) + return; + + sclk = kcalloc(8, sizeof(*sclk), GFP_KERNEL); + if (!sclk) + goto free_yclk; + + tiling_mode = kcalloc(maximum_number_of_surfaces,sizeof (*tiling_mode),GFP_KERNEL ); + if (!tiling_mode) + goto free_sclk; + + surface_type = kcalloc(maximum_number_of_surfaces,Quoted 9 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c static void calculate_bandwidth( · line 140
Quoted 4 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +3
-0sizeof(*surface_type), GFP_KERNEL); + if (!surface_type) + goto free_tiling_mode; +Harry or Nick can correct me if I'm wrong, but for this patch and the next one, I think this can be called from an atomic context.
Quoted 1 line
From what I can see this doesn't seem the case. If I'm missing something someone please correct me.
Have you taken into account that using FP functions require atomic context as well?
We had quite a bunch of problems with that and had to replace some GFP_KERNEL with GFP_ATOMIC in the DC code because of this.
Could of course be that this code here isn't affected by that, but better save than sorry.
Christian.
Quoted 25 lines
This and the next (06/19) patch are both
Reviewed-by Harry Wentland <[email protected]>Harry
Quoted 19 lines
Alex
Quoted 17 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +0
-0yclk[low] = vbios->low_yclk;yclk[mid] =
vbios->mid_yclk;
yclk[high] =vbios->high_yclk;drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +8
-0@@ -2013,6 +2029,14 @@ static void calculate_bandwidth( } } } + + kfree(surface_type); +free_tiling_mode: + kfree(tiling_mode); +free_yclk: + kfree(yclk); +free_sclk: + kfree(sclk); }
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +0
-0/******************************************************************************* Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 06/19] drm/amd/display/dc/calcs/dce_calcs: Move some large variables from the stack to the heap
Quoted 89 lines · Christian König
Am 19.03.21 um 19:26 schrieb Harry Wentland:
Quoted 82 lines · Alex Deucher
Quoted 71 lines
+ Harry, Nick
Quoted 68 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c: In
function ‘calculate_bandwidth’:drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c:2016:1:
warning: the frame size of 1216 bytes is larger than 1024 bytes [-Wframe-larger-than=]Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Colin Ian King <[email protected]>Signed-off-by Lee Jones <[email protected]>--- .../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +17
-4@@ -98,16 +98,16 @@ static void calculate_bandwidth(int32_t num_cursor_lines;int32_t i, j, k; -struct bw_fixed yclk[3 ]; -struct bw_fixed sclk[8 ]; +struct bw_fixed *yclk; +struct bw_fixed *sclk;bool d0_underlay_enable;bool d1_underlay_enable;bool fbc_enabled;bool lpt_enabled;enum bw_defines sclk_message;enum bw_defines yclk_message; -enum bw_defines tiling_mode[maximum_number_of_surfaces]; -enum bw_defines surface_type[maximum_number_of_surfaces]; +enum bw_defines *tiling_mode; +enum bw_defines *surface_type;enum bw_defines voltage;enum bw_defines pipe_check;enum bw_defines hsr_check;@@ -122,6 +122,22 @@ static void calculate_bandwidth(int32_t number_of_displays_enabled_with_margin =0 ;int32_t number_of_aligned_displays_with_no_margin =0 ; + yclk =kcalloc (3 ,sizeof (*yclk),GFP_KERNEL ); +if (!yclk) +return ; + + sclk =kcalloc (8 ,sizeof (*sclk),GFP_KERNEL ); +if (!sclk) + goto free_yclk; + + tiling_mode =kcalloc (maximum_number_of_surfaces,sizeof (*tiling_mode),GFP_KERNEL ); +if (!tiling_mode) + goto free_sclk; + + surface_type = kcalloc(maximum_number_of_surfaces,Quoted 9 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c static void calculate_bandwidth( · line 140
Quoted 4 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +3
-0sizeof(*surface_type), GFP_KERNEL); +if (!surface_type) + goto free_tiling_mode; +Harry or Nick can correct me if I'm wrong, but for this patch and the next one, I think this can be called from an atomic context.
Quoted 2 lines
From what I can see this doesn't seem the case. If I'm missing something someone please correct me.
Quoted 8 lines
Have you taken into account that using FP functions require atomic context as well?
We had quite a bunch of problems with that and had to replace some
GFP_KERNELwithGFP_ATOMICin the DC code because of this.Could of course be that this code here isn't affected by that, but better save than sorry.
DCE hardware uses fixed point math so that should be ok. It's just the newer DCN hardware that requires FP.
Alex
Quoted 28 lines
Christian.
Quoted 25 lines
This and the next (06/19) patch are both
Reviewed-by Harry Wentland <[email protected]>Harry
Quoted 19 lines
Alex
Quoted 17 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +0
-0yclk[low] = vbios->low_yclk;yclk[mid] = vbios->mid_yclk; yclk[high] = vbios->high_yclk;drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +8
-0@@ -2013,6 +2029,14 @@ static void calculate_bandwidth( } } } + +kfree (surface_type); +free_tiling_mode: +kfree (tiling_mode); +free_yclk: +kfree (yclk); +free_sclk: +kfree (sclk); }
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +0
-1/******************************************************************************* -- 2.27.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 7/19 drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from the stack
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c: In function ‘bw_calcs_init’:
drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dce_calcs.c:2726:1: warning: the frame size of 1336 bytes is larger than 1024 bytes [-Wframe-larger-than=]
--- .../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1122 +++++++++-------- 1 file changed, 567 insertions(+), 555 deletions(-)
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +567 -555
@@ -2046,707 +2046,719 @@ void bw_calcs_init(struct bw_calcs_dceip *bw_dceip,struct bw_calcs_vbios *bw_vbios, struct hw_asic_id asic_id) { - struct bw_calcs_dceip dceip = { 0 }; -struct bw_calcs_vbios vbios = {0 }; + struct bw_calcs_dceip *dceip; +struct bw_calcs_vbios *vbios;enum bw_calcs_version version =bw_calcs_version_from_asic_id (asic_id); - dceip.version = version; + dceip =kzalloc (sizeof (dceip),GFP_KERNEL ); +if (!dceip) +return ; + + vbios =kzalloc (sizeof (vbios),GFP_KERNEL ); +if (!vbios) { +kfree (dceip); +return ; + } + + dceip->version = version;switch (version) {case BW_CALCS_VERSION_CARRIZO : - vbios.memory_type = bw_def_gddr5; - vbios.dram_channel_width_in_bits =64 ; - vbios.number_of_dram_channels = asic_id.vram_width / vbios.dram_channel_width_in_bits; - vbios.number_of_dram_banks =8 ; - vbios.high_yclk =bw_int_to_fixed (1600 ); - vbios.mid_yclk =bw_int_to_fixed (1600 ); - vbios.low_yclk =bw_frc_to_fixed (66666 ,100 ); - vbios.low_sclk =bw_int_to_fixed (200 ); - vbios.mid1_sclk =bw_int_to_fixed (300 ); - vbios.mid2_sclk =bw_int_to_fixed (300 ); - vbios.mid3_sclk =bw_int_to_fixed (300 ); - vbios.mid4_sclk =bw_int_to_fixed (300 ); - vbios.mid5_sclk =bw_int_to_fixed (300 ); - vbios.mid6_sclk =bw_int_to_fixed (300 ); - vbios.high_sclk =bw_frc_to_fixed (62609 ,100 ); - vbios.low_voltage_max_dispclk =bw_int_to_fixed (352 ); - vbios.mid_voltage_max_dispclk =bw_int_to_fixed (467 ); - vbios.high_voltage_max_dispclk =bw_int_to_fixed (643 ); - vbios.low_voltage_max_phyclk =bw_int_to_fixed (540 ); - vbios.mid_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.high_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.data_return_bus_width =bw_int_to_fixed (32 ); - vbios.trc =bw_int_to_fixed (50 ); - vbios.dmifmc_urgent_latency =bw_int_to_fixed (4 ); - vbios.stutter_self_refresh_exit_latency =bw_frc_to_fixed (153 ,10 ); - vbios.stutter_self_refresh_entry_latency =bw_int_to_fixed (0 ); - vbios.nbp_state_change_latency =bw_frc_to_fixed (19649 ,1000 ); - vbios.mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); - vbios.scatter_gather_enable = true; - vbios.down_spread_percentage =bw_frc_to_fixed (5 ,10 ); - vbios.cursor_width =32 ; - vbios.average_compression_rate =4 ; - vbios.number_of_request_slots_gmc_reserves_for_dmif_per_channel =256 ; - vbios.blackout_duration =bw_int_to_fixed (0 );/* us */ - vbios.maximum_blackout_recovery_time =bw_int_to_fixed (0 ); - - dceip.max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; - dceip.max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; - dceip.percent_of_ideal_port_bw_received_after_urgent_latency =100 ; - dceip.large_cursor = false; - dceip.dmif_request_buffer_size =bw_int_to_fixed (768 ); - dceip.dmif_pipe_en_fbc_chunk_tracker = false; - dceip.cursor_max_outstanding_group_num =1 ; - dceip.lines_interleaved_into_lb =2 ; - dceip.chunk_width =256 ; - dceip.number_of_graphics_pipes =3 ; - dceip.number_of_underlay_pipes =1 ; - dceip.low_power_tiling_mode =0 ; - dceip.display_write_back_supported = false; - dceip.argb_compression_support = false; - dceip.underlay_vscaler_efficiency6_bit_per_component = + vbios->memory_type = bw_def_gddr5; + vbios->dram_channel_width_in_bits =64 ; + vbios->number_of_dram_channels = asic_id.vram_width / vbios->dram_channel_width_in_bits; + vbios->number_of_dram_banks =8 ; + vbios->high_yclk =bw_int_to_fixed (1600 ); + vbios->mid_yclk =bw_int_to_fixed (1600 ); + vbios->low_yclk =bw_frc_to_fixed (66666 ,100 ); + vbios->low_sclk =bw_int_to_fixed (200 ); + vbios->mid1_sclk =bw_int_to_fixed (300 ); + vbios->mid2_sclk =bw_int_to_fixed (300 ); + vbios->mid3_sclk =bw_int_to_fixed (300 ); + vbios->mid4_sclk =bw_int_to_fixed (300 ); + vbios->mid5_sclk =bw_int_to_fixed (300 ); + vbios->mid6_sclk =bw_int_to_fixed (300 ); + vbios->high_sclk =bw_frc_to_fixed (62609 ,100 ); + vbios->low_voltage_max_dispclk =bw_int_to_fixed (352 ); + vbios->mid_voltage_max_dispclk =bw_int_to_fixed (467 ); + vbios->high_voltage_max_dispclk =bw_int_to_fixed (643 ); + vbios->low_voltage_max_phyclk =bw_int_to_fixed (540 ); + vbios->mid_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->high_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->data_return_bus_width =bw_int_to_fixed (32 ); + vbios->trc =bw_int_to_fixed (50 ); + vbios->dmifmc_urgent_latency =bw_int_to_fixed (4 ); + vbios->stutter_self_refresh_exit_latency =bw_frc_to_fixed (153 ,10 ); + vbios->stutter_self_refresh_entry_latency =bw_int_to_fixed (0 ); + vbios->nbp_state_change_latency =bw_frc_to_fixed (19649 ,1000 ); + vbios->mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); + vbios->scatter_gather_enable = true; + vbios->down_spread_percentage =bw_frc_to_fixed (5 ,10 ); + vbios->cursor_width =32 ; + vbios->average_compression_rate =4 ; + vbios->number_of_request_slots_gmc_reserves_for_dmif_per_channel =256 ; + vbios->blackout_duration =bw_int_to_fixed (0 );/* us */ + vbios->maximum_blackout_recovery_time =bw_int_to_fixed (0 ); + + dceip->max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; + dceip->max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; + dceip->percent_of_ideal_port_bw_received_after_urgent_latency =100 ; + dceip->large_cursor = false; + dceip->dmif_request_buffer_size =bw_int_to_fixed (768 ); + dceip->dmif_pipe_en_fbc_chunk_tracker = false; + dceip->cursor_max_outstanding_group_num =1 ; + dceip->lines_interleaved_into_lb =2 ; + dceip->chunk_width =256 ; + dceip->number_of_graphics_pipes =3 ; + dceip->number_of_underlay_pipes =1 ; + dceip->low_power_tiling_mode =0 ; + dceip->display_write_back_supported = false; + dceip->argb_compression_support = false; + dceip->underlay_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35556 ,10000 ); - dceip.underlay_vscaler_efficiency8_bit_per_component = + dceip->underlay_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.underlay_vscaler_efficiency10_bit_per_component = + dceip->underlay_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.underlay_vscaler_efficiency12_bit_per_component = + dceip->underlay_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.graphics_vscaler_efficiency6_bit_per_component = + dceip->graphics_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35 ,10 ); - dceip.graphics_vscaler_efficiency8_bit_per_component = + dceip->graphics_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.graphics_vscaler_efficiency10_bit_per_component = + dceip->graphics_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.graphics_vscaler_efficiency12_bit_per_component = + dceip->graphics_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.alpha_vscaler_efficiency =bw_int_to_fixed (3 ); - dceip.max_dmif_buffer_allocated =2 ; - dceip.graphics_dmif_size =12288 ; - dceip.underlay_luma_dmif_size =19456 ; - dceip.underlay_chroma_dmif_size =23552 ; - dceip.pre_downscaler_enabled = true; - dceip.underlay_downscale_prefetch_enabled = true; - dceip.lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); - dceip.lb_size_per_component444 =bw_int_to_fixed (82176 ); - dceip.graphics_lb_nodownscaling_multi_line_prefetching = false; - dceip.stutter_and_dram_clock_state_change_gated_before_cursor = + dceip->alpha_vscaler_efficiency =bw_int_to_fixed (3 ); + dceip->max_dmif_buffer_allocated =2 ; + dceip->graphics_dmif_size =12288 ; + dceip->underlay_luma_dmif_size =19456 ; + dceip->underlay_chroma_dmif_size =23552 ; + dceip->pre_downscaler_enabled = true; + dceip->underlay_downscale_prefetch_enabled = true; + dceip->lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); + dceip->lb_size_per_component444 =bw_int_to_fixed (82176 ); + dceip->graphics_lb_nodownscaling_multi_line_prefetching = false; + dceip->stutter_and_dram_clock_state_change_gated_before_cursor =bw_int_to_fixed (0 ); - dceip.underlay420_luma_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay420_luma_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.underlay420_chroma_lb_size_per_component = + dceip->underlay420_chroma_lb_size_per_component =bw_int_to_fixed (164352 ); - dceip.underlay422_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay422_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.cursor_chunk_width =bw_int_to_fixed (64 ); - dceip.cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); - dceip.underlay_maximum_width_efficient_for_tiling = + dceip->cursor_chunk_width =bw_int_to_fixed (64 ); + dceip->cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); + dceip->underlay_maximum_width_efficient_for_tiling =bw_int_to_fixed (1920 ); - dceip.underlay_maximum_height_efficient_for_tiling = + dceip->underlay_maximum_height_efficient_for_tiling =bw_int_to_fixed (1080 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display = + dceip->peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display =bw_frc_to_fixed (3 ,10 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation = + dceip->peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation =bw_int_to_fixed (25 ); - dceip.minimum_outstanding_pte_request_limit =bw_int_to_fixed ( + dceip->minimum_outstanding_pte_request_limit =bw_int_to_fixed (2 ); - dceip.maximum_total_outstanding_pte_requests_allowed_by_saw = + dceip->maximum_total_outstanding_pte_requests_allowed_by_saw =bw_int_to_fixed (128 ); - dceip.limit_excessive_outstanding_dmif_requests = true; - dceip.linear_mode_line_request_alternation_slice = + dceip->limit_excessive_outstanding_dmif_requests = true; + dceip->linear_mode_line_request_alternation_slice =bw_int_to_fixed (64 ); - dceip.scatter_gather_lines_of_pte_prefetching_in_linear_mode = + dceip->scatter_gather_lines_of_pte_prefetching_in_linear_mode =32 ; - dceip.display_write_back420_luma_mcifwr_buffer_size =12288 ; - dceip.display_write_back420_chroma_mcifwr_buffer_size =8192 ; - dceip.request_efficiency =bw_frc_to_fixed (8 ,10 ); - dceip.dispclk_per_request =bw_int_to_fixed (2 ); - dceip.dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); - dceip.display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); - dceip.scatter_gather_pte_request_rows_in_tiling_mode =2 ; - dceip.mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 );/* todo: this is a bug*/ + dceip->display_write_back420_luma_mcifwr_buffer_size =12288 ; + dceip->display_write_back420_chroma_mcifwr_buffer_size =8192 ; + dceip->request_efficiency =bw_frc_to_fixed (8 ,10 ); + dceip->dispclk_per_request =bw_int_to_fixed (2 ); + dceip->dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); + dceip->display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); + dceip->scatter_gather_pte_request_rows_in_tiling_mode =2 ; + dceip->mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 );/* todo: this is a bug*/ break ;case BW_CALCS_VERSION_POLARIS10 :/* TODO: Treat VEGAM the same as P10 for now * Need to tune the para for VEGAM if needed */ case BW_CALCS_VERSION_VEGAM : - vbios.memory_type = bw_def_gddr5; - vbios.dram_channel_width_in_bits =32 ; - vbios.number_of_dram_channels = asic_id.vram_width / vbios.dram_channel_width_in_bits; - vbios.number_of_dram_banks =8 ; - vbios.high_yclk =bw_int_to_fixed (6000 ); - vbios.mid_yclk =bw_int_to_fixed (3200 ); - vbios.low_yclk =bw_int_to_fixed (1000 ); - vbios.low_sclk =bw_int_to_fixed (300 ); - vbios.mid1_sclk =bw_int_to_fixed (400 ); - vbios.mid2_sclk =bw_int_to_fixed (500 ); - vbios.mid3_sclk =bw_int_to_fixed (600 ); - vbios.mid4_sclk =bw_int_to_fixed (700 ); - vbios.mid5_sclk =bw_int_to_fixed (800 ); - vbios.mid6_sclk =bw_int_to_fixed (974 ); - vbios.high_sclk =bw_int_to_fixed (1154 ); - vbios.low_voltage_max_dispclk =bw_int_to_fixed (459 ); - vbios.mid_voltage_max_dispclk =bw_int_to_fixed (654 ); - vbios.high_voltage_max_dispclk =bw_int_to_fixed (1108 ); - vbios.low_voltage_max_phyclk =bw_int_to_fixed (540 ); - vbios.mid_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.high_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.data_return_bus_width =bw_int_to_fixed (32 ); - vbios.trc =bw_int_to_fixed (48 ); - vbios.dmifmc_urgent_latency =bw_int_to_fixed (3 ); - vbios.stutter_self_refresh_exit_latency =bw_int_to_fixed (5 ); - vbios.stutter_self_refresh_entry_latency =bw_int_to_fixed (0 ); - vbios.nbp_state_change_latency =bw_int_to_fixed (45 ); - vbios.mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); - vbios.scatter_gather_enable = true; - vbios.down_spread_percentage =bw_frc_to_fixed (5 ,10 ); - vbios.cursor_width =32 ; - vbios.average_compression_rate =4 ; - vbios.number_of_request_slots_gmc_reserves_for_dmif_per_channel =256 ; - vbios.blackout_duration =bw_int_to_fixed (0 );/* us */ - vbios.maximum_blackout_recovery_time =bw_int_to_fixed (0 ); - - dceip.max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; - dceip.max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; - dceip.percent_of_ideal_port_bw_received_after_urgent_latency =100 ; - dceip.large_cursor = false; - dceip.dmif_request_buffer_size =bw_int_to_fixed (768 ); - dceip.dmif_pipe_en_fbc_chunk_tracker = false; - dceip.cursor_max_outstanding_group_num =1 ; - dceip.lines_interleaved_into_lb =2 ; - dceip.chunk_width =256 ; - dceip.number_of_graphics_pipes =6 ; - dceip.number_of_underlay_pipes =0 ; - dceip.low_power_tiling_mode =0 ; - dceip.display_write_back_supported = false; - dceip.argb_compression_support = true; - dceip.underlay_vscaler_efficiency6_bit_per_component = + vbios->memory_type = bw_def_gddr5; + vbios->dram_channel_width_in_bits =32 ; + vbios->number_of_dram_channels = asic_id.vram_width / vbios->dram_channel_width_in_bits; + vbios->number_of_dram_banks =8 ; + vbios->high_yclk =bw_int_to_fixed (6000 ); + vbios->mid_yclk =bw_int_to_fixed (3200 ); + vbios->low_yclk =bw_int_to_fixed (1000 ); + vbios->low_sclk =bw_int_to_fixed (300 ); + vbios->mid1_sclk =bw_int_to_fixed (400 ); + vbios->mid2_sclk =bw_int_to_fixed (500 ); + vbios->mid3_sclk =bw_int_to_fixed (600 ); + vbios->mid4_sclk =bw_int_to_fixed (700 ); + vbios->mid5_sclk =bw_int_to_fixed (800 ); + vbios->mid6_sclk =bw_int_to_fixed (974 ); + vbios->high_sclk =bw_int_to_fixed (1154 ); + vbios->low_voltage_max_dispclk =bw_int_to_fixed (459 ); + vbios->mid_voltage_max_dispclk =bw_int_to_fixed (654 ); + vbios->high_voltage_max_dispclk =bw_int_to_fixed (1108 ); + vbios->low_voltage_max_phyclk =bw_int_to_fixed (540 ); + vbios->mid_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->high_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->data_return_bus_width =bw_int_to_fixed (32 ); + vbios->trc =bw_int_to_fixed (48 ); + vbios->dmifmc_urgent_latency =bw_int_to_fixed (3 ); + vbios->stutter_self_refresh_exit_latency =bw_int_to_fixed (5 ); + vbios->stutter_self_refresh_entry_latency =bw_int_to_fixed (0 ); + vbios->nbp_state_change_latency =bw_int_to_fixed (45 ); + vbios->mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); + vbios->scatter_gather_enable = true; + vbios->down_spread_percentage =bw_frc_to_fixed (5 ,10 ); + vbios->cursor_width =32 ; + vbios->average_compression_rate =4 ; + vbios->number_of_request_slots_gmc_reserves_for_dmif_per_channel =256 ; + vbios->blackout_duration =bw_int_to_fixed (0 );/* us */ + vbios->maximum_blackout_recovery_time =bw_int_to_fixed (0 ); + + dceip->max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; + dceip->max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; + dceip->percent_of_ideal_port_bw_received_after_urgent_latency =100 ; + dceip->large_cursor = false; + dceip->dmif_request_buffer_size =bw_int_to_fixed (768 ); + dceip->dmif_pipe_en_fbc_chunk_tracker = false; + dceip->cursor_max_outstanding_group_num =1 ; + dceip->lines_interleaved_into_lb =2 ; + dceip->chunk_width =256 ; + dceip->number_of_graphics_pipes =6 ; + dceip->number_of_underlay_pipes =0 ; + dceip->low_power_tiling_mode =0 ; + dceip->display_write_back_supported = false; + dceip->argb_compression_support = true; + dceip->underlay_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35556 ,10000 ); - dceip.underlay_vscaler_efficiency8_bit_per_component = + dceip->underlay_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.underlay_vscaler_efficiency10_bit_per_component = + dceip->underlay_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.underlay_vscaler_efficiency12_bit_per_component = + dceip->underlay_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.graphics_vscaler_efficiency6_bit_per_component = + dceip->graphics_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35 ,10 ); - dceip.graphics_vscaler_efficiency8_bit_per_component = + dceip->graphics_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.graphics_vscaler_efficiency10_bit_per_component = + dceip->graphics_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.graphics_vscaler_efficiency12_bit_per_component = + dceip->graphics_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.alpha_vscaler_efficiency =bw_int_to_fixed (3 ); - dceip.max_dmif_buffer_allocated =4 ; - dceip.graphics_dmif_size =12288 ; - dceip.underlay_luma_dmif_size =19456 ; - dceip.underlay_chroma_dmif_size =23552 ; - dceip.pre_downscaler_enabled = true; - dceip.underlay_downscale_prefetch_enabled = true; - dceip.lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); - dceip.lb_size_per_component444 =bw_int_to_fixed (245952 ); - dceip.graphics_lb_nodownscaling_multi_line_prefetching = true; - dceip.stutter_and_dram_clock_state_change_gated_before_cursor = + dceip->alpha_vscaler_efficiency =bw_int_to_fixed (3 ); + dceip->max_dmif_buffer_allocated =4 ; + dceip->graphics_dmif_size =12288 ; + dceip->underlay_luma_dmif_size =19456 ; + dceip->underlay_chroma_dmif_size =23552 ; + dceip->pre_downscaler_enabled = true; + dceip->underlay_downscale_prefetch_enabled = true; + dceip->lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); + dceip->lb_size_per_component444 =bw_int_to_fixed (245952 ); + dceip->graphics_lb_nodownscaling_multi_line_prefetching = true; + dceip->stutter_and_dram_clock_state_change_gated_before_cursor =bw_int_to_fixed (1 ); - dceip.underlay420_luma_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay420_luma_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.underlay420_chroma_lb_size_per_component = + dceip->underlay420_chroma_lb_size_per_component =bw_int_to_fixed (164352 ); - dceip.underlay422_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay422_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.cursor_chunk_width =bw_int_to_fixed (64 ); - dceip.cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); - dceip.underlay_maximum_width_efficient_for_tiling = + dceip->cursor_chunk_width =bw_int_to_fixed (64 ); + dceip->cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); + dceip->underlay_maximum_width_efficient_for_tiling =bw_int_to_fixed (1920 ); - dceip.underlay_maximum_height_efficient_for_tiling = + dceip->underlay_maximum_height_efficient_for_tiling =bw_int_to_fixed (1080 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display = + dceip->peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display =bw_frc_to_fixed (3 ,10 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation = + dceip->peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation =bw_int_to_fixed (25 ); - dceip.minimum_outstanding_pte_request_limit =bw_int_to_fixed ( + dceip->minimum_outstanding_pte_request_limit =bw_int_to_fixed (2 ); - dceip.maximum_total_outstanding_pte_requests_allowed_by_saw = + dceip->maximum_total_outstanding_pte_requests_allowed_by_saw =bw_int_to_fixed (128 ); - dceip.limit_excessive_outstanding_dmif_requests = true; - dceip.linear_mode_line_request_alternation_slice = + dceip->limit_excessive_outstanding_dmif_requests = true; + dceip->linear_mode_line_request_alternation_slice =bw_int_to_fixed (64 ); - dceip.scatter_gather_lines_of_pte_prefetching_in_linear_mode = + dceip->scatter_gather_lines_of_pte_prefetching_in_linear_mode =32 ; - dceip.display_write_back420_luma_mcifwr_buffer_size =12288 ; - dceip.display_write_back420_chroma_mcifwr_buffer_size =8192 ; - dceip.request_efficiency =bw_frc_to_fixed (8 ,10 ); - dceip.dispclk_per_request =bw_int_to_fixed (2 ); - dceip.dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); - dceip.display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); - dceip.scatter_gather_pte_request_rows_in_tiling_mode =2 ; - dceip.mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 ); + dceip->display_write_back420_luma_mcifwr_buffer_size =12288 ; + dceip->display_write_back420_chroma_mcifwr_buffer_size =8192 ; + dceip->request_efficiency =bw_frc_to_fixed (8 ,10 ); + dceip->dispclk_per_request =bw_int_to_fixed (2 ); + dceip->dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); + dceip->display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); + dceip->scatter_gather_pte_request_rows_in_tiling_mode =2 ; + dceip->mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 );break ;case BW_CALCS_VERSION_POLARIS11 : - vbios.memory_type = bw_def_gddr5; - vbios.dram_channel_width_in_bits =32 ; - vbios.number_of_dram_channels = asic_id.vram_width / vbios.dram_channel_width_in_bits; - vbios.number_of_dram_banks =8 ; - vbios.high_yclk =bw_int_to_fixed (6000 ); - vbios.mid_yclk =bw_int_to_fixed (3200 ); - vbios.low_yclk =bw_int_to_fixed (1000 ); - vbios.low_sclk =bw_int_to_fixed (300 ); - vbios.mid1_sclk =bw_int_to_fixed (400 ); - vbios.mid2_sclk =bw_int_to_fixed (500 ); - vbios.mid3_sclk =bw_int_to_fixed (600 ); - vbios.mid4_sclk =bw_int_to_fixed (700 ); - vbios.mid5_sclk =bw_int_to_fixed (800 ); - vbios.mid6_sclk =bw_int_to_fixed (974 ); - vbios.high_sclk =bw_int_to_fixed (1154 ); - vbios.low_voltage_max_dispclk =bw_int_to_fixed (459 ); - vbios.mid_voltage_max_dispclk =bw_int_to_fixed (654 ); - vbios.high_voltage_max_dispclk =bw_int_to_fixed (1108 ); - vbios.low_voltage_max_phyclk =bw_int_to_fixed (540 ); - vbios.mid_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.high_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.data_return_bus_width =bw_int_to_fixed (32 ); - vbios.trc =bw_int_to_fixed (48 ); -if (vbios.number_of_dram_channels ==2 )// 64-bit - vbios.dmifmc_urgent_latency =bw_int_to_fixed (4 ); + vbios->memory_type = bw_def_gddr5; + vbios->dram_channel_width_in_bits =32 ; + vbios->number_of_dram_channels = asic_id.vram_width / vbios->dram_channel_width_in_bits; + vbios->number_of_dram_banks =8 ; + vbios->high_yclk =bw_int_to_fixed (6000 ); + vbios->mid_yclk =bw_int_to_fixed (3200 ); + vbios->low_yclk =bw_int_to_fixed (1000 ); + vbios->low_sclk =bw_int_to_fixed (300 ); + vbios->mid1_sclk =bw_int_to_fixed (400 ); + vbios->mid2_sclk =bw_int_to_fixed (500 ); + vbios->mid3_sclk =bw_int_to_fixed (600 ); + vbios->mid4_sclk =bw_int_to_fixed (700 ); + vbios->mid5_sclk =bw_int_to_fixed (800 ); + vbios->mid6_sclk =bw_int_to_fixed (974 ); + vbios->high_sclk =bw_int_to_fixed (1154 ); + vbios->low_voltage_max_dispclk =bw_int_to_fixed (459 ); + vbios->mid_voltage_max_dispclk =bw_int_to_fixed (654 ); + vbios->high_voltage_max_dispclk =bw_int_to_fixed (1108 ); + vbios->low_voltage_max_phyclk =bw_int_to_fixed (540 ); + vbios->mid_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->high_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->data_return_bus_width =bw_int_to_fixed (32 ); + vbios->trc =bw_int_to_fixed (48 ); +if (vbios->number_of_dram_channels ==2 )// 64-bit + vbios->dmifmc_urgent_latency =bw_int_to_fixed (4 );else - vbios.dmifmc_urgent_latency =bw_int_to_fixed (3 ); - vbios.stutter_self_refresh_exit_latency =bw_int_to_fixed (5 ); - vbios.stutter_self_refresh_entry_latency =bw_int_to_fixed (0 ); - vbios.nbp_state_change_latency =bw_int_to_fixed (45 ); - vbios.mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); - vbios.scatter_gather_enable = true; - vbios.down_spread_percentage =bw_frc_to_fixed (5 ,10 ); - vbios.cursor_width =32 ; - vbios.average_compression_rate =4 ; - vbios.number_of_request_slots_gmc_reserves_for_dmif_per_channel =256 ; - vbios.blackout_duration =bw_int_to_fixed (0 );/* us */ - vbios.maximum_blackout_recovery_time =bw_int_to_fixed (0 ); - - dceip.max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; - dceip.max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; - dceip.percent_of_ideal_port_bw_received_after_urgent_latency =100 ; - dceip.large_cursor = false; - dceip.dmif_request_buffer_size =bw_int_to_fixed (768 ); - dceip.dmif_pipe_en_fbc_chunk_tracker = false; - dceip.cursor_max_outstanding_group_num =1 ; - dceip.lines_interleaved_into_lb =2 ; - dceip.chunk_width =256 ; - dceip.number_of_graphics_pipes =5 ; - dceip.number_of_underlay_pipes =0 ; - dceip.low_power_tiling_mode =0 ; - dceip.display_write_back_supported = false; - dceip.argb_compression_support = true; - dceip.underlay_vscaler_efficiency6_bit_per_component = + vbios->dmifmc_urgent_latency =bw_int_to_fixed (3 ); + vbios->stutter_self_refresh_exit_latency =bw_int_to_fixed (5 ); + vbios->stutter_self_refresh_entry_latency =bw_int_to_fixed (0 ); + vbios->nbp_state_change_latency =bw_int_to_fixed (45 ); + vbios->mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); + vbios->scatter_gather_enable = true; + vbios->down_spread_percentage =bw_frc_to_fixed (5 ,10 ); + vbios->cursor_width =32 ; + vbios->average_compression_rate =4 ; + vbios->number_of_request_slots_gmc_reserves_for_dmif_per_channel =256 ; + vbios->blackout_duration =bw_int_to_fixed (0 );/* us */ + vbios->maximum_blackout_recovery_time =bw_int_to_fixed (0 ); + + dceip->max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; + dceip->max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; + dceip->percent_of_ideal_port_bw_received_after_urgent_latency =100 ; + dceip->large_cursor = false; + dceip->dmif_request_buffer_size =bw_int_to_fixed (768 ); + dceip->dmif_pipe_en_fbc_chunk_tracker = false; + dceip->cursor_max_outstanding_group_num =1 ; + dceip->lines_interleaved_into_lb =2 ; + dceip->chunk_width =256 ; + dceip->number_of_graphics_pipes =5 ; + dceip->number_of_underlay_pipes =0 ; + dceip->low_power_tiling_mode =0 ; + dceip->display_write_back_supported = false; + dceip->argb_compression_support = true; + dceip->underlay_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35556 ,10000 ); - dceip.underlay_vscaler_efficiency8_bit_per_component = + dceip->underlay_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.underlay_vscaler_efficiency10_bit_per_component = + dceip->underlay_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.underlay_vscaler_efficiency12_bit_per_component = + dceip->underlay_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.graphics_vscaler_efficiency6_bit_per_component = + dceip->graphics_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35 ,10 ); - dceip.graphics_vscaler_efficiency8_bit_per_component = + dceip->graphics_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.graphics_vscaler_efficiency10_bit_per_component = + dceip->graphics_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.graphics_vscaler_efficiency12_bit_per_component = + dceip->graphics_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.alpha_vscaler_efficiency =bw_int_to_fixed (3 ); - dceip.max_dmif_buffer_allocated =4 ; - dceip.graphics_dmif_size =12288 ; - dceip.underlay_luma_dmif_size =19456 ; - dceip.underlay_chroma_dmif_size =23552 ; - dceip.pre_downscaler_enabled = true; - dceip.underlay_downscale_prefetch_enabled = true; - dceip.lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); - dceip.lb_size_per_component444 =bw_int_to_fixed (245952 ); - dceip.graphics_lb_nodownscaling_multi_line_prefetching = true; - dceip.stutter_and_dram_clock_state_change_gated_before_cursor = + dceip->alpha_vscaler_efficiency =bw_int_to_fixed (3 ); + dceip->max_dmif_buffer_allocated =4 ; + dceip->graphics_dmif_size =12288 ; + dceip->underlay_luma_dmif_size =19456 ; + dceip->underlay_chroma_dmif_size =23552 ; + dceip->pre_downscaler_enabled = true; + dceip->underlay_downscale_prefetch_enabled = true; + dceip->lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); + dceip->lb_size_per_component444 =bw_int_to_fixed (245952 ); + dceip->graphics_lb_nodownscaling_multi_line_prefetching = true; + dceip->stutter_and_dram_clock_state_change_gated_before_cursor =bw_int_to_fixed (1 ); - dceip.underlay420_luma_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay420_luma_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.underlay420_chroma_lb_size_per_component = + dceip->underlay420_chroma_lb_size_per_component =bw_int_to_fixed (164352 ); - dceip.underlay422_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay422_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.cursor_chunk_width =bw_int_to_fixed (64 ); - dceip.cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); - dceip.underlay_maximum_width_efficient_for_tiling = + dceip->cursor_chunk_width =bw_int_to_fixed (64 ); + dceip->cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); + dceip->underlay_maximum_width_efficient_for_tiling =bw_int_to_fixed (1920 ); - dceip.underlay_maximum_height_efficient_for_tiling = + dceip->underlay_maximum_height_efficient_for_tiling =bw_int_to_fixed (1080 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display = + dceip->peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display =bw_frc_to_fixed (3 ,10 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation = + dceip->peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation =bw_int_to_fixed (25 ); - dceip.minimum_outstanding_pte_request_limit =bw_int_to_fixed ( + dceip->minimum_outstanding_pte_request_limit =bw_int_to_fixed (2 ); - dceip.maximum_total_outstanding_pte_requests_allowed_by_saw = + dceip->maximum_total_outstanding_pte_requests_allowed_by_saw =bw_int_to_fixed (128 ); - dceip.limit_excessive_outstanding_dmif_requests = true; - dceip.linear_mode_line_request_alternation_slice = + dceip->limit_excessive_outstanding_dmif_requests = true; + dceip->linear_mode_line_request_alternation_slice =bw_int_to_fixed (64 ); - dceip.scatter_gather_lines_of_pte_prefetching_in_linear_mode = + dceip->scatter_gather_lines_of_pte_prefetching_in_linear_mode =32 ; - dceip.display_write_back420_luma_mcifwr_buffer_size =12288 ; - dceip.display_write_back420_chroma_mcifwr_buffer_size =8192 ; - dceip.request_efficiency =bw_frc_to_fixed (8 ,10 ); - dceip.dispclk_per_request =bw_int_to_fixed (2 ); - dceip.dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); - dceip.display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); - dceip.scatter_gather_pte_request_rows_in_tiling_mode =2 ; - dceip.mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 ); + dceip->display_write_back420_luma_mcifwr_buffer_size =12288 ; + dceip->display_write_back420_chroma_mcifwr_buffer_size =8192 ; + dceip->request_efficiency =bw_frc_to_fixed (8 ,10 ); + dceip->dispclk_per_request =bw_int_to_fixed (2 ); + dceip->dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); + dceip->display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); + dceip->scatter_gather_pte_request_rows_in_tiling_mode =2 ; + dceip->mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 );break ;case BW_CALCS_VERSION_POLARIS12 : - vbios.memory_type = bw_def_gddr5; - vbios.dram_channel_width_in_bits =32 ; - vbios.number_of_dram_channels = asic_id.vram_width / vbios.dram_channel_width_in_bits; - vbios.number_of_dram_banks =8 ; - vbios.high_yclk =bw_int_to_fixed (6000 ); - vbios.mid_yclk =bw_int_to_fixed (3200 ); - vbios.low_yclk =bw_int_to_fixed (1000 ); - vbios.low_sclk =bw_int_to_fixed (678 ); - vbios.mid1_sclk =bw_int_to_fixed (864 ); - vbios.mid2_sclk =bw_int_to_fixed (900 ); - vbios.mid3_sclk =bw_int_to_fixed (920 ); - vbios.mid4_sclk =bw_int_to_fixed (940 ); - vbios.mid5_sclk =bw_int_to_fixed (960 ); - vbios.mid6_sclk =bw_int_to_fixed (980 ); - vbios.high_sclk =bw_int_to_fixed (1049 ); - vbios.low_voltage_max_dispclk =bw_int_to_fixed (459 ); - vbios.mid_voltage_max_dispclk =bw_int_to_fixed (654 ); - vbios.high_voltage_max_dispclk =bw_int_to_fixed (1108 ); - vbios.low_voltage_max_phyclk =bw_int_to_fixed (540 ); - vbios.mid_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.high_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.data_return_bus_width =bw_int_to_fixed (32 ); - vbios.trc =bw_int_to_fixed (48 ); -if (vbios.number_of_dram_channels ==2 )// 64-bit - vbios.dmifmc_urgent_latency =bw_int_to_fixed (4 ); + vbios->memory_type = bw_def_gddr5; + vbios->dram_channel_width_in_bits =32 ; + vbios->number_of_dram_channels = asic_id.vram_width / vbios->dram_channel_width_in_bits; + vbios->number_of_dram_banks =8 ; + vbios->high_yclk =bw_int_to_fixed (6000 ); + vbios->mid_yclk =bw_int_to_fixed (3200 ); + vbios->low_yclk =bw_int_to_fixed (1000 ); + vbios->low_sclk =bw_int_to_fixed (678 ); + vbios->mid1_sclk =bw_int_to_fixed (864 ); + vbios->mid2_sclk =bw_int_to_fixed (900 ); + vbios->mid3_sclk =bw_int_to_fixed (920 ); + vbios->mid4_sclk =bw_int_to_fixed (940 ); + vbios->mid5_sclk =bw_int_to_fixed (960 ); + vbios->mid6_sclk =bw_int_to_fixed (980 ); + vbios->high_sclk =bw_int_to_fixed (1049 ); + vbios->low_voltage_max_dispclk =bw_int_to_fixed (459 ); + vbios->mid_voltage_max_dispclk =bw_int_to_fixed (654 ); + vbios->high_voltage_max_dispclk =bw_int_to_fixed (1108 ); + vbios->low_voltage_max_phyclk =bw_int_to_fixed (540 ); + vbios->mid_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->high_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->data_return_bus_width =bw_int_to_fixed (32 ); + vbios->trc =bw_int_to_fixed (48 ); +if (vbios->number_of_dram_channels ==2 )// 64-bit + vbios->dmifmc_urgent_latency =bw_int_to_fixed (4 );else - vbios.dmifmc_urgent_latency =bw_int_to_fixed (3 ); - vbios.stutter_self_refresh_exit_latency =bw_int_to_fixed (5 ); - vbios.stutter_self_refresh_entry_latency =bw_int_to_fixed (0 ); - vbios.nbp_state_change_latency =bw_int_to_fixed (250 ); - vbios.mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); - vbios.scatter_gather_enable = false; - vbios.down_spread_percentage =bw_frc_to_fixed (5 ,10 ); - vbios.cursor_width =32 ; - vbios.average_compression_rate =4 ; - vbios.number_of_request_slots_gmc_reserves_for_dmif_per_channel =256 ; - vbios.blackout_duration =bw_int_to_fixed (0 );/* us */ - vbios.maximum_blackout_recovery_time =bw_int_to_fixed (0 ); - - dceip.max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; - dceip.max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; - dceip.percent_of_ideal_port_bw_received_after_urgent_latency =100 ; - dceip.large_cursor = false; - dceip.dmif_request_buffer_size =bw_int_to_fixed (768 ); - dceip.dmif_pipe_en_fbc_chunk_tracker = false; - dceip.cursor_max_outstanding_group_num =1 ; - dceip.lines_interleaved_into_lb =2 ; - dceip.chunk_width =256 ; - dceip.number_of_graphics_pipes =5 ; - dceip.number_of_underlay_pipes =0 ; - dceip.low_power_tiling_mode =0 ; - dceip.display_write_back_supported = true; - dceip.argb_compression_support = true; - dceip.underlay_vscaler_efficiency6_bit_per_component = + vbios->dmifmc_urgent_latency =bw_int_to_fixed (3 ); + vbios->stutter_self_refresh_exit_latency =bw_int_to_fixed (5 ); + vbios->stutter_self_refresh_entry_latency =bw_int_to_fixed (0 ); + vbios->nbp_state_change_latency =bw_int_to_fixed (250 ); + vbios->mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); + vbios->scatter_gather_enable = false; + vbios->down_spread_percentage =bw_frc_to_fixed (5 ,10 ); + vbios->cursor_width =32 ; + vbios->average_compression_rate =4 ; + vbios->number_of_request_slots_gmc_reserves_for_dmif_per_channel =256 ; + vbios->blackout_duration =bw_int_to_fixed (0 );/* us */ + vbios->maximum_blackout_recovery_time =bw_int_to_fixed (0 ); + + dceip->max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; + dceip->max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; + dceip->percent_of_ideal_port_bw_received_after_urgent_latency =100 ; + dceip->large_cursor = false; + dceip->dmif_request_buffer_size =bw_int_to_fixed (768 ); + dceip->dmif_pipe_en_fbc_chunk_tracker = false; + dceip->cursor_max_outstanding_group_num =1 ; + dceip->lines_interleaved_into_lb =2 ; + dceip->chunk_width =256 ; + dceip->number_of_graphics_pipes =5 ; + dceip->number_of_underlay_pipes =0 ; + dceip->low_power_tiling_mode =0 ; + dceip->display_write_back_supported = true; + dceip->argb_compression_support = true; + dceip->underlay_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35556 ,10000 ); - dceip.underlay_vscaler_efficiency8_bit_per_component = + dceip->underlay_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.underlay_vscaler_efficiency10_bit_per_component = + dceip->underlay_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.underlay_vscaler_efficiency12_bit_per_component = + dceip->underlay_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.graphics_vscaler_efficiency6_bit_per_component = + dceip->graphics_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35 ,10 ); - dceip.graphics_vscaler_efficiency8_bit_per_component = + dceip->graphics_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.graphics_vscaler_efficiency10_bit_per_component = + dceip->graphics_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.graphics_vscaler_efficiency12_bit_per_component = + dceip->graphics_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.alpha_vscaler_efficiency =bw_int_to_fixed (3 ); - dceip.max_dmif_buffer_allocated =4 ; - dceip.graphics_dmif_size =12288 ; - dceip.underlay_luma_dmif_size =19456 ; - dceip.underlay_chroma_dmif_size =23552 ; - dceip.pre_downscaler_enabled = true; - dceip.underlay_downscale_prefetch_enabled = true; - dceip.lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); - dceip.lb_size_per_component444 =bw_int_to_fixed (245952 ); - dceip.graphics_lb_nodownscaling_multi_line_prefetching = true; - dceip.stutter_and_dram_clock_state_change_gated_before_cursor = + dceip->alpha_vscaler_efficiency =bw_int_to_fixed (3 ); + dceip->max_dmif_buffer_allocated =4 ; + dceip->graphics_dmif_size =12288 ; + dceip->underlay_luma_dmif_size =19456 ; + dceip->underlay_chroma_dmif_size =23552 ; + dceip->pre_downscaler_enabled = true; + dceip->underlay_downscale_prefetch_enabled = true; + dceip->lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); + dceip->lb_size_per_component444 =bw_int_to_fixed (245952 ); + dceip->graphics_lb_nodownscaling_multi_line_prefetching = true; + dceip->stutter_and_dram_clock_state_change_gated_before_cursor =bw_int_to_fixed (1 ); - dceip.underlay420_luma_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay420_luma_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.underlay420_chroma_lb_size_per_component = + dceip->underlay420_chroma_lb_size_per_component =bw_int_to_fixed (164352 ); - dceip.underlay422_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay422_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.cursor_chunk_width =bw_int_to_fixed (64 ); - dceip.cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); - dceip.underlay_maximum_width_efficient_for_tiling = + dceip->cursor_chunk_width =bw_int_to_fixed (64 ); + dceip->cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); + dceip->underlay_maximum_width_efficient_for_tiling =bw_int_to_fixed (1920 ); - dceip.underlay_maximum_height_efficient_for_tiling = + dceip->underlay_maximum_height_efficient_for_tiling =bw_int_to_fixed (1080 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display = + dceip->peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display =bw_frc_to_fixed (3 ,10 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation = + dceip->peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation =bw_int_to_fixed (25 ); - dceip.minimum_outstanding_pte_request_limit =bw_int_to_fixed ( + dceip->minimum_outstanding_pte_request_limit =bw_int_to_fixed (2 ); - dceip.maximum_total_outstanding_pte_requests_allowed_by_saw = + dceip->maximum_total_outstanding_pte_requests_allowed_by_saw =bw_int_to_fixed (128 ); - dceip.limit_excessive_outstanding_dmif_requests = true; - dceip.linear_mode_line_request_alternation_slice = + dceip->limit_excessive_outstanding_dmif_requests = true; + dceip->linear_mode_line_request_alternation_slice =bw_int_to_fixed (64 ); - dceip.scatter_gather_lines_of_pte_prefetching_in_linear_mode = + dceip->scatter_gather_lines_of_pte_prefetching_in_linear_mode =32 ; - dceip.display_write_back420_luma_mcifwr_buffer_size =12288 ; - dceip.display_write_back420_chroma_mcifwr_buffer_size =8192 ; - dceip.request_efficiency =bw_frc_to_fixed (8 ,10 ); - dceip.dispclk_per_request =bw_int_to_fixed (2 ); - dceip.dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); - dceip.display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); - dceip.scatter_gather_pte_request_rows_in_tiling_mode =2 ; - dceip.mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 ); + dceip->display_write_back420_luma_mcifwr_buffer_size =12288 ; + dceip->display_write_back420_chroma_mcifwr_buffer_size =8192 ; + dceip->request_efficiency =bw_frc_to_fixed (8 ,10 ); + dceip->dispclk_per_request =bw_int_to_fixed (2 ); + dceip->dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); + dceip->display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); + dceip->scatter_gather_pte_request_rows_in_tiling_mode =2 ; + dceip->mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 );break ;case BW_CALCS_VERSION_STONEY : - vbios.memory_type = bw_def_gddr5; - vbios.dram_channel_width_in_bits =64 ; - vbios.number_of_dram_channels = asic_id.vram_width / vbios.dram_channel_width_in_bits; - vbios.number_of_dram_banks =8 ; - vbios.high_yclk =bw_int_to_fixed (1866 ); - vbios.mid_yclk =bw_int_to_fixed (1866 ); - vbios.low_yclk =bw_int_to_fixed (1333 ); - vbios.low_sclk =bw_int_to_fixed (200 ); - vbios.mid1_sclk =bw_int_to_fixed (600 ); - vbios.mid2_sclk =bw_int_to_fixed (600 ); - vbios.mid3_sclk =bw_int_to_fixed (600 ); - vbios.mid4_sclk =bw_int_to_fixed (600 ); - vbios.mid5_sclk =bw_int_to_fixed (600 ); - vbios.mid6_sclk =bw_int_to_fixed (600 ); - vbios.high_sclk =bw_int_to_fixed (800 ); - vbios.low_voltage_max_dispclk =bw_int_to_fixed (352 ); - vbios.mid_voltage_max_dispclk =bw_int_to_fixed (467 ); - vbios.high_voltage_max_dispclk =bw_int_to_fixed (643 ); - vbios.low_voltage_max_phyclk =bw_int_to_fixed (540 ); - vbios.mid_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.high_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.data_return_bus_width =bw_int_to_fixed (32 ); - vbios.trc =bw_int_to_fixed (50 ); - vbios.dmifmc_urgent_latency =bw_int_to_fixed (4 ); - vbios.stutter_self_refresh_exit_latency =bw_frc_to_fixed (158 ,10 ); - vbios.stutter_self_refresh_entry_latency =bw_int_to_fixed (0 ); - vbios.nbp_state_change_latency =bw_frc_to_fixed (2008 ,100 ); - vbios.mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); - vbios.scatter_gather_enable = true; - vbios.down_spread_percentage =bw_frc_to_fixed (5 ,10 ); - vbios.cursor_width =32 ; - vbios.average_compression_rate =4 ; - vbios.number_of_request_slots_gmc_reserves_for_dmif_per_channel =256 ; - vbios.blackout_duration =bw_int_to_fixed (0 );/* us */ - vbios.maximum_blackout_recovery_time =bw_int_to_fixed (0 ); - - dceip.max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; - dceip.max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; - dceip.percent_of_ideal_port_bw_received_after_urgent_latency =100 ; - dceip.large_cursor = false; - dceip.dmif_request_buffer_size =bw_int_to_fixed (768 ); - dceip.dmif_pipe_en_fbc_chunk_tracker = false; - dceip.cursor_max_outstanding_group_num =1 ; - dceip.lines_interleaved_into_lb =2 ; - dceip.chunk_width =256 ; - dceip.number_of_graphics_pipes =2 ; - dceip.number_of_underlay_pipes =1 ; - dceip.low_power_tiling_mode =0 ; - dceip.display_write_back_supported = false; - dceip.argb_compression_support = true; - dceip.underlay_vscaler_efficiency6_bit_per_component = + vbios->memory_type = bw_def_gddr5; + vbios->dram_channel_width_in_bits =64 ; + vbios->number_of_dram_channels = asic_id.vram_width / vbios->dram_channel_width_in_bits; + vbios->number_of_dram_banks =8 ; + vbios->high_yclk =bw_int_to_fixed (1866 ); + vbios->mid_yclk =bw_int_to_fixed (1866 ); + vbios->low_yclk =bw_int_to_fixed (1333 ); + vbios->low_sclk =bw_int_to_fixed (200 ); + vbios->mid1_sclk =bw_int_to_fixed (600 ); + vbios->mid2_sclk =bw_int_to_fixed (600 ); + vbios->mid3_sclk =bw_int_to_fixed (600 ); + vbios->mid4_sclk =bw_int_to_fixed (600 ); + vbios->mid5_sclk =bw_int_to_fixed (600 ); + vbios->mid6_sclk =bw_int_to_fixed (600 ); + vbios->high_sclk =bw_int_to_fixed (800 ); + vbios->low_voltage_max_dispclk =bw_int_to_fixed (352 ); + vbios->mid_voltage_max_dispclk =bw_int_to_fixed (467 ); + vbios->high_voltage_max_dispclk =bw_int_to_fixed (643 ); + vbios->low_voltage_max_phyclk =bw_int_to_fixed (540 ); + vbios->mid_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->high_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->data_return_bus_width =bw_int_to_fixed (32 ); + vbios->trc =bw_int_to_fixed (50 ); + vbios->dmifmc_urgent_latency =bw_int_to_fixed (4 ); + vbios->stutter_self_refresh_exit_latency =bw_frc_to_fixed (158 ,10 ); + vbios->stutter_self_refresh_entry_latency =bw_int_to_fixed (0 ); + vbios->nbp_state_change_latency =bw_frc_to_fixed (2008 ,100 ); + vbios->mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); + vbios->scatter_gather_enable = true; + vbios->down_spread_percentage =bw_frc_to_fixed (5 ,10 ); + vbios->cursor_width =32 ; + vbios->average_compression_rate =4 ; + vbios->number_of_request_slots_gmc_reserves_for_dmif_per_channel =256 ; + vbios->blackout_duration =bw_int_to_fixed (0 );/* us */ + vbios->maximum_blackout_recovery_time =bw_int_to_fixed (0 ); + + dceip->max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; + dceip->max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; + dceip->percent_of_ideal_port_bw_received_after_urgent_latency =100 ; + dceip->large_cursor = false; + dceip->dmif_request_buffer_size =bw_int_to_fixed (768 ); + dceip->dmif_pipe_en_fbc_chunk_tracker = false; + dceip->cursor_max_outstanding_group_num =1 ; + dceip->lines_interleaved_into_lb =2 ; + dceip->chunk_width =256 ; + dceip->number_of_graphics_pipes =2 ; + dceip->number_of_underlay_pipes =1 ; + dceip->low_power_tiling_mode =0 ; + dceip->display_write_back_supported = false; + dceip->argb_compression_support = true; + dceip->underlay_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35556 ,10000 ); - dceip.underlay_vscaler_efficiency8_bit_per_component = + dceip->underlay_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.underlay_vscaler_efficiency10_bit_per_component = + dceip->underlay_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.underlay_vscaler_efficiency12_bit_per_component = + dceip->underlay_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.graphics_vscaler_efficiency6_bit_per_component = + dceip->graphics_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35 ,10 ); - dceip.graphics_vscaler_efficiency8_bit_per_component = + dceip->graphics_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.graphics_vscaler_efficiency10_bit_per_component = + dceip->graphics_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.graphics_vscaler_efficiency12_bit_per_component = + dceip->graphics_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.alpha_vscaler_efficiency =bw_int_to_fixed (3 ); - dceip.max_dmif_buffer_allocated =2 ; - dceip.graphics_dmif_size =12288 ; - dceip.underlay_luma_dmif_size =19456 ; - dceip.underlay_chroma_dmif_size =23552 ; - dceip.pre_downscaler_enabled = true; - dceip.underlay_downscale_prefetch_enabled = true; - dceip.lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); - dceip.lb_size_per_component444 =bw_int_to_fixed (82176 ); - dceip.graphics_lb_nodownscaling_multi_line_prefetching = false; - dceip.stutter_and_dram_clock_state_change_gated_before_cursor = + dceip->alpha_vscaler_efficiency =bw_int_to_fixed (3 ); + dceip->max_dmif_buffer_allocated =2 ; + dceip->graphics_dmif_size =12288 ; + dceip->underlay_luma_dmif_size =19456 ; + dceip->underlay_chroma_dmif_size =23552 ; + dceip->pre_downscaler_enabled = true; + dceip->underlay_downscale_prefetch_enabled = true; + dceip->lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); + dceip->lb_size_per_component444 =bw_int_to_fixed (82176 ); + dceip->graphics_lb_nodownscaling_multi_line_prefetching = false; + dceip->stutter_and_dram_clock_state_change_gated_before_cursor =bw_int_to_fixed (0 ); - dceip.underlay420_luma_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay420_luma_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.underlay420_chroma_lb_size_per_component = + dceip->underlay420_chroma_lb_size_per_component =bw_int_to_fixed (164352 ); - dceip.underlay422_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay422_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.cursor_chunk_width =bw_int_to_fixed (64 ); - dceip.cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); - dceip.underlay_maximum_width_efficient_for_tiling = + dceip->cursor_chunk_width =bw_int_to_fixed (64 ); + dceip->cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); + dceip->underlay_maximum_width_efficient_for_tiling =bw_int_to_fixed (1920 ); - dceip.underlay_maximum_height_efficient_for_tiling = + dceip->underlay_maximum_height_efficient_for_tiling =bw_int_to_fixed (1080 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display = + dceip->peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display =bw_frc_to_fixed (3 ,10 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation = + dceip->peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation =bw_int_to_fixed (25 ); - dceip.minimum_outstanding_pte_request_limit =bw_int_to_fixed ( + dceip->minimum_outstanding_pte_request_limit =bw_int_to_fixed (2 ); - dceip.maximum_total_outstanding_pte_requests_allowed_by_saw = + dceip->maximum_total_outstanding_pte_requests_allowed_by_saw =bw_int_to_fixed (128 ); - dceip.limit_excessive_outstanding_dmif_requests = true; - dceip.linear_mode_line_request_alternation_slice = + dceip->limit_excessive_outstanding_dmif_requests = true; + dceip->linear_mode_line_request_alternation_slice =bw_int_to_fixed (64 ); - dceip.scatter_gather_lines_of_pte_prefetching_in_linear_mode = + dceip->scatter_gather_lines_of_pte_prefetching_in_linear_mode =32 ; - dceip.display_write_back420_luma_mcifwr_buffer_size =12288 ; - dceip.display_write_back420_chroma_mcifwr_buffer_size =8192 ; - dceip.request_efficiency =bw_frc_to_fixed (8 ,10 ); - dceip.dispclk_per_request =bw_int_to_fixed (2 ); - dceip.dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); - dceip.display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); - dceip.scatter_gather_pte_request_rows_in_tiling_mode =2 ; - dceip.mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 ); + dceip->display_write_back420_luma_mcifwr_buffer_size =12288 ; + dceip->display_write_back420_chroma_mcifwr_buffer_size =8192 ; + dceip->request_efficiency =bw_frc_to_fixed (8 ,10 ); + dceip->dispclk_per_request =bw_int_to_fixed (2 ); + dceip->dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); + dceip->display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); + dceip->scatter_gather_pte_request_rows_in_tiling_mode =2 ; + dceip->mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 );break ;case BW_CALCS_VERSION_VEGA10 : - vbios.memory_type = bw_def_hbm; - vbios.dram_channel_width_in_bits =128 ; - vbios.number_of_dram_channels = asic_id.vram_width / vbios.dram_channel_width_in_bits; - vbios.number_of_dram_banks =16 ; - vbios.high_yclk =bw_int_to_fixed (2400 ); - vbios.mid_yclk =bw_int_to_fixed (1700 ); - vbios.low_yclk =bw_int_to_fixed (1000 ); - vbios.low_sclk =bw_int_to_fixed (300 ); - vbios.mid1_sclk =bw_int_to_fixed (350 ); - vbios.mid2_sclk =bw_int_to_fixed (400 ); - vbios.mid3_sclk =bw_int_to_fixed (500 ); - vbios.mid4_sclk =bw_int_to_fixed (600 ); - vbios.mid5_sclk =bw_int_to_fixed (700 ); - vbios.mid6_sclk =bw_int_to_fixed (760 ); - vbios.high_sclk =bw_int_to_fixed (776 ); - vbios.low_voltage_max_dispclk =bw_int_to_fixed (460 ); - vbios.mid_voltage_max_dispclk =bw_int_to_fixed (670 ); - vbios.high_voltage_max_dispclk =bw_int_to_fixed (1133 ); - vbios.low_voltage_max_phyclk =bw_int_to_fixed (540 ); - vbios.mid_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.high_voltage_max_phyclk =bw_int_to_fixed (810 ); - vbios.data_return_bus_width =bw_int_to_fixed (32 ); - vbios.trc =bw_int_to_fixed (48 ); - vbios.dmifmc_urgent_latency =bw_int_to_fixed (3 ); - vbios.stutter_self_refresh_exit_latency =bw_frc_to_fixed (75 ,10 ); - vbios.stutter_self_refresh_entry_latency =bw_frc_to_fixed (19 ,10 ); - vbios.nbp_state_change_latency =bw_int_to_fixed (39 ); - vbios.mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); - vbios.scatter_gather_enable = false; - vbios.down_spread_percentage =bw_frc_to_fixed (5 ,10 ); - vbios.cursor_width =32 ; - vbios.average_compression_rate =4 ; - vbios.number_of_request_slots_gmc_reserves_for_dmif_per_channel =8 ; - vbios.blackout_duration =bw_int_to_fixed (0 );/* us */ - vbios.maximum_blackout_recovery_time =bw_int_to_fixed (0 ); - - dceip.max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; - dceip.max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; - dceip.percent_of_ideal_port_bw_received_after_urgent_latency =100 ; - dceip.large_cursor = false; - dceip.dmif_request_buffer_size =bw_int_to_fixed (2304 ); - dceip.dmif_pipe_en_fbc_chunk_tracker = true; - dceip.cursor_max_outstanding_group_num =1 ; - dceip.lines_interleaved_into_lb =2 ; - dceip.chunk_width =256 ; - dceip.number_of_graphics_pipes =6 ; - dceip.number_of_underlay_pipes =0 ; - dceip.low_power_tiling_mode =0 ; - dceip.display_write_back_supported = true; - dceip.argb_compression_support = true; - dceip.underlay_vscaler_efficiency6_bit_per_component = + vbios->memory_type = bw_def_hbm; + vbios->dram_channel_width_in_bits =128 ; + vbios->number_of_dram_channels = asic_id.vram_width / vbios->dram_channel_width_in_bits; + vbios->number_of_dram_banks =16 ; + vbios->high_yclk =bw_int_to_fixed (2400 ); + vbios->mid_yclk =bw_int_to_fixed (1700 ); + vbios->low_yclk =bw_int_to_fixed (1000 ); + vbios->low_sclk =bw_int_to_fixed (300 ); + vbios->mid1_sclk =bw_int_to_fixed (350 ); + vbios->mid2_sclk =bw_int_to_fixed (400 ); + vbios->mid3_sclk =bw_int_to_fixed (500 ); + vbios->mid4_sclk =bw_int_to_fixed (600 ); + vbios->mid5_sclk =bw_int_to_fixed (700 ); + vbios->mid6_sclk =bw_int_to_fixed (760 ); + vbios->high_sclk =bw_int_to_fixed (776 ); + vbios->low_voltage_max_dispclk =bw_int_to_fixed (460 ); + vbios->mid_voltage_max_dispclk =bw_int_to_fixed (670 ); + vbios->high_voltage_max_dispclk =bw_int_to_fixed (1133 ); + vbios->low_voltage_max_phyclk =bw_int_to_fixed (540 ); + vbios->mid_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->high_voltage_max_phyclk =bw_int_to_fixed (810 ); + vbios->data_return_bus_width =bw_int_to_fixed (32 ); + vbios->trc =bw_int_to_fixed (48 ); + vbios->dmifmc_urgent_latency =bw_int_to_fixed (3 ); + vbios->stutter_self_refresh_exit_latency =bw_frc_to_fixed (75 ,10 ); + vbios->stutter_self_refresh_entry_latency =bw_frc_to_fixed (19 ,10 ); + vbios->nbp_state_change_latency =bw_int_to_fixed (39 ); + vbios->mcifwrmc_urgent_latency =bw_int_to_fixed (10 ); + vbios->scatter_gather_enable = false; + vbios->down_spread_percentage =bw_frc_to_fixed (5 ,10 ); + vbios->cursor_width =32 ; + vbios->average_compression_rate =4 ; + vbios->number_of_request_slots_gmc_reserves_for_dmif_per_channel =8 ; + vbios->blackout_duration =bw_int_to_fixed (0 );/* us */ + vbios->maximum_blackout_recovery_time =bw_int_to_fixed (0 ); + + dceip->max_average_percent_of_ideal_port_bw_display_can_use_in_normal_system_operation =100 ; + dceip->max_average_percent_of_ideal_drambw_display_can_use_in_normal_system_operation =100 ; + dceip->percent_of_ideal_port_bw_received_after_urgent_latency =100 ; + dceip->large_cursor = false; + dceip->dmif_request_buffer_size =bw_int_to_fixed (2304 ); + dceip->dmif_pipe_en_fbc_chunk_tracker = true; + dceip->cursor_max_outstanding_group_num =1 ; + dceip->lines_interleaved_into_lb =2 ; + dceip->chunk_width =256 ; + dceip->number_of_graphics_pipes =6 ; + dceip->number_of_underlay_pipes =0 ; + dceip->low_power_tiling_mode =0 ; + dceip->display_write_back_supported = true; + dceip->argb_compression_support = true; + dceip->underlay_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35556 ,10000 ); - dceip.underlay_vscaler_efficiency8_bit_per_component = + dceip->underlay_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.underlay_vscaler_efficiency10_bit_per_component = + dceip->underlay_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.underlay_vscaler_efficiency12_bit_per_component = + dceip->underlay_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.graphics_vscaler_efficiency6_bit_per_component = + dceip->graphics_vscaler_efficiency6_bit_per_component =bw_frc_to_fixed (35 ,10 ); - dceip.graphics_vscaler_efficiency8_bit_per_component = + dceip->graphics_vscaler_efficiency8_bit_per_component =bw_frc_to_fixed (34286 ,10000 ); - dceip.graphics_vscaler_efficiency10_bit_per_component = + dceip->graphics_vscaler_efficiency10_bit_per_component =bw_frc_to_fixed (32 ,10 ); - dceip.graphics_vscaler_efficiency12_bit_per_component = + dceip->graphics_vscaler_efficiency12_bit_per_component =bw_int_to_fixed (3 ); - dceip.alpha_vscaler_efficiency =bw_int_to_fixed (3 ); - dceip.max_dmif_buffer_allocated =4 ; - dceip.graphics_dmif_size =24576 ; - dceip.underlay_luma_dmif_size =19456 ; - dceip.underlay_chroma_dmif_size =23552 ; - dceip.pre_downscaler_enabled = true; - dceip.underlay_downscale_prefetch_enabled = false; - dceip.lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); - dceip.lb_size_per_component444 =bw_int_to_fixed (245952 ); - dceip.graphics_lb_nodownscaling_multi_line_prefetching = true; - dceip.stutter_and_dram_clock_state_change_gated_before_cursor = + dceip->alpha_vscaler_efficiency =bw_int_to_fixed (3 ); + dceip->max_dmif_buffer_allocated =4 ; + dceip->graphics_dmif_size =24576 ; + dceip->underlay_luma_dmif_size =19456 ; + dceip->underlay_chroma_dmif_size =23552 ; + dceip->pre_downscaler_enabled = true; + dceip->underlay_downscale_prefetch_enabled = false; + dceip->lb_write_pixels_per_dispclk =bw_int_to_fixed (1 ); + dceip->lb_size_per_component444 =bw_int_to_fixed (245952 ); + dceip->graphics_lb_nodownscaling_multi_line_prefetching = true; + dceip->stutter_and_dram_clock_state_change_gated_before_cursor =bw_int_to_fixed (1 ); - dceip.underlay420_luma_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay420_luma_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.underlay420_chroma_lb_size_per_component = + dceip->underlay420_chroma_lb_size_per_component =bw_int_to_fixed (164352 ); - dceip.underlay422_lb_size_per_component =bw_int_to_fixed ( + dceip->underlay422_lb_size_per_component =bw_int_to_fixed (82176 ); - dceip.cursor_chunk_width =bw_int_to_fixed (64 ); - dceip.cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); - dceip.underlay_maximum_width_efficient_for_tiling = + dceip->cursor_chunk_width =bw_int_to_fixed (64 ); + dceip->cursor_dcp_buffer_lines =bw_int_to_fixed (4 ); + dceip->underlay_maximum_width_efficient_for_tiling =bw_int_to_fixed (1920 ); - dceip.underlay_maximum_height_efficient_for_tiling = + dceip->underlay_maximum_height_efficient_for_tiling =bw_int_to_fixed (1080 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display = + dceip->peak_pte_request_to_eviction_ratio_limiting_multiple_displays_or_single_rotated_display =bw_frc_to_fixed (3 ,10 ); - dceip.peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation = + dceip->peak_pte_request_to_eviction_ratio_limiting_single_display_no_rotation =bw_int_to_fixed (25 ); - dceip.minimum_outstanding_pte_request_limit =bw_int_to_fixed ( + dceip->minimum_outstanding_pte_request_limit =bw_int_to_fixed (2 ); - dceip.maximum_total_outstanding_pte_requests_allowed_by_saw = + dceip->maximum_total_outstanding_pte_requests_allowed_by_saw =bw_int_to_fixed (128 ); - dceip.limit_excessive_outstanding_dmif_requests = true; - dceip.linear_mode_line_request_alternation_slice = + dceip->limit_excessive_outstanding_dmif_requests = true; + dceip->linear_mode_line_request_alternation_slice =bw_int_to_fixed (64 ); - dceip.scatter_gather_lines_of_pte_prefetching_in_linear_mode = + dceip->scatter_gather_lines_of_pte_prefetching_in_linear_mode =32 ; - dceip.display_write_back420_luma_mcifwr_buffer_size =12288 ; - dceip.display_write_back420_chroma_mcifwr_buffer_size =8192 ; - dceip.request_efficiency =bw_frc_to_fixed (8 ,10 ); - dceip.dispclk_per_request =bw_int_to_fixed (2 ); - dceip.dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); - dceip.display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); - dceip.scatter_gather_pte_request_rows_in_tiling_mode =2 ; - dceip.mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 ); + dceip->display_write_back420_luma_mcifwr_buffer_size =12288 ; + dceip->display_write_back420_chroma_mcifwr_buffer_size =8192 ; + dceip->request_efficiency =bw_frc_to_fixed (8 ,10 ); + dceip->dispclk_per_request =bw_int_to_fixed (2 ); + dceip->dispclk_ramping_factor =bw_frc_to_fixed (105 ,100 ); + dceip->display_pipe_throughput_factor =bw_frc_to_fixed (105 ,100 ); + dceip->scatter_gather_pte_request_rows_in_tiling_mode =2 ; + dceip->mcifwr_all_surfaces_burst_time =bw_int_to_fixed (0 );break ;default :break ; } - *bw_dceip = dceip; - *bw_vbios = vbios; + *bw_dceip = *dceip; + *bw_vbios = *vbios; +kfree (dceip); +kfree (vbios); }/*
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
kernel test robot
build botRe: [PATCH 07/19] drm/amd/display/dc/calcs/dce_calcs: Remove some large variables from the stack
I love your patch! Perhaps something to improve:
Hi Lee,
I love your patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.12-rc3 next-20210319]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Lee-Jones/Rid-GPU-from-W-1-warnings/20210319-162705 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 8b12a62a4e3ed4ae99c715034f557eb391d6b196 config: x86_64-allyesconfig (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
If you fix the issue, kindly add following tag as appropriate
cocci warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c:2054:17-23: ERROR: application of sizeof to pointer
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c:2058:17-23: ERROR: application of sizeof to pointer
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build bot[PATCH] drm/amd/display/dc/calcs/dce_calcs: fix noderef.cocci warnings
In reply to Lee Jonesdrivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c:2054:17-23: ERROR: application of sizeof to pointer drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c:2058:17-23: ERROR: application of sizeof to…
From: kernel test robot <[email protected]>
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c:2054:17-23: ERROR: application of sizeof to pointer drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c:2058:17-23: ERROR: application of sizeof to pointer
sizeof when applied to a pointer typed expression gives the size of the pointer
Generated by: scripts/coccinelle/misc/noderef.cocci
---
url: https://github.com/0day-ci/linux/commits/Lee-Jones/Rid-GPU-from-W-1-warnings/20210319-162705 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 8b12a62a4e3ed4ae99c715034f557eb391d6b196
dce_calcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +2 -2
@@ -2051,11 +2051,11 @@ void bw_calcs_init(struct bw_calcs_dceipenum bw_calcs_version version =bw_calcs_version_from_asic_id (asic_id); - dceip =kzalloc (sizeof (dceip),GFP_KERNEL ); + dceip =kzalloc (sizeof (*dceip),GFP_KERNEL );if (!dceip)return ; - vbios =kzalloc (sizeof (vbios),GFP_KERNEL ); + vbios =kzalloc (sizeof (*vbios),GFP_KERNEL );if (!vbios) {kfree (dceip);return ;
PATCH 8/19 drm/amd/display/dc/dce80/dce80_resource: Make local functions static
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:527:17: warning: no previous prototype for ‘dce80_aux_engine_create’ [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:565:20: warning: no previous prototype for ‘dce80_i2c_hw_create’ [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:581:20: warning: no previous prototype for ‘dce80_i2c_sw_create’ [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:715:22: warning: no previous prototype for ‘dce80_link_encoder_create’ [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:754:22: warning: no previous prototype for ‘dce80_clock_source_create’ [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:778:6: warning: no previous prototype for ‘dce80_clock_source_destroy’ [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:868:6: warning: no previous prototype for ‘dce80_validate_bandwidth’ [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:913:16: warning: no previous prototype for ‘dce80_validate_global’ [-Wmissing-prototypes]
--- .../drm/amd/display/dc/dce80/dce80_resource.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +8 -8
@@ -526,7 +526,7 @@ static struct output_pixel_processor *dce80_opp_create(return &opp->base; } -struct dce_aux *dce80_aux_engine_create ( +static struct dce_aux *dce80_aux_engine_create (struct dc_context *ctx,uint32_t inst) {
@@ -564,7 +564,7 @@ static const struct dce_i2c_mask i2c_masks = { I2C_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(_MASK) }; -struct dce_i2c_hw *dce80_i2c_hw_create ( +static struct dce_i2c_hw *dce80_i2c_hw_create (struct dc_context *ctx,uint32_t inst) {
@@ -580,7 +580,7 @@ struct dce_i2c_hw *dce80_i2c_hw_create(return dce_i2c_hw; } -struct dce_i2c_sw *dce80_i2c_sw_create ( +static struct dce_i2c_sw *dce80_i2c_sw_create (struct dc_context *ctx) { struct dce_i2c_sw *dce_i2c_sw =
@@ -714,7 +714,7 @@ static const struct encoder_feature_support link_enc_feature = { .flags.bits.IS_TPS3_CAPABLE = true }; -struct link_encoder *dce80_link_encoder_create ( +static struct link_encoder *dce80_link_encoder_create (const struct encoder_init_data *enc_init_data) { struct dce110_link_encoder *enc110 =
@@ -753,7 +753,7 @@ static struct panel_cntl *dce80_panel_cntl_create(const struct panel_cntl_init_dreturn &panel_cntl->base; } -struct clock_source *dce80_clock_source_create( +static struct clock_source *dce80_clock_source_create( struct dc_context *ctx, struct dc_bios *bios, enum clock_source_id id,
@@ -777,7 +777,7 @@ struct clock_source *dce80_clock_source_create(return NULL ; } -void dce80_clock_source_destroy (struct clock_source **clk_src) +static void dce80_clock_source_destroy (struct clock_source **clk_src) {kfree (TO_DCE110_CLK_SRC (*clk_src)); *clk_src =NULL ;
@@ -867,7 +867,7 @@ static void dce80_resource_destruct(struct dce110_resource_pool *pool) } } -bool dce80_validate_bandwidth ( +static bool dce80_validate_bandwidth (struct dc *dc,struct dc_state *context,bool fast_validate)
@@ -912,7 +912,7 @@ static bool dce80_validate_surface_sets(return true; } -enum dc_status dce80_validate_global ( +static enum dc_status dce80_validate_global (struct dc *dc,struct dc_state *context) {
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Alex Deucher
AppliedRe: [PATCH 08/19] drm/amd/display/dc/dce80/dce80_resource: Make local functions static
Quoted 12 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:527:17: warning: no previous prototype for ‘dce80_aux_engine_create’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:565:20: warning: no previous prototype for ‘dce80_i2c_hw_create’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:581:20: warning: no previous prototype for ‘dce80_i2c_sw_create’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:715:22: warning: no previous prototype for ‘dce80_link_encoder_create’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:754:22: warning: no previous prototype for ‘dce80_clock_source_create’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:778:6: warning: no previous prototype for ‘dce80_clock_source_destroy’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:868:6: warning: no previous prototype for ‘dce80_validate_bandwidth’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:913:16: warning: no previous prototype for ‘dce80_validate_global’ [-Wmissing-prototypes]
Quoted 10 lines
Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Anthony Koo <[email protected]>Signed-off-by Lee Jones <[email protected]>
Applied. Thanks!
Alex
Quoted 83 lines
--- .../drm/amd/display/dc/dce80/dce80_resource.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +8
-9@@ -526,7 +526,7 @@ static struct output_pixel_processor *dce80_opp_create(return &opp->base; } -struct dce_aux *dce80_aux_engine_create ( +static struct dce_aux *dce80_aux_engine_create (struct dc_context *ctx,uint32_t inst) {@@ -564,7 +564,7 @@ static const struct dce_i2c_mask i2c_masks = { I2C_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(_MASK) }; -struct dce_i2c_hw *dce80_i2c_hw_create ( +static struct dce_i2c_hw *dce80_i2c_hw_create (struct dc_context *ctx,uint32_t inst) {@@ -580,7 +580,7 @@ struct dce_i2c_hw *dce80_i2c_hw_create(return dce_i2c_hw; } -struct dce_i2c_sw *dce80_i2c_sw_create ( +static struct dce_i2c_sw *dce80_i2c_sw_create (struct dc_context *ctx) { struct dce_i2c_sw *dce_i2c_sw =@@ -714,7 +714,7 @@ static const struct encoder_feature_support link_enc_feature = { .flags.bits.IS_TPS3_CAPABLE = true }; -struct link_encoder *dce80_link_encoder_create ( +static struct link_encoder *dce80_link_encoder_create (const struct encoder_init_data *enc_init_data) { struct dce110_link_encoder *enc110 =@@ -753,7 +753,7 @@ static struct panel_cntl *dce80_panel_cntl_create(const struct panel_cntl_init_dreturn &panel_cntl->base; } -struct clock_source *dce80_clock_source_create( +static struct clock_source *dce80_clock_source_create( struct dc_context *ctx, struct dc_bios *bios, enum clock_source_id id,@@ -777,7 +777,7 @@ struct clock_source *dce80_clock_source_create(return NULL ; } -void dce80_clock_source_destroy (struct clock_source **clk_src) +static void dce80_clock_source_destroy (struct clock_source **clk_src) {kfree (TO_DCE110_CLK_SRC (*clk_src)); *clk_src =NULL ;@@ -867,7 +867,7 @@ static void dce80_resource_destruct(struct dce110_resource_pool *pool) } } -bool dce80_validate_bandwidth ( +static bool dce80_validate_bandwidth (struct dc *dc,struct dc_state *context,bool fast_validate)@@ -912,7 +912,7 @@ static bool dce80_validate_surface_sets(return true; } -enum dc_status dce80_validate_global ( +static enum dc_status dce80_validate_global (struct dc *dc,struct dc_state *context) { --2.27.0
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 08/19] drm/amd/display/dc/dce80/dce80_resource: Make local functions static
In reply to Lee JonesQuoted 11 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:527:17: warning: no previous prototype for ‘dce80_aux_engine_create’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:565:20: warning: no previous prototype for ‘dce80_i2c_hw_create’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:581:20: warning: no previous prototype for ‘dce80_i2c_sw_create’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:715:22: warning: no previous prototype for ‘dce80_link_encoder_create’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:754:22: warning: no previous prototype for ‘dce80_clock_source_create’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:778:6: warning: no previous prototype for ‘dce80_clock_source_destroy’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:868:6: warning: no previous prototype for ‘dce80_validate_bandwidth’ [-Wmissing-prototypes]drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.c:913:16: warning: no previous prototype for ‘dce80_validate_global’ [-Wmissing-prototypes]
Quoted 10 lines
Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Anthony Koo <[email protected]>Signed-off-by Lee Jones <[email protected]>
Harry
Quoted 73 lines
--- .../drm/amd/display/dc/dce80/dce80_resource.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +7
-7@@ -526,7 +526,7 @@ static struct output_pixel_processor *dce80_opp_create(return &opp->base; } -struct dce_aux *dce80_aux_engine_create ( +static struct dce_aux *dce80_aux_engine_create (struct dc_context *ctx,uint32_t inst) {@@ -564,7 +564,7 @@ static const struct dce_i2c_mask i2c_masks = { I2C_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(_MASK) }; -struct dce_i2c_hw *dce80_i2c_hw_create ( +static struct dce_i2c_hw *dce80_i2c_hw_create (struct dc_context *ctx,uint32_t inst) {@@ -580,7 +580,7 @@ struct dce_i2c_hw *dce80_i2c_hw_create(return dce_i2c_hw; } -struct dce_i2c_sw *dce80_i2c_sw_create ( +static struct dce_i2c_sw *dce80_i2c_sw_create (struct dc_context *ctx) { struct dce_i2c_sw *dce_i2c_sw =@@ -714,7 +714,7 @@ static const struct encoder_feature_support link_enc_feature = { .flags.bits.IS_TPS3_CAPABLE = true }; -struct link_encoder *dce80_link_encoder_create ( +static struct link_encoder *dce80_link_encoder_create (const struct encoder_init_data *enc_init_data) { struct dce110_link_encoder *enc110 =@@ -753,7 +753,7 @@ static struct panel_cntl *dce80_panel_cntl_create(const struct panel_cntl_init_dreturn &panel_cntl->base; } -struct clock_source *dce80_clock_source_create( +static struct clock_source *dce80_clock_source_create( struct dc_context *ctx, struct dc_bios *bios, enum clock_source_id id,@@ -777,7 +777,7 @@ struct clock_source *dce80_clock_source_create(return NULL ; } -void dce80_clock_source_destroy (struct clock_source **clk_src) +static void dce80_clock_source_destroy (struct clock_source **clk_src) {kfree (TO_DCE110_CLK_SRC (*clk_src)); *clk_src =NULL ;@@ -867,7 +867,7 @@ static void dce80_resource_destruct(struct dce110_resource_pool *pool) } } -bool dce80_validate_bandwidth ( +static bool dce80_validate_bandwidth (struct dc *dc,struct dc_state *context,bool fast_validate)
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c static bool dce80_validate_surface_sets( · line 918
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +1
-1@@ -912,7 +912,7 @@ static bool dce80_validate_surface_sets(return true; } -enum dc_status dce80_validate_global ( +static enum dc_status dce80_validate_global (struct dc *dc,struct dc_state *context) {
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 9/19 drm/nouveau/nvkm/engine/gr/gf100: Demote non-conformant kernel-doc header
In reply to Lee JonesFixes 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'
--- 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
@@ -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.
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 09/19] drm/nouveau/nvkm/engine/gr/gf100: Demote non-conformant kernel-doc header
Quoted 31 lines · Lee Jones
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 <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Lee Jones <[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@@ -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
Quoted 5 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 10/19 drm/nouveau/nouveau_bo: Remove unused variables 'dev'
In reply to Lee JonesFixes 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]
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +0 -4
@@ -1250,7 +1250,6 @@ nouveau_ttm_tt_populate(struct ttm_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))
@@ -1263,7 +1262,6 @@ nouveau_ttm_tt_populate(struct ttm_device *bdev, } drm =nouveau_bdev (bdev); - dev = drm->dev->dev;return ttm_pool_alloc (&drm->ttm.bdev.pool, ttm, ctx); }
@@ -1273,14 +1271,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_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); }
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 10/19] drm/nouveau/nouveau_bo: Remove unused variables 'dev'
Quoted 61 lines · Lee Jones
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 <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Sumit Semwal <[email protected]>Cc "Christian König" <[email protected]>Cc Jeremy Kolb <[email protected]>Signed-off-by Lee Jones <[email protected]>--- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ---- 1 file changed, 4 deletions(-)drivers/gpu/drm/nouveau/nouveau_bo.c +0
-5@@ -1250,7 +1250,6 @@ nouveau_ttm_tt_populate(struct ttm_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))@@ -1263,7 +1262,6 @@ nouveau_ttm_tt_populate(struct ttm_device *bdev, } drm =nouveau_bdev (bdev); - dev = drm->dev->dev;return ttm_pool_alloc (&drm->ttm.bdev.pool, ttm, ctx); }@@ -1273,14 +1271,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_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
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 11/19 drm/nouveau/nouveau_display: Remove set but unused variable 'width'
In reply to Lee JonesFixes 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]
--- drivers/gpu/drm/nouveau/nouveau_display.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/nouveau_display.c +4 -4
@@ -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;
@@ -343,9 +343,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);
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 12/19 drm/nouveau/dispnv04/crtc: Demote non-conforming kernel-doc headers
In reply to Lee JonesFixes 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'
--- 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 · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 12/19] drm/nouveau/dispnv04/crtc: Demote non-conforming kernel-doc headers
Quoted 47 lines · Lee Jones
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 <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Lee Jones <[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. -- 2.27.0
Quoted 5 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
PATCH 13/19 drm/nouveau/dispnv50/disp: Remove unused variable 'ret' from function returning void
In reply to Lee JonesFixes 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]
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -3
@@ -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 ) {
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 14/19 drm/nouveau/dispnv50/headc57d: Make local function 'headc57d_olut' static
In reply to Lee JonesFixes 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]
--- drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/dispnv50/headc57d.c +1 -1
@@ -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 )
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 14/19] drm/nouveau/dispnv50/headc57d: Make local function 'headc57d_olut' static
Quoted 32 lines · Lee Jones
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 <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Lyude Paul <[email protected]>Signed-off-by Lee Jones <[email protected]>--- drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/nouveau/dispnv50/headc57d.c +1
-2@@ -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
Quoted 4 lines
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [PATCH 14/19] drm/nouveau/dispnv50/headc57d: Make local function 'headc57d_olut' static
In reply to Lee JonesQuoted 31 lines · Lee Jones
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 <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Lyude Paul <[email protected]>Signed-off-by Lee Jones <[email protected]>---
drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/nouveau/dispnv50/headc57d.c +0
-0@@ -169,7 +169,7 @@ headc57d_olut_load(struct drm_color_lut *in, int size, void __iomem *mem) writew(readw(mem - 4), mem + 4); }drivers/gpu/drm/nouveau/dispnv50/headc57d.c +1
-1-bool +static boolheadc57d_olut(struct
nv50_head*head, structnv50_head_atom*asyh, int size) {
if (size != 0 && size != 256 && size != 1024)
Signature · 13 lines
Sincerely, Lyude Paul (she/her) Software Engineer at Red Hat Note: I deal with a lot of emails and have a lot of bugs on my plate. If you've asked me a question, are waiting for a review/merge on a patch, etc. and I haven't responded in a while, please feel free to send me another email to check on my status. I don't bite! _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
PATCH 15/19 drm/nouveau/nv50_display: Remove superfluous prototype for local static functions
In reply to Lee JonesFixes 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
--- drivers/gpu/drm/nouveau/nv50_display.h | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/nouveau/nv50_display.h +0 -3
@@ -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__ */
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 15/19] drm/nouveau/nv50_display: Remove superfluous prototype for local static functions
Quoted 37 lines · Lee Jones
Fixes the following build error:
drivers/gpu/drm/nouveau/dispnv50/disp.c:2530:1: error: conflicting types for ‘nv50_display_fini’
In file included fromdrivers/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 fromdrivers/gpu/drm/nouveau/dispnv50/disp.c:71:
drivers/gpu/drm/nouveau/nv50_display.h:35:6: note: previous declaration of ‘nv50_display_init’ was heredrivers/gpu/drm/nouveau/dispnv50/disp.c:2581:1: error: static declaration of ‘nv50_display_destroy’ follows non-static declaration In file included fromdrivers/gpu/drm/nouveau/dispnv50/disp.c:71:
drivers/gpu/drm/nouveau/nv50_display.h:34:6: note: previous declaration of ‘nv50_display_destroy’ was hereCc Ben Skeggs <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Lee Jones <[email protected]>--- drivers/gpu/drm/nouveau/nv50_display.h | 3 --- 1 file changed, 3 deletions(-)drivers/gpu/drm/nouveau/nv50_display.h +0
-4@@ -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
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 16/19 drm/nouveau/dispnv50/disp: Include header containing our prototypes
In reply to Lee JonesFixes 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]
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -0
@@ -68,6 +68,8 @@#include <subdev/bios/dp.h> +#include "nv50_display.h" +/****************************************************************************** * EVO channel *****************************************************************************/
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 17/19 drm/nouveau/nouveau_ioc32: File headers are not good candidates for kernel-doc
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/nouveau_ioc32.c:2: warning: Cannot understand * file mga_ioc32.c
--- drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_ioc32.c +1 -1
@@ -1,4 +1,4 @@ -/** +/* * \file mga_ioc32.c * * 32-bit ioctl compatibility routines for the MGA DRM.
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 17/19] drm/nouveau/nouveau_ioc32: File headers are not good candidates for kernel-doc
Quoted 28 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/nouveau/nouveau_ioc32.c:2: warning: Cannot understand * filemga_ioc32.cCc Ben Skeggs <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Lee Jones <[email protected]>--- drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/nouveau/nouveau_ioc32.c +1
-2@@ -1,4 +1,4 @@ -/** +/* * \file mga_ioc32.c * * 32-bit ioctl compatibility routines for the MGA DRM. -- 2.27.0
Quoted 5 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
PATCH 18/19 drm/nouveau/nouveau_svm: Remove unused variable 'ret' from void function
In reply to Lee JonesFixes 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]
--- drivers/gpu/drm/nouveau/nouveau_svm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/nouveau_svm.c +2 -3
@@ -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);
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 19/19 drm/nouveau/nouveau_ioc32: Demote kernel-doc abuse to standard comment block
In reply to Lee JonesFixes 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'
--- drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_ioc32.c +1 -1
@@ -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>. *
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 19/19] drm/nouveau/nouveau_ioc32: Demote kernel-doc abuse to standard comment block
Quoted 33 lines · Lee Jones
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 <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Lee Jones <[email protected]>--- drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/nouveau/nouveau_ioc32.c +1
-2@@ -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
Quoted 5 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel,
Quoted 7 lines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bitThis is a resend of the remaining patches.
All of these patches have been sent before.
Are you still keen to 'hoover these up'?
Just leave the one that requires work and take the rest perhaps?
Quoted 73 lines
Lee Jones (19):
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'
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/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/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.../gpu/drm/amd/display/dc/calcs/dce_calcs.c | 1154 +++++++++-------- .../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 +- include/drm/drm_atomic.h | 3 +- 15 files changed, 692 insertions(+), 734 deletions(-)Cc Alex Deucher <[email protected]>Cc Anthony Koo <[email protected]>Cc Ben Skeggs <[email protected]>Cc "Christian König" <[email protected]>Cc Colin Ian King <[email protected]>Cc Daniel Vetter <[email protected]>Cc David Airlie <[email protected]>Cc Harry Wentland <[email protected]>Cc Jeremy Kolb <[email protected]>Cc Kuogee Hsieh <[email protected]>Cc Leo Li <[email protected]>Cc Lyude Paul <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Rob Clark <[email protected]>Cc Sean Paul <[email protected]>Cc Sumit Semwal <[email protected]>Cc Thomas Zimmermann <[email protected]>
Signature · 8 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 6 lines · Lee Jones
Daniel,
Quoted 4 lines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Quoted 7 lines
Quoted 3 lines
This is a resend of the remaining patches.
All of these patches have been sent before.
Are you still keen to 'hoover these up'?
Just leave the one that requires work and take the rest perhaps?
How would you like me to proceed with this?
Signature · 8 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel