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

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

drivers/gpu/drm/i915/i915_drv.c

+2 −8
Original line number Diff line number Diff line
@@ -842,9 +842,6 @@ 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);

}
@@ -862,9 +859,6 @@ 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);

}

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/intel_display.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE