diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-29 13:47:53 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-29 13:47:53 -0700 |
| commit | e489bda422b0a2c2cc33e598a4d400dfe654ad64 (patch) | |
| tree | 0f055735666904294bee29027f75575e710aeab8 /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | 1c70c0cebd1295a42fec75045b8a6b4419cedef3 (diff) | |
| parent | dc501fbc4389f6c15a8da14684b5926e0d9553da (diff) | |
| download | talos-obmc-linux-e489bda422b0a2c2cc33e598a4d400dfe654ad64.tar.gz talos-obmc-linux-e489bda422b0a2c2cc33e598a4d400dfe654ad64.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index ed627307ab51..e2662497d50f 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1245,13 +1245,17 @@ static int i915_context_status(struct seq_file *m, void *unused) if (ret) return ret; - seq_printf(m, "power context "); - describe_obj(m, dev_priv->pwrctx); - seq_printf(m, "\n"); + if (dev_priv->pwrctx) { + seq_printf(m, "power context "); + describe_obj(m, dev_priv->pwrctx); + seq_printf(m, "\n"); + } - seq_printf(m, "render context "); - describe_obj(m, dev_priv->renderctx); - seq_printf(m, "\n"); + if (dev_priv->renderctx) { + seq_printf(m, "render context "); + describe_obj(m, dev_priv->renderctx); + seq_printf(m, "\n"); + } mutex_unlock(&dev->mode_config.mutex); |
