lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 162/247] drm: imx: fix compiler warning with gcc-12
    Date
    From: Linus Torvalds <torvalds@linux-foundation.org>

    [ Upstream commit 7aefd8b53815274f3ef398d370a3c9b27dd9f00c ]

    Gcc-12 correctly warned about this code using a non-NULL pointer as a
    truth value:

    drivers/gpu/drm/imx/ipuv3-crtc.c: In function ‘ipu_crtc_disable_planes’:
    drivers/gpu/drm/imx/ipuv3-crtc.c:72:21: error: the comparison will always evaluate as ‘true’ for the address of ‘plane’ will never be NULL [-Werror=address]
    72 | if (&ipu_crtc->plane[1] && plane == &ipu_crtc->plane[1]->base)
    | ^

    due to the extraneous '&' address-of operator.

    Philipp Zabel points out that The mistake had no adverse effect since
    the following condition doesn't actually dereference the NULL pointer,
    but the intent of the code was obviously to check for it, not to take
    the address of the member.

    Fixes: eb8c88808c83 ("drm/imx: add deferred plane disabling")
    Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c
    index 9c8829f945b2..f7863d6dea80 100644
    --- a/drivers/gpu/drm/imx/ipuv3-crtc.c
    +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
    @@ -69,7 +69,7 @@ static void ipu_crtc_disable_planes(struct ipu_crtc *ipu_crtc,
    drm_atomic_crtc_state_for_each_plane(plane, old_crtc_state) {
    if (plane == &ipu_crtc->plane[0]->base)
    disable_full = true;
    - if (&ipu_crtc->plane[1] && plane == &ipu_crtc->plane[1]->base)
    + if (ipu_crtc->plane[1] && plane == &ipu_crtc->plane[1]->base)
    disable_partial = true;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 15:21    [W:4.037 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site