On Thu, Oct 29, 2020 at 06:00:58PM -0700, Abhinav Kumar wrote:
> Currently drm_atomic_print_state() internally allocates and uses a
> drm_info printer. Allow it to accept any drm_printer type so that
> the API can be leveraged even for taking drm snapshot.
>
> Rename the drm_atomic_print_state() to drm_atomic_print_new_state()
> so that it reflects its functionality better.
>
> changes in v2:
> - Rename the function drm_atomic_print_state to
> drm_atomic_print_new_state and update the commit text
> - Fix kbot errors
> - Add kernel doc for the newly exported function
>
> Reported-by: kernel test robot <l...@intel.com>
> Signed-off-by: Abhinav Kumar <abhin...@codeaurora.org>
> ---
> drivers/gpu/drm/drm_atomic.c | 29 +++++++++++++++----
> drivers/gpu/drm/drm_atomic_uapi.c | 4 ++-
> drivers/gpu/drm/drm_crtc_internal.h | 4 ++-
> .../gpu/drm/selftests/test-drm_framebuffer.c | 1 +
> 4 files changed, 31 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 58527f151984..5df7b67ced78 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -1,6 +1,7 @@
> /*
> * Copyright (C) 2014 Red Hat
> * Copyright (C) 2014 Intel Corp.
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> *
> * Permission is hereby granted, free of charge, to any person obtaining a
> * copy of this software and associated documentation files (the "Software"),
> @@ -1543,9 +1544,21 @@ int __drm_atomic_helper_set_config(struct drm_mode_set
> *set,
> }
> EXPORT_SYMBOL(__drm_atomic_helper_set_config);
>
> -void drm_atomic_print_state(const struct drm_atomic_state *state)
> +/**
> + * drm_atomic_print_new_state - prints drm atomic state
> + * @state: atomic configuration to check
> + * @p: drm printer
> + *
> + * This functions prints the drm atomic state snapshot using the drm printer
> + * which is passed to it. This snapshot can be used for debugging purposes.
> + *
> + * Note that this function looks into the new state objects and hence its not
> + * safe to be used after the call to drm_atomic_helper_commit_hw_done().
> + *
Empty line here in the docs. With that removed.
Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch>
> + */
> +void drm_atomic_print_new_state(const struct drm_atomic_state *state,
> + struct drm_printer *p)
> {
> - struct drm_printer p = drm_info_printer(state->dev->dev);
> struct drm_plane *plane;
> struct drm_plane_state *plane_state;
> struct drm_crtc *crtc;
> @@ -1554,17 +1567,23 @@ void drm_atomic_print_state(const struct
> drm_atomic_state *state)
> struct drm_connector_state *connector_state;
> int i;
>
> + if (!p) {
> + DRM_ERROR("invalid drm printer\n");
> + return;
> + }
> +
> DRM_DEBUG_ATOMIC("checking %p\n", state);
>
> for_each_new_plane_in_state(state, plane, plane_state, i)
> - drm_atomic_plane_print_state(&p, plane_state);
> + drm_atomic_plane_print_state(p, plane_state);
>
> for_each_new_crtc_in_state(state, crtc, crtc_state, i)
> - drm_atomic_crtc_print_state(&p, crtc_state);
> + drm_atomic_crtc_print_state(p, crtc_state);
>
> for_each_new_connector_in_state(state, connector, connector_state, i)
> - drm_atomic_connector_print_state(&p, connector_state);
> + drm_atomic_connector_print_state(p, connector_state);
> }
> +EXPORT_SYMBOL(drm_atomic_print_new_state);
>
> static void __drm_state_dump(struct drm_device *dev, struct drm_printer *p,
> bool take_locks)
> diff --git a/drivers/gpu/drm/drm_atomic_uapi.c
> b/drivers/gpu/drm/drm_atomic_uapi.c
> index 25c269bc4681..b4b3cb28a8ea 100644
> --- a/drivers/gpu/drm/drm_atomic_uapi.c
> +++ b/drivers/gpu/drm/drm_atomic_uapi.c
> @@ -2,6 +2,7 @@
> * Copyright (C) 2014 Red Hat
> * Copyright (C) 2014 Intel Corp.
> * Copyright (C) 2018 Intel Corp.
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> *
> * Permission is hereby granted, free of charge, to any person obtaining a
> * copy of this software and associated documentation files (the "Software"),
> @@ -1294,6 +1295,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
> struct drm_out_fence_state *fence_state;
> int ret = 0;
> unsigned int i, j, num_fences;
> + struct drm_printer p = drm_info_printer(dev->dev);
>
> /* disallow for drivers not supporting atomic: */
> if (!drm_core_check_feature(dev, DRIVER_ATOMIC))
> @@ -1413,7 +1415,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
> ret = drm_atomic_nonblocking_commit(state);
> } else {
> if (drm_debug_enabled(DRM_UT_STATE))
> - drm_atomic_print_state(state);
> + drm_atomic_print_new_state(state, &p);
>
> ret = drm_atomic_commit(state);
> }
> diff --git a/drivers/gpu/drm/drm_crtc_internal.h
> b/drivers/gpu/drm/drm_crtc_internal.h
> index da96b2f64d7e..2bd56ec9fb0e 100644
> --- a/drivers/gpu/drm/drm_crtc_internal.h
> +++ b/drivers/gpu/drm/drm_crtc_internal.h
> @@ -5,6 +5,7 @@
> * Jesse Barnes <jesse.bar...@intel.com>
> * Copyright © 2014 Intel Corporation
> * Daniel Vetter <daniel.vet...@ffwll.ch>
> + * Copyright (c) 2020, The Linux Foundation. All rights reserved.
> *
> * Permission is hereby granted, free of charge, to any person obtaining a
> * copy of this software and associated documentation files (the "Software"),
> @@ -233,7 +234,8 @@ int __drm_atomic_helper_disable_plane(struct drm_plane
> *plane,
> int __drm_atomic_helper_set_config(struct drm_mode_set *set,
> struct drm_atomic_state *state);
>
> -void drm_atomic_print_state(const struct drm_atomic_state *state);
> +void drm_atomic_print_new_state(const struct drm_atomic_state *state,
> + struct drm_printer *p);
>
> /* drm_atomic_uapi.c */
> int drm_atomic_connector_commit_dpms(struct drm_atomic_state *state,
> diff --git a/drivers/gpu/drm/selftests/test-drm_framebuffer.c
> b/drivers/gpu/drm/selftests/test-drm_framebuffer.c
> index 2d29ea6f92e2..9296c68cbe71 100644
> --- a/drivers/gpu/drm/selftests/test-drm_framebuffer.c
> +++ b/drivers/gpu/drm/selftests/test-drm_framebuffer.c
> @@ -8,6 +8,7 @@
> #include <drm/drm_device.h>
> #include <drm/drm_mode.h>
> #include <drm/drm_fourcc.h>
> +#include <drm/drm_print.h>
>
> #include "../drm_crtc_internal.h"
>
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
