Merge drm/drm-next into drm-intel-next-queued

[linux-block.git] / drivers / gpu / drm / i915 / display / intel_display_debugfs.c

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index cfe2517e0088b0b1fc2a0fd457ba2c7f7012dd8b..d1cb48b3f4628d0e7d8f7b137debd8ae120b83ba 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -632,15 +632,9 @@ static void intel_dp_info(struct seq_file *m,
 }
 
 static void intel_dp_mst_info(struct seq_file *m,
-                         struct intel_connector *intel_connector)
+                             struct intel_connector *intel_connector)
 {
-       struct intel_encoder *intel_encoder = intel_attached_encoder(intel_connector);
-       struct intel_dp_mst_encoder *intel_mst =
-               enc_to_mst(intel_encoder);
-       struct intel_digital_port *intel_dig_port = intel_mst->primary;
-       struct intel_dp *intel_dp = &intel_dig_port->dp;
-       bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr,
-                                       intel_connector->port);
+       bool has_audio = intel_connector->port->has_audio;
 
        seq_printf(m, "\taudio support: %s\n", yesno(has_audio));
 }
@@ -1105,10 +1099,10 @@ static void drrs_status_per_crtc(struct seq_file *m,
                seq_puts(m, "\n\t\t");
                if (drrs->refresh_rate_type == DRRS_HIGH_RR) {
                        seq_puts(m, "DRRS_State: DRRS_HIGH_RR\n");
-                       vrefresh = panel->fixed_mode->vrefresh;
+                       vrefresh = drm_mode_vrefresh(panel->fixed_mode);
                } else if (drrs->refresh_rate_type == DRRS_LOW_RR) {
                        seq_puts(m, "DRRS_State: DRRS_LOW_RR\n");
-                       vrefresh = panel->downclock_mode->vrefresh;
+                       vrefresh = drm_mode_vrefresh(panel->downclock_mode);
                } else {
                        seq_printf(m, "DRRS_State: Unknown(%d)\n",
                                                drrs->refresh_rate_type);
@@ -1984,7 +1978,7 @@ static const struct {
        {"i915_edp_psr_debug", &i915_edp_psr_debug_fops},
 };
 
-int intel_display_debugfs_register(struct drm_i915_private *i915)
+void intel_display_debugfs_register(struct drm_i915_private *i915)
 {
        struct drm_minor *minor = i915->drm.primary;
        int i;
@@ -1997,9 +1991,9 @@ int intel_display_debugfs_register(struct drm_i915_private *i915)
                                    intel_display_debugfs_files[i].fops);
        }
 
-       return drm_debugfs_create_files(intel_display_debugfs_list,
-                                       ARRAY_SIZE(intel_display_debugfs_list),
-                                       minor->debugfs_root, minor);
+       drm_debugfs_create_files(intel_display_debugfs_list,
+                                ARRAY_SIZE(intel_display_debugfs_list),
+                                minor->debugfs_root, minor);
 }
 
 static int i915_panel_show(struct seq_file *m, void *data)