Commit 349f4f1e authored by Jani Nikula's avatar Jani Nikula

drm/i915/overlay: convert intel_overlay_print_error_state() to drm_printer

Use the regular drm printer, so we can drop the i915_error_printf()
usage.
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240606140705.3072987-2-jani.nikula@intel.comSigned-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent d6b93391
...@@ -1485,15 +1485,14 @@ intel_overlay_capture_error_state(struct drm_i915_private *dev_priv) ...@@ -1485,15 +1485,14 @@ intel_overlay_capture_error_state(struct drm_i915_private *dev_priv)
} }
void void
intel_overlay_print_error_state(struct drm_i915_error_state_buf *m, intel_overlay_print_error_state(struct drm_printer *p,
struct intel_overlay_error_state *error) struct intel_overlay_error_state *error)
{ {
i915_error_printf(m, "Overlay, status: 0x%08x, interrupt: 0x%08x\n", drm_printf(p, "Overlay, status: 0x%08x, interrupt: 0x%08x\n",
error->dovsta, error->isr); error->dovsta, error->isr);
i915_error_printf(m, " Register file at 0x%08lx:\n", drm_printf(p, " Register file at 0x%08lx:\n", error->base);
error->base);
#define P(x) i915_error_printf(m, " " #x ": 0x%08x\n", error->regs.x) #define P(x) drm_printf(p, " " #x ": 0x%08x\n", error->regs.x)
P(OBUF_0Y); P(OBUF_0Y);
P(OBUF_1Y); P(OBUF_1Y);
P(OBUF_0U); P(OBUF_0U);
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
struct drm_device; struct drm_device;
struct drm_file; struct drm_file;
struct drm_i915_error_state_buf;
struct drm_i915_private; struct drm_i915_private;
struct drm_printer;
struct intel_overlay; struct intel_overlay;
struct intel_overlay_error_state; struct intel_overlay_error_state;
...@@ -24,7 +24,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data, ...@@ -24,7 +24,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
void intel_overlay_reset(struct drm_i915_private *dev_priv); void intel_overlay_reset(struct drm_i915_private *dev_priv);
struct intel_overlay_error_state * struct intel_overlay_error_state *
intel_overlay_capture_error_state(struct drm_i915_private *dev_priv); intel_overlay_capture_error_state(struct drm_i915_private *dev_priv);
void intel_overlay_print_error_state(struct drm_i915_error_state_buf *e, void intel_overlay_print_error_state(struct drm_printer *p,
struct intel_overlay_error_state *error); struct intel_overlay_error_state *error);
#else #else
static inline void intel_overlay_setup(struct drm_i915_private *dev_priv) static inline void intel_overlay_setup(struct drm_i915_private *dev_priv)
...@@ -55,7 +55,7 @@ intel_overlay_capture_error_state(struct drm_i915_private *dev_priv) ...@@ -55,7 +55,7 @@ intel_overlay_capture_error_state(struct drm_i915_private *dev_priv)
{ {
return NULL; return NULL;
} }
static inline void intel_overlay_print_error_state(struct drm_i915_error_state_buf *e, static inline void intel_overlay_print_error_state(struct drm_printer *p,
struct intel_overlay_error_state *error) struct intel_overlay_error_state *error)
{ {
} }
......
...@@ -905,7 +905,7 @@ static void __err_print_to_sgl(struct drm_i915_error_state_buf *m, ...@@ -905,7 +905,7 @@ static void __err_print_to_sgl(struct drm_i915_error_state_buf *m,
} }
if (error->overlay) if (error->overlay)
intel_overlay_print_error_state(m, error->overlay); intel_overlay_print_error_state(&p, error->overlay);
err_print_capabilities(m, error); err_print_capabilities(m, error);
err_print_params(m, &error->params); err_print_params(m, &error->params);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment