mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
media: verisilicon: fix excessive stack usage
In some configurations, gcc decides not to inline the register accessor
functions, which in turn leads to lots of temporary hantro_reg structures
on the stack that cannot be eliminated because they escape into an
uninlined function:
drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c:1022:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
Mark all of these as __always_inline so the compiler is able to completely
eliminate the temporary structures instead, which brings the stack usage
back down to just the normal local variables.
Closes: https://lore.kernel.org/oe-kbuild-all/202306151506.goHEegOd-lkp@intel.com/
[hverkuil: fix function prototype alignment, wrap commit log]
Reported-by: kernel test robot <lkp@intel.com>
Fixes: 727a400686
("media: verisilicon: Add Rockchip AV1 decoder")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
d05dea76d4
commit
7ee8acd1b8
1 changed files with 21 additions and 21 deletions
|
@ -370,26 +370,26 @@ extern int hantro_debug;
|
||||||
pr_err("%s:%d: " fmt, __func__, __LINE__, ##args)
|
pr_err("%s:%d: " fmt, __func__, __LINE__, ##args)
|
||||||
|
|
||||||
/* Structure access helpers. */
|
/* Structure access helpers. */
|
||||||
static inline struct hantro_ctx *fh_to_ctx(struct v4l2_fh *fh)
|
static __always_inline struct hantro_ctx *fh_to_ctx(struct v4l2_fh *fh)
|
||||||
{
|
{
|
||||||
return container_of(fh, struct hantro_ctx, fh);
|
return container_of(fh, struct hantro_ctx, fh);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Register accessors. */
|
/* Register accessors. */
|
||||||
static inline void vepu_write_relaxed(struct hantro_dev *vpu,
|
static __always_inline void vepu_write_relaxed(struct hantro_dev *vpu,
|
||||||
u32 val, u32 reg)
|
u32 val, u32 reg)
|
||||||
{
|
{
|
||||||
vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
|
vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
|
||||||
writel_relaxed(val, vpu->enc_base + reg);
|
writel_relaxed(val, vpu->enc_base + reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void vepu_write(struct hantro_dev *vpu, u32 val, u32 reg)
|
static __always_inline void vepu_write(struct hantro_dev *vpu, u32 val, u32 reg)
|
||||||
{
|
{
|
||||||
vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
|
vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
|
||||||
writel(val, vpu->enc_base + reg);
|
writel(val, vpu->enc_base + reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline u32 vepu_read(struct hantro_dev *vpu, u32 reg)
|
static __always_inline u32 vepu_read(struct hantro_dev *vpu, u32 reg)
|
||||||
{
|
{
|
||||||
u32 val = readl(vpu->enc_base + reg);
|
u32 val = readl(vpu->enc_base + reg);
|
||||||
|
|
||||||
|
@ -397,27 +397,27 @@ static inline u32 vepu_read(struct hantro_dev *vpu, u32 reg)
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void vdpu_write_relaxed(struct hantro_dev *vpu,
|
static __always_inline void vdpu_write_relaxed(struct hantro_dev *vpu,
|
||||||
u32 val, u32 reg)
|
u32 val, u32 reg)
|
||||||
{
|
{
|
||||||
vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
|
vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
|
||||||
writel_relaxed(val, vpu->dec_base + reg);
|
writel_relaxed(val, vpu->dec_base + reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void vdpu_write(struct hantro_dev *vpu, u32 val, u32 reg)
|
static __always_inline void vdpu_write(struct hantro_dev *vpu, u32 val, u32 reg)
|
||||||
{
|
{
|
||||||
vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
|
vpu_debug(6, "0x%04x = 0x%08x\n", reg / 4, val);
|
||||||
writel(val, vpu->dec_base + reg);
|
writel(val, vpu->dec_base + reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void hantro_write_addr(struct hantro_dev *vpu,
|
static __always_inline void hantro_write_addr(struct hantro_dev *vpu,
|
||||||
unsigned long offset,
|
unsigned long offset,
|
||||||
dma_addr_t addr)
|
dma_addr_t addr)
|
||||||
{
|
{
|
||||||
vdpu_write(vpu, addr & 0xffffffff, offset);
|
vdpu_write(vpu, addr & 0xffffffff, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline u32 vdpu_read(struct hantro_dev *vpu, u32 reg)
|
static __always_inline u32 vdpu_read(struct hantro_dev *vpu, u32 reg)
|
||||||
{
|
{
|
||||||
u32 val = readl(vpu->dec_base + reg);
|
u32 val = readl(vpu->dec_base + reg);
|
||||||
|
|
||||||
|
@ -425,7 +425,7 @@ static inline u32 vdpu_read(struct hantro_dev *vpu, u32 reg)
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline u32 vdpu_read_mask(struct hantro_dev *vpu,
|
static __always_inline u32 vdpu_read_mask(struct hantro_dev *vpu,
|
||||||
const struct hantro_reg *reg,
|
const struct hantro_reg *reg,
|
||||||
u32 val)
|
u32 val)
|
||||||
{
|
{
|
||||||
|
@ -437,14 +437,14 @@ static inline u32 vdpu_read_mask(struct hantro_dev *vpu,
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void hantro_reg_write(struct hantro_dev *vpu,
|
static __always_inline void hantro_reg_write(struct hantro_dev *vpu,
|
||||||
const struct hantro_reg *reg,
|
const struct hantro_reg *reg,
|
||||||
u32 val)
|
u32 val)
|
||||||
{
|
{
|
||||||
vdpu_write_relaxed(vpu, vdpu_read_mask(vpu, reg, val), reg->base);
|
vdpu_write_relaxed(vpu, vdpu_read_mask(vpu, reg, val), reg->base);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void hantro_reg_write_s(struct hantro_dev *vpu,
|
static __always_inline void hantro_reg_write_s(struct hantro_dev *vpu,
|
||||||
const struct hantro_reg *reg,
|
const struct hantro_reg *reg,
|
||||||
u32 val)
|
u32 val)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue