projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
caf4e25
)
drm/i915: Fix build without CONFIG_PM
author
Chris Wilson
<
[email protected]
>
Mon, 15 Jun 2015 11:52:28 +0000
(12:52 +0100)
committer
Daniel Vetter
<
[email protected]
>
Mon, 15 Jun 2015 13:43:07 +0000
(15:43 +0200)
drivers/gpu/drm/i915/i915_debugfs.c: In function ‘i915_runtime_pm_status’:
drivers/gpu/drm/i915/i915_debugfs.c:2528:34: error: ‘struct dev_pm_info’ has no member named ‘usage_count’
atomic_read(&dev->dev->power.usage_count));
Regression from commit
a6aaec8be22652a808d6e316d4a92e58cb75e986
Author: Damien Lespiau <
[email protected]
>
Date: Thu Jun 4 18:23:58 2015 +0100
drm/i915: Add runtime PM's usage_count in i915_runtime_pm_status
Signed-off-by: Chris Wilson <
[email protected]
>
Cc: Damien Lespiau <
[email protected]
>
Cc: Paulo Zanoni <
[email protected]
>
Cc: Jani Nikula <
[email protected]
>
Reviewed-by: Damien Lespiau <
[email protected]
>
Signed-off-by: Daniel Vetter <
[email protected]
>
drivers/gpu/drm/i915/i915_debugfs.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_debugfs.c
b/drivers/gpu/drm/i915/i915_debugfs.c
index 47d9854434c598d2770dbb86990e562d5bc6e452..2ad71ef8677068c9bf981d7254535f93770f8c66 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_debugfs.c
+++ b/
drivers/gpu/drm/i915/i915_debugfs.c
@@
-2490,8
+2490,12
@@
static int i915_runtime_pm_status(struct seq_file *m, void *unused)
seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy));
seq_printf(m, "IRQs disabled: %s\n",
yesno(!intel_irqs_enabled(dev_priv)));
+#ifdef CONFIG_PM
seq_printf(m, "Usage count: %d\n",
atomic_read(&dev->dev->power.usage_count));
+#else
+ seq_printf(m, "Device Power Management (CONFIG_PM) disabled\n");
+#endif
return 0;
}