UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: remove HAS_PC8 check 

Now that PC8 is part of runtime PM, the check is useless.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Paulo Zanoni 2014-03-07 20:12:35 -03:00 committed by Daniel Vetter
parent 9a952a0d42
commit 414de7a020
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/i915_drv.c
View File

@ -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)
{
struct drm_device *dev = dev_priv->dev;
if (HAS_PC8(dev))
hsw_enable_pc8(dev_priv);
hsw_enable_pc8(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)
static void hsw_runtime_resume(struct drm_i915_private *dev_priv)
{
struct drm_device *dev = dev_priv->dev;
if (HAS_PC8(dev))
hsw_disable_pc8(dev_priv);
hsw_disable_pc8(dev_priv);
}
static int intel_runtime_suspend(struct device *device)

1
drivers/gpu/drm/i915/i915_drv.h
View File

@ -1865,7 +1865,6 @@ 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_PC8(dev) (IS_HASWELL(dev)) /* XXX HSW:ULX */
#define HAS_RUNTIME_PM(dev) (IS_GEN6(dev) || IS_HASWELL(dev))
#define INTEL_PCH_DEVICE_ID_MASK 0xff00

4
drivers/gpu/drm/i915/intel_display.c
View File

@ -7039,8 +7039,6 @@ void hsw_enable_pc8(struct drm_i915_private *dev_priv)
struct drm_device *dev = dev_priv->dev;
uint32_t val;
WARN_ON(!HAS_PC8(dev));
DRM_DEBUG_KMS("Enabling package C8+\n");
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)
struct drm_device *dev = dev_priv->dev;
uint32_t val;
WARN_ON(!HAS_PC8(dev));
DRM_DEBUG_KMS("Disabling package C8+\n");
hsw_restore_lcpll(dev_priv);