The drm_atomic_plane_print_state(), drm_atomic_crtc_print_state(), drm_atomic_connector_print_state(), and drm_atomic_private_obj_print_state() functions are currently static.
The SRO infrastructure needs to call them from drm_atomic_state_readout.c to print the readout state for debugging purposes. Make them available by dropping the static qualifier and declaring them in drm_internal.h. Reviewed-by: Maarten Lankhorst <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> --- drivers/gpu/drm/drm_atomic.c | 16 ++++++++-------- drivers/gpu/drm/drm_internal.h | 13 +++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 039be737fd07..895b958c2901 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -548,6 +548,6 @@ static int drm_atomic_crtc_check(const struct drm_crtc_state *old_crtc_state, } -static void drm_atomic_crtc_print_state(struct drm_printer *p, - const struct drm_crtc_state *state) +void drm_atomic_crtc_print_state(struct drm_printer *p, + const struct drm_crtc_state *state) { struct drm_crtc *crtc = state->crtc; @@ -947,6 +947,6 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p, } -static void drm_atomic_plane_print_state(struct drm_printer *p, - const struct drm_plane_state *state) +void drm_atomic_plane_print_state(struct drm_printer *p, + const struct drm_plane_state *state) { struct drm_plane *plane = state->plane; @@ -1473,6 +1473,6 @@ drm_atomic_get_connector_state(struct drm_atomic_commit *state, EXPORT_SYMBOL(drm_atomic_get_connector_state); -static void drm_atomic_connector_print_state(struct drm_printer *p, - const struct drm_connector_state *state) +void drm_atomic_connector_print_state(struct drm_printer *p, + const struct drm_connector_state *state) { struct drm_connector *connector = state->connector; @@ -2119,6 +2119,6 @@ int __drm_atomic_helper_set_config(struct drm_mode_set *set, EXPORT_SYMBOL(__drm_atomic_helper_set_config); -static void drm_atomic_private_obj_print_state(struct drm_printer *p, - const struct drm_private_state *state) +void drm_atomic_private_obj_print_state(struct drm_printer *p, + const struct drm_private_state *state) { struct drm_private_obj *obj = state->obj; diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index f893b1e3a596..815486557f51 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -40,13 +40,26 @@ struct dma_buf; struct iosys_map; struct drm_connector; +struct drm_connector_state; struct drm_crtc; +struct drm_crtc_state; struct drm_framebuffer; struct drm_gem_object; struct drm_master; struct drm_minor; +struct drm_plane_state; struct drm_prime_file_private; struct drm_printer; +struct drm_private_state; struct drm_vblank_crtc; +/* drm_atomic.c */ +void drm_atomic_plane_print_state(struct drm_printer *p, + const struct drm_plane_state *state); +void drm_atomic_crtc_print_state(struct drm_printer *p, + const struct drm_crtc_state *state); +void drm_atomic_connector_print_state(struct drm_printer *p, + const struct drm_connector_state *state); +void drm_atomic_private_obj_print_state(struct drm_printer *p, + const struct drm_private_state *state); /* drm_client_event.c */ #if defined(CONFIG_DRM_CLIENT) -- 2.55.0
