[Intel-gfx] [PATCH v2 1/9] drm/print: move drm_debug variable to drm_print.[ch]

[Alex Deucher]

On Tue, Sep 24, 2019 at 8:59 AM Jani Nikula <jani.nikula at intel.com> wrote:
>
> Move drm_debug variable declaration and definition to where they are
> relevant and needed. No functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/drm_drv.c   | 17 -----------------
>  drivers/gpu/drm/drm_print.c | 19 +++++++++++++++++++
>  include/drm/drm_drv.h       |  2 --
>  include/drm/drm_print.h     |  2 ++
>  4 files changed, 21 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index 769feefeeeef..1b9b40a1c7c9 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -46,26 +46,9 @@
>  #include "drm_internal.h"
>  #include "drm_legacy.h"
>
> -/*
> - * drm_debug: Enable debug output.
> - * Bitmask of DRM_UT_x. See include/drm/drm_print.h for details.
> - */
> -unsigned int drm_debug = 0;
> -EXPORT_SYMBOL(drm_debug);
> -
>  MODULE_AUTHOR("Gareth Hughes, Leif Delgass, José Fonseca, Jon Smirl");
>  MODULE_DESCRIPTION("DRM shared core routines");
>  MODULE_LICENSE("GPL and additional rights");
> -MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n"
> -"\t\tBit 0 (0x01)  will enable CORE messages (drm core code)\n"
> -"\t\tBit 1 (0x02)  will enable DRIVER messages (drm controller code)\n"
> -"\t\tBit 2 (0x04)  will enable KMS messages (modesetting code)\n"
> -"\t\tBit 3 (0x08)  will enable PRIME messages (prime code)\n"
> -"\t\tBit 4 (0x10)  will enable ATOMIC messages (atomic code)\n"
> -"\t\tBit 5 (0x20)  will enable VBL messages (vblank code)\n"
> -"\t\tBit 7 (0x80)  will enable LEASE messages (leasing code)\n"
> -"\t\tBit 8 (0x100) will enable DP messages (displayport code)");
> -module_param_named(debug, drm_debug, int, 0600);
>
>  static DEFINE_SPINLOCK(drm_minor_lock);
>  static struct idr drm_minors_idr;
> diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
> index dfa27367ebb8..c9b57012d412 100644
> --- a/drivers/gpu/drm/drm_print.c
> +++ b/drivers/gpu/drm/drm_print.c
> @@ -28,6 +28,7 @@
>  #include <stdarg.h>
>
>  #include <linux/io.h>
> +#include <linux/moduleparam.h>
>  #include <linux/seq_file.h>
>  #include <linux/slab.h>
>
> @@ -35,6 +36,24 @@
>  #include <drm/drm_drv.h>
>  #include <drm/drm_print.h>
>
> +/*
> + * drm_debug: Enable debug output.
> + * Bitmask of DRM_UT_x. See include/drm/drm_print.h for details.
> + */
> +unsigned int drm_debug;
> +EXPORT_SYMBOL(drm_debug);
> +
> +MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n"
> +"\t\tBit 0 (0x01)  will enable CORE messages (drm core code)\n"
> +"\t\tBit 1 (0x02)  will enable DRIVER messages (drm controller code)\n"
> +"\t\tBit 2 (0x04)  will enable KMS messages (modesetting code)\n"
> +"\t\tBit 3 (0x08)  will enable PRIME messages (prime code)\n"
> +"\t\tBit 4 (0x10)  will enable ATOMIC messages (atomic code)\n"
> +"\t\tBit 5 (0x20)  will enable VBL messages (vblank code)\n"
> +"\t\tBit 7 (0x80)  will enable LEASE messages (leasing code)\n"
> +"\t\tBit 8 (0x100) will enable DP messages (displayport code)");
> +module_param_named(debug, drm_debug, int, 0600);
> +
>  void __drm_puts_coredump(struct drm_printer *p, const char *str)
>  {
>         struct drm_print_iterator *iterator = p->arg;
> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
> index 8976afe48c1c..cf13470810a5 100644
> --- a/include/drm/drm_drv.h
> +++ b/include/drm/drm_drv.h
> @@ -778,8 +778,6 @@ struct drm_driver {
>         int dev_priv_size;
>  };
>
> -extern unsigned int drm_debug;
> -
>  int drm_dev_init(struct drm_device *dev,
>                  struct drm_driver *driver,
>                  struct device *parent);
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 12d4916254b4..e5c421abce48 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -34,6 +34,8 @@
>
>  #include <drm/drm.h>
>
> +extern unsigned int drm_debug;
> +
>  /**
>   * DOC: print
>   *
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel