[PATCH 6/6] drm/i915: add BDW runtime PM support

Paulo Zanoni
2014-03-07T23:12:54Z

From: Paulo Zanoni <paulo.r.zanoni@intel.com>

This sould be enough.

v2: BDW should also run hsw_runtime_resume (Ben).

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 8 ++++++--
drivers/gpu/drm/i915/i915_drv.h | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 55f0181..2dcbbc0 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -874,8 +874,10 @@ static int intel_runtime_suspend(struct device *device)

if (IS_GEN6(dev))
snb_runtime_suspend(dev_priv);
- else if (IS_HASWELL(dev))
+ else if (IS_HASWELL(dev) || IS_BROADWELL(dev))
hsw_runtime_suspend(dev_priv);
+ else
+ WARN_ON(1);

i915_gem_release_all_mmaps(dev_priv);

@@ -910,8 +912,10 @@ static int intel_runtime_resume(struct device *device)

if (IS_GEN6(dev))
snb_runtime_resume(dev_priv);
- else if (IS_HASWELL(dev))
+ else if (IS_HASWELL(dev) || IS_BROADWELL(dev))
hsw_runtime_resume(dev_priv);
+ else
+ WARN_ON(1);

DRM_DEBUG_KMS("Device resumed\n");
return 0;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1debc412..2f7246a 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1997,7 +1997,8 @@ struct drm_i915_cmd_table {
#define HAS_DDI(dev) (INTEL_INFO(dev)->has_ddi)
#define HAS_FPGA_DBG_UNCLAIMED(dev) (INTEL_INFO(dev)->has_fpga_dbg)
#define HAS_PSR(dev) (IS_HASWELL(dev) || IS_BROADWELL(dev))
-#define HAS_RUNTIME_PM(dev) (IS_GEN6(dev) || IS_HASWELL(dev))
+#define HAS_RUNTIME_PM(dev) (IS_GEN6(dev) || IS_HASWELL(dev) || \
+ IS_BROADWELL(dev))

#define INTEL_PCH_DEVICE_ID_MASK 0xff00
#define INTEL_PCH_IBX_DEVICE_ID_TYPE 0x3b00
--
1.8.5.3