On Fri, 21 Jan 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Specify which device we're talking about when spewing
> bigjoiner debugs.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 21 +++++++++++---------
> 1 file changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 36e547bd0cbe..9fb72c356208 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -7633,9 +7633,10 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state,
>
> slave_crtc = intel_dsc_get_bigjoiner_secondary(crtc);
> if (!slave_crtc) {
> - DRM_DEBUG_KMS("[CRTC:%d:%s] Big joiner configuration requires "
> - "CRTC + 1 to be used, doesn't exist\n",
> - crtc->base.base.id, crtc->base.name);
> + drm_dbg_kms(&i915->drm,
> + "[CRTC:%d:%s] Big joiner configuration requires "
> + "CRTC + 1 to be used, doesn't exist\n",
> + crtc->base.base.id, crtc->base.name);
> return -EINVAL;
> }
>
> @@ -7649,16 +7650,18 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state,
> if (slave_crtc_state->uapi.enable)
> goto claimed;
>
> - DRM_DEBUG_KMS("[CRTC:%d:%s] Used as slave for big joiner\n",
> - slave_crtc->base.base.id, slave_crtc->base.name);
> + drm_dbg_kms(&i915->drm,
> + "[CRTC:%d:%s] Used as slave for big joiner\n",
> + slave_crtc->base.base.id, slave_crtc->base.name);
>
> return copy_bigjoiner_crtc_state(slave_crtc_state, new_crtc_state);
>
> claimed:
> - DRM_DEBUG_KMS("[CRTC:%d:%s] Slave is enabled as normal CRTC, but "
> - "[CRTC:%d:%s] claiming this CRTC for bigjoiner.\n",
> - slave_crtc->base.base.id, slave_crtc->base.name,
> - master_crtc->base.base.id, master_crtc->base.name);
> + drm_dbg_kms(&i915->drm,
> + "[CRTC:%d:%s] Slave is enabled as normal CRTC, but "
> + "[CRTC:%d:%s] claiming this CRTC for bigjoiner.\n",
> + slave_crtc->base.base.id, slave_crtc->base.name,
> + master_crtc->base.base.id, master_crtc->base.name);
> return -EINVAL;
> }
--
Jani Nikula, Intel Open Source Graphics Center
