diff options
| author | Maarten Lankhorst | 2016-03-14 09:27:52 +0100 |
|---|---|---|
| committer | Maarten Lankhorst | 2016-03-17 09:27:28 +0100 |
| commit | 2dd66ebde4431c93bfa211bc967a6f2089283aa6 (patch) | |
| tree | 851fc8e93ae3b23d8105a86d7bccf3952a808e68 /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | drm/i915: Fix race condition in intel_dp_destroy_mst_connector() (diff) | |
| download | kernel-qcow2-linux-2dd66ebde4431c93bfa211bc967a6f2089283aa6.tar.gz kernel-qcow2-linux-2dd66ebde4431c93bfa211bc967a6f2089283aa6.tar.xz kernel-qcow2-linux-2dd66ebde4431c93bfa211bc967a6f2089283aa6.zip | |
drm/i915: Use a crtc mask instead of a refcount for dpll functions, v2.
This makes it easier to verify correct dpll setup with only a single crtc.
It is also useful to detect double dpll enable/disable.
Changes since v1:
- Rebase on top of Ander's dpll rework.
- Change debugfs active to a mask.
- Change enabled_crtcs and active_crtcs to unsigned.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1457944075-14123-2-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 1d8c3ef29318..ccdca2c7d799 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -3212,8 +3212,8 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused) struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; seq_printf(m, "DPLL%i: %s, id: %i\n", i, pll->name, pll->id); - seq_printf(m, " crtc_mask: 0x%08x, active: %d, on: %s\n", - pll->config.crtc_mask, pll->active, yesno(pll->on)); + seq_printf(m, " crtc_mask: 0x%08x, active: 0x%x, on: %s\n", + pll->config.crtc_mask, pll->active_mask, yesno(pll->on)); seq_printf(m, " tracked hardware state:\n"); seq_printf(m, " dpll: 0x%08x\n", pll->config.hw_state.dpll); seq_printf(m, " dpll_md: 0x%08x\n", |