drm/i915: Make fbc control wrapper functions

Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>

1 files changed, 44 insertions, 22 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 119a41ac3bb6..84c1aca8637e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1048,9 +1048,8 @@ void i8xx_disable_fbc(struct drm_device *dev)
         DRM_DEBUG_KMS("disabled FBC\n");
 }
 
-static bool i8xx_fbc_enabled(struct drm_crtc *crtc)
+static bool i8xx_fbc_enabled(struct drm_device *dev)
 {
-        struct drm_device *dev = crtc->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         return I915_READ(FBC_CONTROL) & FBC_CTL_EN;
@@ -1107,14 +1106,43 @@ void g4x_disable_fbc(struct drm_device *dev)
         DRM_DEBUG_KMS("disabled FBC\n");
 }
 
-static bool g4x_fbc_enabled(struct drm_crtc *crtc)
+static bool g4x_fbc_enabled(struct drm_device *dev)
 {
-        struct drm_device *dev = crtc->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         return I915_READ(DPFC_CONTROL) & DPFC_CTL_EN;
 }
 
+bool intel_fbc_enabled(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        if (!dev_priv->display.fbc_enabled)
+                return false;
+
+        return dev_priv->display.fbc_enabled(dev);
+}
+
+void intel_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
+{
+        struct drm_i915_private *dev_priv = crtc->dev->dev_private;
+
+        if (!dev_priv->display.enable_fbc)
+                return;
+
+        dev_priv->display.enable_fbc(crtc, interval);
+}
+
+void intel_disable_fbc(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        if (!dev_priv->display.disable_fbc)
+                return;
+
+        dev_priv->display.disable_fbc(dev);
+}
+
 /**
  * intel_update_fbc - enable/disable FBC as needed
  * @crtc: CRTC to point the compressor at
@@ -1149,9 +1177,7 @@ static void intel_update_fbc(struct drm_crtc *crtc,
         if (!i915_powersave)
                 return;
 
-        if (!dev_priv->display.fbc_enabled ||
-            !dev_priv->display.enable_fbc ||
-            !dev_priv->display.disable_fbc)
+        if (!I915_HAS_FBC(dev))
                 return;
 
         if (!crtc->fb)
@@ -1198,28 +1224,25 @@ static void intel_update_fbc(struct drm_crtc *crtc,
                 goto out_disable;
         }
 
-        if (dev_priv->display.fbc_enabled(crtc)) {
+        if (intel_fbc_enabled(dev)) {
                 /* We can re-enable it in this case, but need to update pitch */
-                if (fb->pitch > dev_priv->cfb_pitch)
-                        dev_priv->display.disable_fbc(dev);
-                if (obj_priv->fence_reg != dev_priv->cfb_fence)
-                        dev_priv->display.disable_fbc(dev);
-                if (plane != dev_priv->cfb_plane)
-                        dev_priv->display.disable_fbc(dev);
+                if ((fb->pitch > dev_priv->cfb_pitch) ||
+                    (obj_priv->fence_reg != dev_priv->cfb_fence) ||
+                    (plane != dev_priv->cfb_plane))
+                        intel_disable_fbc(dev);
         }
 
-        if (!dev_priv->display.fbc_enabled(crtc)) {
-                /* Now try to turn it back on if possible */
-                dev_priv->display.enable_fbc(crtc, 500);
-        }
+        /* Now try to turn it back on if possible */
+        if (!intel_fbc_enabled(dev))
+                intel_enable_fbc(crtc, 500);
 
         return;
 
 out_disable:
         DRM_DEBUG_KMS("unsupported config, disabling FBC\n");
         /* Multiple disables should be harmless */
-        if (dev_priv->display.fbc_enabled(crtc))
-                dev_priv->display.disable_fbc(dev);
+        if (intel_fbc_enabled(dev))
+                intel_disable_fbc(dev);
 }
 
 static int
@@ -5203,8 +5226,7 @@ static void intel_init_display(struct drm_device *dev)
         else
                 dev_priv->display.dpms = i9xx_crtc_dpms;
 
-        /* Only mobile has FBC, leave pointers NULL for other chips */
-        if (IS_MOBILE(dev)) {
+        if (I915_HAS_FBC(dev)) {
                 if (IS_GM45(dev)) {
                         dev_priv->display.fbc_enabled = g4x_fbc_enabled;
                         dev_priv->display.enable_fbc = g4x_enable_fbc;