drm/i915/kbl: KBL also needs to run the SAGV code

According to BSpec, it's the "core CPUs" that need the code, which
means SKL and KBL, but not BXT.

I don't have a KBL to test this patch on it.

v2: Only SKL should have I915_SAGV_NOT_CONTROLLED.

Cc: stable@vger.kernel.org
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474578035-424-4-git-send-email-paulo.r.zanoni@intel.com
(cherry picked from commit 6e3100ec21e7c774a0fc01e36a1e0739530c2f71)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 1058729843fb..93ae27408e49 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2880,8 +2880,14 @@ skl_wm_plane_id(const struct intel_plane *plane)
 static bool
 intel_has_sagv(struct drm_i915_private *dev_priv)
 {
-        return IS_SKYLAKE(dev_priv) &&
-               dev_priv->sagv_status != I915_SAGV_NOT_CONTROLLED;
+        if (IS_KABYLAKE(dev_priv))
+                return true;
+
+        if (IS_SKYLAKE(dev_priv) &&
+            dev_priv->sagv_status != I915_SAGV_NOT_CONTROLLED)
+                return true;
+
+        return false;
 }
 
 /*
@@ -2919,7 +2925,7 @@ intel_enable_sagv(struct drm_i915_private *dev_priv)
          * Some skl systems, pre-release machines in particular,
          * don't actually have an SAGV.
          */
-        if (ret == -ENXIO) {
+        if (IS_SKYLAKE(dev_priv) && ret == -ENXIO) {
                 DRM_DEBUG_DRIVER("No SAGV found on system, ignoring\n");
                 dev_priv->sagv_status = I915_SAGV_NOT_CONTROLLED;
                 return 0;
@@ -2973,7 +2979,7 @@ intel_disable_sagv(struct drm_i915_private *dev_priv)
          * Some skl systems, pre-release machines in particular,
          * don't actually have an SAGV.
          */
-        if (result == -ENXIO) {
+        if (IS_SKYLAKE(dev_priv) && result == -ENXIO) {
                 DRM_DEBUG_DRIVER("No SAGV found on system, ignoring\n");
                 dev_priv->sagv_status = I915_SAGV_NOT_CONTROLLED;
                 return 0;