Merge drm/drm-next into drm-misc-next

[linux-2.6-microblaze.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 63c1fb9..8f19701 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -43,12 +43,16 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused)
 {
        struct drm_i915_private *dev_priv = node_to_i915(m->private);
 
+       spin_lock(&dev_priv->display.fb_tracking.lock);
+
        seq_printf(m, "FB tracking busy bits: 0x%08x\n",
                   dev_priv->display.fb_tracking.busy_bits);
 
        seq_printf(m, "FB tracking flip bits: 0x%08x\n",
                   dev_priv->display.fb_tracking.flip_bits);
 
+       spin_unlock(&dev_priv->display.fb_tracking.lock);
+
        return 0;
 }
 
@@ -233,14 +237,13 @@ static void intel_dp_info(struct seq_file *m, struct intel_connector *connector)
 {
        struct intel_encoder *intel_encoder = intel_attached_encoder(connector);
        struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder);
-       const struct edid *edid = drm_edid_raw(connector->detect_edid);
 
        seq_printf(m, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);
        seq_printf(m, "\taudio support: %s\n",
                   str_yes_no(connector->base.display_info.has_audio));
 
        drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp->downstream_ports,
-                               edid, &intel_dp->aux);
+                               connector->detect_edid, &intel_dp->aux);
 }
 
 static void intel_dp_mst_info(struct seq_file *m,