]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915/hdcp: convert to struct drm_device based logging.
authorWambui Karuga <wambui.karugax@gmail.com>
Tue, 10 Mar 2020 08:52:45 +0000 (10:52 +0200)
committerJani Nikula <jani.nikula@intel.com>
Wed, 18 Mar 2020 17:41:30 +0000 (19:41 +0200)
Converts various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_hdcp.c.
This also involves extracting the drm_i915_private device from the
intel_connector type for use in the macros.

v2 by Jani:
- rebase

Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Wambui Karuga <wambui.karugax@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/47d5e88dedc08ee48938344296ada550dedd5f90.1583766715.git.jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_hdcp.c

index ee0f27ea2810d03e8bf85a07ea62e9dcccca2e8a..cd3b686980b200a82e07ac0efa979e129d9f8195 100644 (file)
@@ -1391,6 +1391,7 @@ static
 int hdcp2_propagate_stream_management_info(struct intel_connector *connector)
 {
        struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
+       struct drm_i915_private *i915 = to_i915(connector->base.dev);
        struct intel_hdcp *hdcp = &connector->hdcp;
        union {
                struct hdcp2_rep_stream_manage stream_manage;
@@ -1431,7 +1432,7 @@ int hdcp2_propagate_stream_management_info(struct intel_connector *connector)
        hdcp->seq_num_m++;
 
        if (hdcp->seq_num_m > HDCP_2_2_SEQ_NUM_MAX) {
-               DRM_DEBUG_KMS("seq_num_m roll over.\n");
+               drm_dbg_kms(&i915->drm, "seq_num_m roll over.\n");
                return -1;
        }