[PATCH 42/42] include/drm/drm_atomic: Make use of 'new_crtc_state'

Daniel Vetter daniel at ffwll.ch
Tue Nov 17 19:42:41 UTC 2020


On Mon, Nov 16, 2020 at 05:41:12PM +0000, Lee Jones wrote:
> In the macro for_each_oldnew_crtc_in_state() 'crtc_state' is provided
> as a container for state->crtcs[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/imx/ipuv3-plane.c: In function ‘ipu_planes_assign_pre’:
>  drivers/gpu/drm/imx/ipuv3-plane.c:746:42: warning: variable ‘crtc_state’ set but not used [-Wunused-but-set-variable]
> 
> Cc: Philipp Zabel <p.zabel at pengutronix.de>
> Cc: David Airlie <airlied at linux.ie>
> Cc: Daniel Vetter <daniel at ffwll.ch>
> Cc: Shawn Guo <shawnguo at kernel.org>
> Cc: Sascha Hauer <s.hauer at pengutronix.de>
> Cc: Pengutronix Kernel Team <kernel at pengutronix.de>
> Cc: Fabio Estevam <festevam at gmail.com>
> Cc: NXP Linux Team <linux-imx at nxp.com>
> Cc: dri-devel at lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones at linaro.org>

Ok I merged them all except:
- drm/amd and drm/imx, should be picked up already by respective
  maintainers
- drm/msm, Rob promised to take care

Thanks a lot for your patches.
-Daniel

> ---
>  include/drm/drm_atomic.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
> index dc5e0fbecc04e..54e051a957dfc 100644
> --- a/include/drm/drm_atomic.h
> +++ b/include/drm/drm_atomic.h
> @@ -783,7 +783,8 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p);
>  			      (void)(crtc) /* Only to avoid unused-but-set-variable warning */, \
>  			     (old_crtc_state) = (__state)->crtcs[__i].old_state, \
>  			     (void)(old_crtc_state) /* Only to avoid unused-but-set-variable warning */, \
> -			     (new_crtc_state) = (__state)->crtcs[__i].new_state, 1))
> +			     (new_crtc_state) = (__state)->crtcs[__i].new_state, \
> +			     (void)(new_crtc_state) /* Only to avoid unused-but-set-variable warning */, 1))
>  
>  /**
>   * for_each_old_crtc_in_state - iterate over all CRTCs in an atomic update
> -- 
> 2.25.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list