drm/i915/fbc: unexport intel_fbc_deactivate

With the addition and usage of intel_fbc_pre_update,
intel_fbc_deactivate is not used anymore outside intel_fbc.c, so kill
the exported function and rename __intel_fbc_deactivate.

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/1453210558-7875-13-git-send-email-paulo.r.zanoni@intel.com

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index b461d73..ee07bf9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1330,7 +1330,6 @@ static inline void intel_fbdev_restore_mode(struct drm_device *dev)
 
 /* intel_fbc.c */
 bool intel_fbc_is_active(struct drm_i915_private *dev_priv);
-void intel_fbc_deactivate(struct intel_crtc *crtc);
 void intel_fbc_pre_update(struct intel_crtc *crtc);
 void intel_fbc_post_update(struct intel_crtc *crtc);
 void intel_fbc_init(struct drm_i915_private *dev_priv);

diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 1c26d65..74e6bcd 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -444,7 +444,7 @@ static void intel_fbc_schedule_activation(struct intel_crtc *crtc)
        schedule_work(&work->work);
 }
 
-static void __intel_fbc_deactivate(struct drm_i915_private *dev_priv)
+static void intel_fbc_deactivate(struct drm_i915_private *dev_priv)
 {
        struct intel_fbc *fbc = &dev_priv->fbc;
 
@@ -456,26 +456,6 @@ static void __intel_fbc_deactivate(struct drm_i915_private *dev_priv)
                fbc->deactivate(dev_priv);
 }
 
-/*
- * intel_fbc_deactivate - deactivate FBC if it's associated with crtc
- * @crtc: the CRTC
- *
- * This function deactivates FBC if it's associated with the provided CRTC.
- */
-void intel_fbc_deactivate(struct intel_crtc *crtc)
-{
-       struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
-       struct intel_fbc *fbc = &dev_priv->fbc;
-
-       if (!fbc_supported(dev_priv))
-               return;
-
-       mutex_lock(&fbc->lock);
-       if (fbc->crtc == crtc)
-               __intel_fbc_deactivate(dev_priv);
-       mutex_unlock(&fbc->lock);
-}
-
 static void set_no_fbc_reason(struct drm_i915_private *dev_priv,
                              const char *reason)
 {
@@ -922,7 +902,7 @@ void intel_fbc_pre_update(struct intel_crtc *crtc)
        intel_fbc_update_state_cache(crtc);
 
 deactivate:
-       __intel_fbc_deactivate(dev_priv);
+       intel_fbc_deactivate(dev_priv);
 unlock:
        mutex_unlock(&fbc->lock);
 }
@@ -955,7 +935,7 @@ static void __intel_fbc_post_update(struct intel_crtc *crtc)
            intel_fbc_reg_params_equal(&old_params, &fbc->params))
                return;
 
-       __intel_fbc_deactivate(dev_priv);
+       intel_fbc_deactivate(dev_priv);
        intel_fbc_schedule_activation(crtc);
        fbc->no_fbc_reason = "FBC enabled (active or scheduled)";
 }
@@ -998,7 +978,7 @@ void intel_fbc_invalidate(struct drm_i915_private *dev_priv,
        fbc->busy_bits |= intel_fbc_get_frontbuffer_bit(fbc) & frontbuffer_bits;
 
        if (fbc->busy_bits)
-               __intel_fbc_deactivate(dev_priv);
+               intel_fbc_deactivate(dev_priv);
 
        mutex_unlock(&fbc->lock);
 }