On Tue, Sep 03, 2024 at 05:02:57PM +0300, Jani Nikula wrote:
> intel_display_params_dump() prints the current display parameters, not
> the ones captured during error capture. It's not likely the params get
> changed in between, but make it pedantically correct anyway. Pass in the
> parameters and driver name to intel_display_params_dump().
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display_params.c | 8 +++++---
> drivers/gpu/drm/i915/display/intel_display_params.h | 5 ++---
> drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
> drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
> 4 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
> index 1a45d300b6f0..024de8abcb1a 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -173,14 +173,16 @@ static void _param_print_charp(struct drm_printer *p, const char *driver_name,
>
> /**
> * intel_display_params_dump - dump intel display modparams
> - * @display: display device
> + * @params: display params
> + * @driver_name: driver name to use for printing
> * @p: the &drm_printer
> *
> * Pretty printer for i915 modparams.
> */
> -void intel_display_params_dump(struct intel_display *display, struct drm_printer *p)
> +void intel_display_params_dump(const struct intel_display_params *params,
> + const char *driver_name, struct drm_printer *p)
> {
> -#define PRINT(T, x, ...) _param_print(p, display->drm->driver->name, #x, display->params.x);
> +#define PRINT(T, x, ...) _param_print(p, driver_name, #x, params->x);
> INTEL_DISPLAY_PARAMS_FOR_EACH(PRINT);
> #undef PRINT
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
> index da8dc943234b..dcb6face936a 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
> @@ -9,7 +9,6 @@
> #include <linux/types.h>
>
> struct drm_printer;
> -struct intel_display;
>
> /*
> * Invoke param, a function-like macro, for each intel display param, with
> @@ -56,8 +55,8 @@ struct intel_display_params {
> };
> #undef MEMBER
>
> -void intel_display_params_dump(struct intel_display *display,
> - struct drm_printer *p);
> +void intel_display_params_dump(const struct intel_display_params *params,
> + const char *driver_name, struct drm_printer *p);
> void intel_display_params_copy(struct intel_display_params *dest);
> void intel_display_params_free(struct intel_display_params *params);
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index f969f585d07b..246fece628d6 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -78,7 +78,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
>
> kernel_param_lock(THIS_MODULE);
> i915_params_dump(&i915->params, &p);
> - intel_display_params_dump(display, &p);
> + intel_display_params_dump(&display->params, display->drm->driver->name, &p);
> kernel_param_unlock(THIS_MODULE);
>
> return 0;
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index 6469b9bcf2ec..f23769ccf050 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -663,7 +663,7 @@ static void err_print_params(struct drm_i915_error_state_buf *m,
> struct intel_display *display = &m->i915->display;
>
> i915_params_dump(params, &p);
> - intel_display_params_dump(display, &p);
> + intel_display_params_dump(&display->params, display->drm->driver->name, &p);
> }
>
> static void err_print_pciid(struct drm_i915_error_state_buf *m,
> --
> 2.39.2
>
