drm: add missing ctx argument to plane transitional helpers
Subsystems (8)
PATCH 1/1 drm: add missing ctx argument to plane transitional helpers
In commits:34a2ab5e0689 ("drm: Add acquire ctx parameter to ->update_plane") 1931529448bc ("drm: Add acquire ctx parameter to ->plane_disable")
a pointer to a drm_modeset_acquire_ctx structure was added as an argument to the method prototypes. The transitional helpers are supposed to be directly plugged in as implementations of these methods, but doing so generates a warning. Add the missing argument.
A number of buggy users were added for drm_plane_helper_disable() which need to be fixed up for this change, which we do by passing a NULL ctx argument.
---
Note: not build for all the affected drivers yet.
drivers/gpu/drm/arc/arcpgu_crtc.c | 2 +- drivers/gpu/drm/arm/hdlcd_crtc.c | 2 +- drivers/gpu/drm/drm_plane_helper.c | 8 ++++++-- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 +- drivers/gpu/drm/sti/sti_cursor.c | 2 +- drivers/gpu/drm/sti/sti_gdp.c | 2 +- drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- drivers/gpu/drm/vc4/vc4_plane.c | 2 +- drivers/gpu/drm/zte/zx_plane.c | 2 +- include/drm/drm_plane_helper.h | 6 ++++-- 11 files changed, 19 insertions(+), 13 deletions(-)
drivers/gpu/drm/arc/arcpgu_crtc.c +1 -1
@@ -186,7 +186,7 @@ static const struct drm_plane_helper_funcs arc_pgu_plane_helper_funcs = {static void arc_pgu_plane_destroy (struct drm_plane *plane) { -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane); }
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
@@ -282,7 +282,7 @@ static const struct drm_plane_helper_funcs hdlcd_plane_helper_funcs = {static void hdlcd_plane_destroy (struct drm_plane *plane) { -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane); }
drivers/gpu/drm/drm_plane_helper.c +6 -2
@@ -440,6 +440,7 @@ int drm_plane_helper_commit(struct drm_plane *plane,* @src_y: y offset of @fb for panning * @src_w: width of source rectangle in @fb * @src_h: height of source rectangle in @fb +* @ctx: lock acquire context, not used here * * Provides a default plane update handler using the atomic plane update * functions. It is fully left to the driver to check plane constraints and
@@ -455,7 +456,8 @@ int drm_plane_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, int crtc_x, int crtc_y, unsigned int crtc_w, unsigned int crtc_h, uint32_t src_x, uint32_t src_y, - uint32_t src_w, uint32_t src_h) + uint32_t src_w, uint32_t src_h, + struct drm_modeset_acquire_ctx *ctx) { struct drm_plane_state *plane_state;
@@ -489,6 +491,7 @@ EXPORT_SYMBOL(drm_plane_helper_update);/** * drm_plane_helper_disable() - Transitional helper for plane disable * @plane: plane to disable +* @ctx: lock acquire context, not used here * * Provides a default plane disable handler using the atomic plane update * functions. It is fully left to the driver to check plane constraints and
@@ -499,7 +502,8 @@ EXPORT_SYMBOL(drm_plane_helper_update);* RETURNS: * Zero on success, error code on failure */ -int drm_plane_helper_disable (struct drm_plane *plane) +int drm_plane_helper_disable (struct drm_plane *plane, +struct drm_modeset_acquire_ctx *ctx) {struct drm_plane_state *plane_state;struct drm_framebuffer *old_fb;
drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +1 -1
@@ -68,7 +68,7 @@ static void mdp4_plane_destroy(struct drm_plane *plane) {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane); -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane);kfree (mdp4_plane);
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +1 -1
@@ -46,7 +46,7 @@ static void mdp5_plane_destroy(struct drm_plane *plane) {struct mdp5_plane *mdp5_plane =to_mdp5_plane (plane); -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane);kfree (mdp5_plane);
drivers/gpu/drm/sti/sti_cursor.c +1 -1
@@ -332,7 +332,7 @@ static void sti_cursor_destroy(struct drm_plane *drm_plane) {DRM_DEBUG_DRIVER ("\n" ); -drm_plane_helper_disable (drm_plane); +drm_plane_helper_disable (drm_plane,NULL );drm_plane_cleanup (drm_plane); }
drivers/gpu/drm/sti/sti_gdp.c +1 -1
@@ -883,7 +883,7 @@ static void sti_gdp_destroy(struct drm_plane *drm_plane) {DRM_DEBUG_DRIVER ("\n" ); -drm_plane_helper_disable (drm_plane); +drm_plane_helper_disable (drm_plane,NULL );drm_plane_cleanup (drm_plane); }
drivers/gpu/drm/sti/sti_hqvdp.c +1 -1
@@ -1260,7 +1260,7 @@ static void sti_hqvdp_destroy(struct drm_plane *drm_plane) {DRM_DEBUG_DRIVER ("\n" ); -drm_plane_helper_disable (drm_plane); +drm_plane_helper_disable (drm_plane,NULL );drm_plane_cleanup (drm_plane); }
drivers/gpu/drm/vc4/vc4_plane.c +1 -1
@@ -902,7 +902,7 @@ static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {static void vc4_plane_destroy (struct drm_plane *plane) { -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane); }
drivers/gpu/drm/zte/zx_plane.c +1 -1
@@ -446,7 +446,7 @@ static const struct drm_plane_helper_funcs zx_gl_plane_helper_funcs = {static void zx_plane_destroy (struct drm_plane *plane) { -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane); }
include/drm/drm_plane_helper.h +4 -2
@@ -67,8 +67,10 @@ int drm_plane_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, int crtc_x, int crtc_y, unsigned int crtc_w, unsigned int crtc_h, uint32_t src_x, uint32_t src_y, - uint32_t src_w, uint32_t src_h); -int drm_plane_helper_disable (struct drm_plane *plane); + uint32_t src_w, uint32_t src_h, + struct drm_modeset_acquire_ctx *ctx); +int drm_plane_helper_disable (struct drm_plane *plane, +struct drm_modeset_acquire_ctx *ctx);/* For use by drm_crtc_helper.c */ int drm_plane_helper_commit(struct drm_plane *plane,
Signature · 6 lines
2.7.4 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): E1fa1Zr-0005gT-VF-eh5Bv4kxaXIk46pC+1QYvQNdhmdF6hFW@public.gmane.org
Quoted 10 lines · Russell King
In commits:
34a2ab5e0689("drm: Add acquire ctx parameter to ->update_plane")1931529448bc("drm: Add acquire ctx parameter to ->plane_disable")a pointer to a
drm_modeset_acquire_ctxstructure was added as an argument to the method prototypes. The transitional helpers are supposed to be directly plugged in as implementations of these methods, but doing so generates a warning. Add the missing argument.
Quoted 8 lines
A number of buggy users were added for
drm_plane_helper_disable()which need to be fixed up for this change, which we do by passing a NULL ctx argument.Fixes 1931529448bc ("drm: Add acquire ctx parameter to ->plane_disable")Signed-off-by Russell King <[email protected]>---
Note: not build for all the affected drivers yet.
Did build just fine, so I applied it and pushed it out. I think Gustavo will do another drm-misc-next pull later this week, so next week it should be all in drm-next for you to do an armada pull against.
Thanks, Daniel
Quoted 191 lines
drivers/gpu/drm/arc/arcpgu_crtc.c | 2 +- drivers/gpu/drm/arm/hdlcd_crtc.c | 2 +- drivers/gpu/drm/drm_plane_helper.c | 8 ++++++-- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 +- drivers/gpu/drm/sti/sti_cursor.c | 2 +- drivers/gpu/drm/sti/sti_gdp.c | 2 +- drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- drivers/gpu/drm/vc4/vc4_plane.c | 2 +- drivers/gpu/drm/zte/zx_plane.c | 2 +- include/drm/drm_plane_helper.h | 6 ++++-- 11 files changed, 19 insertions(+), 13 deletions(-)drivers/gpu/drm/arc/arcpgu_crtc.c +1
-1@@ -186,7 +186,7 @@ static const struct drm_plane_helper_funcs arc_pgu_plane_helper_funcs = {static void arc_pgu_plane_destroy (struct drm_plane *plane) { -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane); }drivers/gpu/drm/arm/hdlcd_crtc.c +1
-1@@ -282,7 +282,7 @@ static const struct drm_plane_helper_funcs hdlcd_plane_helper_funcs = {static void hdlcd_plane_destroy (struct drm_plane *plane) { -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane); }drivers/gpu/drm/drm_plane_helper.c +6
-2@@ -440,6 +440,7 @@ int drm_plane_helper_commit(struct drm_plane *plane,* @src_y: y offset of @fb for panning * @src_w: width of source rectangle in @fb * @src_h: height of source rectangle in @fb +* @ctx: lock acquire context, not used here * * Provides a default plane update handler using the atomic plane update * functions. It is fully left to the driver to check plane constraints and @@ -455,7 +456,8 @@ int drm_plane_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, int crtc_x, int crtc_y, unsigned int crtc_w, unsigned int crtc_h, uint32_t src_x, uint32_t src_y, - uint32_t src_w, uint32_t src_h) + uint32_t src_w, uint32_t src_h, + struct drm_modeset_acquire_ctx *ctx) { struct drm_plane_state *plane_state;@@ -489,6 +491,7 @@ EXPORT_SYMBOL(drm_plane_helper_update);/** * drm_plane_helper_disable() - Transitional helper for plane disable * @plane: plane to disable +* @ctx: lock acquire context, not used here * * Provides a default plane disable handler using the atomic plane update * functions. It is fully left to the driver to check plane constraints and @@ -499,7 +502,8 @@ EXPORT_SYMBOL(drm_plane_helper_update);* RETURNS: * Zero on success, error code on failure */ -int drm_plane_helper_disable (struct drm_plane *plane) +int drm_plane_helper_disable (struct drm_plane *plane, +struct drm_modeset_acquire_ctx *ctx) {struct drm_plane_state *plane_state;struct drm_framebuffer *old_fb;drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +1
-1@@ -68,7 +68,7 @@ static void mdp4_plane_destroy(struct drm_plane *plane) {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane); -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane);kfree (mdp4_plane);drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +1
-1@@ -46,7 +46,7 @@ static void mdp5_plane_destroy(struct drm_plane *plane) {struct mdp5_plane *mdp5_plane =to_mdp5_plane (plane); -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane);kfree (mdp5_plane);drivers/gpu/drm/sti/sti_cursor.c +1
-1@@ -332,7 +332,7 @@ static void sti_cursor_destroy(struct drm_plane *drm_plane) {DRM_DEBUG_DRIVER ("\n" ); -drm_plane_helper_disable (drm_plane); +drm_plane_helper_disable (drm_plane,NULL );drm_plane_cleanup (drm_plane); }drivers/gpu/drm/sti/sti_gdp.c +1
-1@@ -883,7 +883,7 @@ static void sti_gdp_destroy(struct drm_plane *drm_plane) {DRM_DEBUG_DRIVER ("\n" ); -drm_plane_helper_disable (drm_plane); +drm_plane_helper_disable (drm_plane,NULL );drm_plane_cleanup (drm_plane); }drivers/gpu/drm/sti/sti_hqvdp.c +1
-1@@ -1260,7 +1260,7 @@ static void sti_hqvdp_destroy(struct drm_plane *drm_plane) {DRM_DEBUG_DRIVER ("\n" ); -drm_plane_helper_disable (drm_plane); +drm_plane_helper_disable (drm_plane,NULL );drm_plane_cleanup (drm_plane); }drivers/gpu/drm/vc4/vc4_plane.c +1
-1@@ -902,7 +902,7 @@ static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {static void vc4_plane_destroy (struct drm_plane *plane) { -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane); }drivers/gpu/drm/zte/zx_plane.c +1
-1@@ -446,7 +446,7 @@ static const struct drm_plane_helper_funcs zx_gl_plane_helper_funcs = {static void zx_plane_destroy (struct drm_plane *plane) { -drm_plane_helper_disable (plane); +drm_plane_helper_disable (plane,NULL );drm_plane_cleanup (plane); }include/drm/drm_plane_helper.h +4
-2@@ -67,8 +67,10 @@ int drm_plane_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, int crtc_x, int crtc_y, unsigned int crtc_w, unsigned int crtc_h, uint32_t src_x, uint32_t src_y, - uint32_t src_w, uint32_t src_h); -int drm_plane_helper_disable (struct drm_plane *plane); + uint32_t src_w, uint32_t src_h, + struct drm_modeset_acquire_ctx *ctx); +int drm_plane_helper_disable (struct drm_plane *plane, +struct drm_modeset_acquire_ctx *ctx);/* For use by drm_crtc_helper.c */ int drm_plane_helper_commit(struct drm_plane *plane,Signature · 1 line
2.7.4
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno