From 45ab728bca6a77ae93327bccb5e68226653a45c8 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 4 Dec 2020 15:06:48 -0500 Subject: [PATCH] pan/bi: Rename bi_pack_{fma, add} to free up symbols Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bi_pack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c index bf71b44936f..7d276c56d9a 100644 --- a/src/panfrost/bifrost/bi_pack.c +++ b/src/panfrost/bifrost/bi_pack.c @@ -432,7 +432,7 @@ bi_pack_fma_bitwise(bi_clause *clause, bi_instruction *ins, bi_registers *regs) } static unsigned -bi_pack_fma(bi_clause *clause, bi_bundle bundle, bi_registers *regs) +pan_pack_fma(bi_clause *clause, bi_bundle bundle, bi_registers *regs) { if (!bundle.fma) return pan_pack_fma_nop_i32(clause, NULL, regs); @@ -698,7 +698,7 @@ bi_pack_add_ld_var(bi_clause *clause, bi_instruction *ins, bi_registers *regs) } static unsigned -bi_pack_add(bi_clause *clause, bi_bundle bundle, bi_registers *regs, gl_shader_stage stage) +pan_pack_add(bi_clause *clause, bi_bundle bundle, bi_registers *regs, gl_shader_stage stage) { if (!bundle.add) return pan_pack_add_nop_i32(clause, NULL, regs); @@ -979,8 +979,8 @@ bi_pack_bundle(bi_clause *clause, bi_bundle bundle, bi_bundle prev, bool first_b bi_flip_slots(&bundle.regs); uint64_t reg = bi_pack_registers(bundle.regs); - uint64_t fma = bi_pack_fma(clause, bundle, &bundle.regs); - uint64_t add = bi_pack_add(clause, bundle, &bundle.regs, stage); + uint64_t fma = pan_pack_fma(clause, bundle, &bundle.regs); + uint64_t add = pan_pack_add(clause, bundle, &bundle.regs, stage); struct bi_packed_bundle packed = { .lo = reg | (fma << 35) | ((add & 0b111111) << 58),