drm/i915: Use per-device debugs for bigjoiner stuff

Specify which device we're talking about when spewing
bigjoiner debugs.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220124192638.26262-3-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index a10f693c3b6ef06523d691fcf22ed6d229a1438a..250561eab1e59144e1fe773cfffefb3b3056ac86 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7624,6 +7624,7 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state,
                                        struct intel_crtc_state *old_crtc_state,
                                        struct intel_crtc_state *new_crtc_state)
 {
+       struct drm_i915_private *i915 = to_i915(state->base.dev);
        struct intel_crtc_state *slave_crtc_state, *master_crtc_state;
        struct intel_crtc *slave_crtc, *master_crtc;
 
@@ -7641,9 +7642,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;
        }
 
@@ -7657,16 +7659,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;
 }