drm: Store new plane state in a variable for atomic_update and disable
In order to store the new plane state in a subsequent helper, let's move the plane->state dereferences into a variable. This was done using the following coccinelle script, plus some hand changes for vmwgfx: @ plane_atomic_func @ identifier helpers; identifier func; @@ ( static const struct drm_plane_helper_funcs helpers = { ..., .atomic_disable = func, ..., }; | static const struct drm_plane_helper_funcs helpers = { ..., .atomic_update = func, ..., }; ) @ has_new_state_old_state @ identifier plane_atomic_func.func; identifier plane; identifier new_state; symbol old_state; @@ func(struct drm_plane *plane, struct drm_plane_state *old_state) { ... struct drm_plane_state *new_state = plane->state; ... } @ depends on !has_new_state_old_state @ identifier plane_atomic_func.func; identifier plane; symbol old_state; @@ func(struct drm_plane *plane, struct drm_plane_state *old_state) { + struct drm_plane_state *new_state = plane->state; <+... - plane->state + new_state ...+> } @ has_new_state_state @ identifier plane_atomic_func.func; identifier plane; identifier new_state; symbol state; @@ func(struct drm_plane *plane, struct drm_plane_state *state) { ... struct drm_plane_state *new_state = plane->state; ... } @ depends on !has_new_state_state @ identifier plane_atomic_func.func; identifier plane; symbol state; @@ func(struct drm_plane *plane, struct drm_plane_state *state) { + struct drm_plane_state *new_plane_state = plane->state; <+... - plane->state + new_plane_state ...+> } @ has_new_state_old_s @ identifier plane_atomic_func.func; identifier plane; identifier new_state; symbol old_s; @@ func(struct drm_plane *plane, struct drm_plane_state *old_s) { ... struct drm_plane_state *new_state = plane->state; ... } @ depends on !has_new_state_old_s @ identifier plane_atomic_func.func; identifier plane; symbol old_s; @@ func(struct drm_plane *plane, struct drm_plane_state *old_s) { + struct drm_plane_state *new_s = plane->state; <+... - plane->state + new_s ...+> } Reviewed-by:Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by:
Maxime Ripard <maxime@cerno.tech> Acked-by:
Thomas Zimmermann <tzimmermann@suse.de> Link: https://lore.kernel.org/r/20210219120032.260676-1-maxime@cerno.tech
Showing
- drivers/gpu/drm/arc/arcpgu_crtc.c 4 additions, 3 deletionsdrivers/gpu/drm/arc/arcpgu_crtc.c
- drivers/gpu/drm/arm/hdlcd_crtc.c 4 additions, 3 deletionsdrivers/gpu/drm/arm/hdlcd_crtc.c
- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c 3 additions, 2 deletionsdrivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
- drivers/gpu/drm/kmb/kmb_plane.c 10 additions, 9 deletionsdrivers/gpu/drm/kmb/kmb_plane.c
- drivers/gpu/drm/mediatek/mtk_drm_plane.c 14 additions, 12 deletionsdrivers/gpu/drm/mediatek/mtk_drm_plane.c
- drivers/gpu/drm/omapdrm/omap_plane.c 3 additions, 3 deletionsdrivers/gpu/drm/omapdrm/omap_plane.c
- drivers/gpu/drm/qxl/qxl_display.c 10 additions, 8 deletionsdrivers/gpu/drm/qxl/qxl_display.c
- drivers/gpu/drm/rcar-du/rcar_du_plane.c 3 additions, 2 deletionsdrivers/gpu/drm/rcar-du/rcar_du_plane.c
- drivers/gpu/drm/rcar-du/rcar_du_vsp.c 2 additions, 1 deletiondrivers/gpu/drm/rcar-du/rcar_du_vsp.c
- drivers/gpu/drm/sun4i/sun4i_layer.c 2 additions, 1 deletiondrivers/gpu/drm/sun4i/sun4i_layer.c
- drivers/gpu/drm/sun4i/sun8i_ui_layer.c 3 additions, 2 deletionsdrivers/gpu/drm/sun4i/sun8i_ui_layer.c
- drivers/gpu/drm/sun4i/sun8i_vi_layer.c 3 additions, 2 deletionsdrivers/gpu/drm/sun4i/sun8i_vi_layer.c
- drivers/gpu/drm/tegra/dc.c 22 additions, 20 deletionsdrivers/gpu/drm/tegra/dc.c
- drivers/gpu/drm/tegra/hub.c 13 additions, 12 deletionsdrivers/gpu/drm/tegra/hub.c
- drivers/gpu/drm/vboxvideo/vbox_mode.c 13 additions, 11 deletionsdrivers/gpu/drm/vboxvideo/vbox_mode.c
- drivers/gpu/drm/vkms/vkms_plane.c 6 additions, 5 deletionsdrivers/gpu/drm/vkms/vkms_plane.c
- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c 10 additions, 9 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_kms.c
- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c 3 additions, 2 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c 4 additions, 3 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c 5 additions, 4 deletionsdrivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
Loading
Please register or sign in to comment