Commit 414de7a0 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter

drm/i915: remove HAS_PC8 check

Now that PC8 is part of runtime PM, the check is useless.
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9a952a0d
...@@ -842,10 +842,7 @@ static void snb_runtime_suspend(struct drm_i915_private *dev_priv) ...@@ -842,10 +842,7 @@ static void snb_runtime_suspend(struct drm_i915_private *dev_priv)
static void hsw_runtime_suspend(struct drm_i915_private *dev_priv) static void hsw_runtime_suspend(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = dev_priv->dev; hsw_enable_pc8(dev_priv);
if (HAS_PC8(dev))
hsw_enable_pc8(dev_priv);
} }
static void snb_runtime_resume(struct drm_i915_private *dev_priv) static void snb_runtime_resume(struct drm_i915_private *dev_priv)
...@@ -862,10 +859,7 @@ static void snb_runtime_resume(struct drm_i915_private *dev_priv) ...@@ -862,10 +859,7 @@ static void snb_runtime_resume(struct drm_i915_private *dev_priv)
static void hsw_runtime_resume(struct drm_i915_private *dev_priv) static void hsw_runtime_resume(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = dev_priv->dev; hsw_disable_pc8(dev_priv);
if (HAS_PC8(dev))
hsw_disable_pc8(dev_priv);
} }
static int intel_runtime_suspend(struct device *device) static int intel_runtime_suspend(struct device *device)
......
...@@ -1865,7 +1865,6 @@ struct drm_i915_cmd_table { ...@@ -1865,7 +1865,6 @@ struct drm_i915_cmd_table {
#define HAS_DDI(dev) (INTEL_INFO(dev)->has_ddi) #define HAS_DDI(dev) (INTEL_INFO(dev)->has_ddi)
#define HAS_FPGA_DBG_UNCLAIMED(dev) (INTEL_INFO(dev)->has_fpga_dbg) #define HAS_FPGA_DBG_UNCLAIMED(dev) (INTEL_INFO(dev)->has_fpga_dbg)
#define HAS_PSR(dev) (IS_HASWELL(dev) || IS_BROADWELL(dev)) #define HAS_PSR(dev) (IS_HASWELL(dev) || IS_BROADWELL(dev))
#define HAS_PC8(dev) (IS_HASWELL(dev)) /* XXX HSW:ULX */
#define HAS_RUNTIME_PM(dev) (IS_GEN6(dev) || IS_HASWELL(dev)) #define HAS_RUNTIME_PM(dev) (IS_GEN6(dev) || IS_HASWELL(dev))
#define INTEL_PCH_DEVICE_ID_MASK 0xff00 #define INTEL_PCH_DEVICE_ID_MASK 0xff00
......
...@@ -7039,8 +7039,6 @@ void hsw_enable_pc8(struct drm_i915_private *dev_priv) ...@@ -7039,8 +7039,6 @@ void hsw_enable_pc8(struct drm_i915_private *dev_priv)
struct drm_device *dev = dev_priv->dev; struct drm_device *dev = dev_priv->dev;
uint32_t val; uint32_t val;
WARN_ON(!HAS_PC8(dev));
DRM_DEBUG_KMS("Enabling package C8+\n"); DRM_DEBUG_KMS("Enabling package C8+\n");
if (dev_priv->pch_id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) { if (dev_priv->pch_id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
...@@ -7059,8 +7057,6 @@ void hsw_disable_pc8(struct drm_i915_private *dev_priv) ...@@ -7059,8 +7057,6 @@ void hsw_disable_pc8(struct drm_i915_private *dev_priv)
struct drm_device *dev = dev_priv->dev; struct drm_device *dev = dev_priv->dev;
uint32_t val; uint32_t val;
WARN_ON(!HAS_PC8(dev));
DRM_DEBUG_KMS("Disabling package C8+\n"); DRM_DEBUG_KMS("Disabling package C8+\n");
hsw_restore_lcpll(dev_priv); hsw_restore_lcpll(dev_priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment