aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2013-11-21 10:47:15 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-10 16:26:33 -0500
commit7125ecb8297a122d60b2b4be9490f49bfadff8e0 (patch)
treec4008e789c5056ebabfeeac4cf0b1eb645ca0ddb
parent8212d56329b223a106d3d4f7dda95f571b1fa044 (diff)
drm/i915: WARN if !HAS_PC8 when enabling/disabling PC8
We already have some checks and shouldn't be reaching these places on !HAS_PC8 platforms, but add a WARN, just in case. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 10a803f69360..895759b5569f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6638,6 +6638,8 @@ void hsw_enable_pc8_work(struct work_struct *__work)
6638 struct drm_device *dev = dev_priv->dev; 6638 struct drm_device *dev = dev_priv->dev;
6639 uint32_t val; 6639 uint32_t val;
6640 6640
6641 WARN_ON(!HAS_PC8(dev));
6642
6641 if (dev_priv->pc8.enabled) 6643 if (dev_priv->pc8.enabled)
6642 return; 6644 return;
6643 6645
@@ -6683,6 +6685,8 @@ static void __hsw_disable_package_c8(struct drm_i915_private *dev_priv)
6683 if (dev_priv->pc8.disable_count != 1) 6685 if (dev_priv->pc8.disable_count != 1)
6684 return; 6686 return;
6685 6687
6688 WARN_ON(!HAS_PC8(dev));
6689
6686 cancel_delayed_work_sync(&dev_priv->pc8.enable_work); 6690 cancel_delayed_work_sync(&dev_priv->pc8.enable_work);
6687 if (!dev_priv->pc8.enabled) 6691 if (!dev_priv->pc8.enabled)
6688 return; 6692 return;