lkml.org 
[lkml]   [2022]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 05/21] drm/meson: Fix overflow implicit truncation warnings
    Date
    From: Sai Prakash Ranjan <quic_saipraka@quicinc.com>

    [ Upstream commit 98692f52c588225034cbff458622c2c06dfcb544 ]

    Fix -Woverflow warnings for drm/meson driver which is a result
    of moving arm64 custom MMIO accessor macros to asm-generic function
    implementations giving a bonus type-checking now and uncovering these
    overflow warnings.

    drivers/gpu/drm/meson/meson_viu.c: In function ‘meson_viu_init’:
    drivers/gpu/drm/meson/meson_registers.h:1826:48: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
    #define VIU_OSD_BLEND_REORDER(dest, src) ((src) << (dest * 4))
    ^
    drivers/gpu/drm/meson/meson_viu.c:472:18: note: in expansion of macro ‘VIU_OSD_BLEND_REORDER’
    writel_relaxed(VIU_OSD_BLEND_REORDER(0, 1) |
    ^~~~~~~~~~~~~~~~~~~~~

    Reported-by: kernel test robot <lkp@intel.com>
    Signed-off-by: Sai Prakash Ranjan <quic_saipraka@quicinc.com>
    Reviewed-by: Arnd Bergmann <arnd@arndb.de>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Neil Armstrong <narmstrong@baylibre.com>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/meson/meson_viu.c | 22 +++++++++++-----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c
    index 33698814c022..9991f0a43b1a 100644
    --- a/drivers/gpu/drm/meson/meson_viu.c
    +++ b/drivers/gpu/drm/meson/meson_viu.c
    @@ -400,17 +400,17 @@ void meson_viu_init(struct meson_drm *priv)
    priv->io_base + _REG(VD2_IF0_LUMA_FIFO_SIZE));

    if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) {
    - writel_relaxed(VIU_OSD_BLEND_REORDER(0, 1) |
    - VIU_OSD_BLEND_REORDER(1, 0) |
    - VIU_OSD_BLEND_REORDER(2, 0) |
    - VIU_OSD_BLEND_REORDER(3, 0) |
    - VIU_OSD_BLEND_DIN_EN(1) |
    - VIU_OSD_BLEND1_DIN3_BYPASS_TO_DOUT1 |
    - VIU_OSD_BLEND1_DOUT_BYPASS_TO_BLEND2 |
    - VIU_OSD_BLEND_DIN0_BYPASS_TO_DOUT0 |
    - VIU_OSD_BLEND_BLEN2_PREMULT_EN(1) |
    - VIU_OSD_BLEND_HOLD_LINES(4),
    - priv->io_base + _REG(VIU_OSD_BLEND_CTRL));
    + u32 val = (u32)VIU_OSD_BLEND_REORDER(0, 1) |
    + (u32)VIU_OSD_BLEND_REORDER(1, 0) |
    + (u32)VIU_OSD_BLEND_REORDER(2, 0) |
    + (u32)VIU_OSD_BLEND_REORDER(3, 0) |
    + (u32)VIU_OSD_BLEND_DIN_EN(1) |
    + (u32)VIU_OSD_BLEND1_DIN3_BYPASS_TO_DOUT1 |
    + (u32)VIU_OSD_BLEND1_DOUT_BYPASS_TO_BLEND2 |
    + (u32)VIU_OSD_BLEND_DIN0_BYPASS_TO_DOUT0 |
    + (u32)VIU_OSD_BLEND_BLEN2_PREMULT_EN(1) |
    + (u32)VIU_OSD_BLEND_HOLD_LINES(4);
    + writel_relaxed(val, priv->io_base + _REG(VIU_OSD_BLEND_CTRL));

    writel_relaxed(OSD_BLEND_PATH_SEL_ENABLE,
    priv->io_base + _REG(OSD1_BLEND_SRC_CTRL));
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-08-14 17:53    [W:6.466 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site