diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2019-05-22 13:35:05 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-05-23 15:46:42 +0300 |
| commit | 09a93ef3d60f5a439613cd6a806bba265c3663ed (patch) | |
| tree | efb053af1d86239909315e1cca75551c2b6b8703 /drivers/gpu/drm/i915/intel_runtime_pm.h | |
| parent | cfc0e7bbf41baad26ad32bacd43bdab0be6b44d8 (diff) | |
| download | linux-09a93ef3d60f5a439613cd6a806bba265c3663ed.tar.bz2 | |
drm/i915: remove duplicate typedef for intel_wakeref_t
Fix the duplicate typedef for intel_wakeref_t leading to Clang build
issues. While at it, actually make the intel_runtime_pm.h header
self-contained, which was claimed in the commit being fixed.
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
References: http://mid.mail-archive.com/20190521183850.GA9157@archlinux-epyc
References: https://travis-ci.com/ClangBuiltLinux/continuous-integration/jobs/201754420#L2435
Fixes: 0d5adc5f2f01 ("drm/i915: extract intel_runtime_pm.h from intel_drv.h")
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Tested-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190522103505.2082-1-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_runtime_pm.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_runtime_pm.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h index b964ca7af9c8..0a4c4b3aee7d 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.h +++ b/drivers/gpu/drm/i915/intel_runtime_pm.h @@ -6,12 +6,14 @@ #ifndef __INTEL_RUNTIME_PM_H__ #define __INTEL_RUNTIME_PM_H__ -#include <linux/stackdepot.h> #include <linux/types.h> -struct drm_i915_private; +#include "intel_display.h" +#include "intel_wakeref.h" -typedef depot_stack_handle_t intel_wakeref_t; +struct drm_i915_private; +struct drm_printer; +struct intel_encoder; enum i915_drm_suspend_mode { I915_DRM_SUSPEND_IDLE, |