[PATCH drm-misc-next] drm/xe: fix arguments to drm_err_printer()

Thomas Hellström thomas.hellstrom at linux.intel.com
Tue Feb 13 09:37:53 UTC 2024


On Tue, 2024-02-13 at 10:49 +0200, Jani Nikula wrote:
> The commit below changed drm_err_printer() arguments, but failed to
> update all places.
> 
> Reported-by: Stephen Rothwell <sfr at canb.auug.org.au>
> Closes:
> https://lore.kernel.org/r/20240213120410.75c45763@canb.auug.org.au
> Fixes: 5e0c04c8c40b ("drm/print: make drm_err_printer() device
> specific by using drm_err()")
> Cc: Luca Coelho <luciano.coelho at intel.com>
> Cc: Maxime Ripard <mripard at kernel.org>
> Cc: Thomas Hellström <thomas.hellstrom at linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>

> 
> ---
> 
> Argh. This is getting embarrassing. This one was hiding behind
> CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE=y.
> ---
>  drivers/gpu/drm/xe/xe_guc_submit.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c
> b/drivers/gpu/drm/xe/xe_guc_submit.c
> index 4744668ef60a..0c763ceafbed 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -812,7 +812,8 @@ static void guc_exec_queue_print(struct
> xe_exec_queue *q, struct drm_printer *p)
>  static void simple_error_capture(struct xe_exec_queue *q)
>  {
>  	struct xe_guc *guc = exec_queue_to_guc(q);
> -	struct drm_printer p = drm_err_printer("");
> +	struct xe_device *xe = guc_to_xe(guc);
> +	struct drm_printer p = drm_err_printer(&xe->drm, NULL);
>  	struct xe_hw_engine *hwe;
>  	enum xe_hw_engine_id id;
>  	u32 adj_logical_mask = q->logical_mask;



More information about the dri-devel mailing list