drm/i915: tell the user if both KMS and UMS are disabled

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_debugfs.c

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 4f0f697363a29f12351d357ef5d8bff2e984885c..98ab492ee60adef54cff0e90f071c12be0ab7a2c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1858,6 +1858,10 @@ static int per_file_ctx(int id, void *ptr, void *data)
        struct seq_file *m = data;
        struct i915_hw_ppgtt *ppgtt = ctx_to_ppgtt(ctx);
 
+       if (i915_gem_context_is_default(ctx))
+               seq_puts(m, "  default context:\n");
+       else
+               seq_printf(m, "  context %d:\n", ctx->id);
        ppgtt->debug_dump(ppgtt, m);
 
        return 0;
@@ -1917,12 +1921,9 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)
 
        list_for_each_entry_reverse(file, &dev->filelist, lhead) {
                struct drm_i915_file_private *file_priv = file->driver_priv;
-               struct i915_hw_ppgtt *pvt_ppgtt;
 
-               pvt_ppgtt = ctx_to_ppgtt(file_priv->private_default_ctx);
                seq_printf(m, "proc: %s\n",
                           get_pid_task(file->pid, PIDTYPE_PID)->comm);
-               seq_puts(m, "  default context:\n");
                idr_for_each(&file_priv->context_idr, per_file_ctx, m);
        }
        seq_printf(m, "ECOCHK: 0x%08x\n", I915_READ(GAM_ECOCHK));
@@ -2196,12 +2197,12 @@ static void intel_encoder_info(struct seq_file *m,
 
        encoder = &intel_encoder->base;
        seq_printf(m, "\tencoder %d: type: %s, connectors:\n",
-                  encoder->base.id, drm_get_encoder_name(encoder));
+                  encoder->base.id, encoder->name);
        for_each_connector_on_encoder(dev, encoder, intel_connector) {
                struct drm_connector *connector = &intel_connector->base;
                seq_printf(m, "\t\tconnector %d: type: %s, status: %s",
                           connector->base.id,
-                          drm_get_connector_name(connector),
+                          connector->name,
                           drm_get_connector_status_name(connector->status));
                if (connector->status == connector_status_connected) {
                        struct drm_display_mode *mode = &crtc->mode;
@@ -2272,7 +2273,7 @@ static void intel_connector_info(struct seq_file *m,
        struct drm_display_mode *mode;
 
        seq_printf(m, "connector %d: type %s, status: %s\n",
-                  connector->base.id, drm_get_connector_name(connector),
+                  connector->base.id, connector->name,
                   drm_get_connector_status_name(connector->status));
        if (connector->status == connector_status_connected) {
                seq_printf(m, "\tname: %s\n", connector->display_info.name);
@@ -2356,6 +2357,10 @@ static int i915_display_info(struct seq_file *m, void *unused)
                                   x, y, crtc->cursor_addr,
                                   yesno(active));
                }
+
+               seq_printf(m, "\tunderrun reporting: cpu=%s pch=%s \n",
+                          yesno(!crtc->cpu_fifo_underrun_disabled),
+                          yesno(!crtc->pch_fifo_underrun_disabled));
        }
 
        seq_printf(m, "\n");
@@ -2608,7 +2613,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,
 
        *source = INTEL_PIPE_CRC_SOURCE_PIPE;
 
-       mutex_lock(&dev->mode_config.mutex);
+       drm_modeset_lock_all(dev);
        list_for_each_entry(encoder, &dev->mode_config.encoder_list,
                            base.head) {
                if (!encoder->base.crtc)
@@ -2644,7 +2649,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,
                        break;
                }
        }
-       mutex_unlock(&dev->mode_config.mutex);
+       drm_modeset_unlock_all(dev);
 
        return ret;
 }