3 files changed, 16 insertions, 14 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 7a139a6d4487..5890017b9832 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2794,11 +2794,9 @@ static int i915_gem_setup_global_gtt(struct drm_device *dev,
         i915_address_space_init(&ggtt->base, dev_priv);
         ggtt->base.total += PAGE_SIZE;
 
-        if (intel_vgpu_active(dev_priv)) {
-                ret = intel_vgt_balloon(dev);
-                if (ret)
-                        return ret;
-        }
+        ret = intel_vgt_balloon(dev_priv);
+        if (ret)
+                return ret;
 
         if (!HAS_LLC(dev))
                 ggtt->base.mm.color_adjust = i915_gtt_color_adjust;
@@ -2898,8 +2896,7 @@ void i915_ggtt_cleanup_hw(struct drm_device *dev)
         i915_gem_cleanup_stolen(dev);
 
         if (drm_mm_initialized(&ggtt->base.mm)) {
-                if (intel_vgpu_active(dev_priv))
-                        intel_vgt_deballoon();
+                intel_vgt_deballoon(dev_priv);
 
                 drm_mm_takedown(&ggtt->base.mm);
                 list_del(&ggtt->base.global_link);
diff --git a/drivers/gpu/drm/i915/i915_vgpu.c b/drivers/gpu/drm/i915/i915_vgpu.c
index c3c6c64e5f5e..f6acb5a0e701 100644
--- a/drivers/gpu/drm/i915/i915_vgpu.c
+++ b/drivers/gpu/drm/i915/i915_vgpu.c
@@ -101,10 +101,13 @@ static struct _balloon_info_ bl_info;
  * This function is called to deallocate the ballooned-out graphic memory, when
  * driver is unloaded or when ballooning fails.
  */
-void intel_vgt_deballoon(void)
+void intel_vgt_deballoon(struct drm_i915_private *dev_priv)
 {
         int i;
 
+        if (!intel_vgpu_active(dev_priv))
+                return;
+
         DRM_DEBUG("VGT deballoon.\n");
 
         for (i = 0; i < 4; i++) {
@@ -177,9 +180,8 @@ static int vgt_balloon_space(struct drm_mm *mm,
  * Returns:
  * zero on success, non-zero if configuration invalid or ballooning failed
  */
-int intel_vgt_balloon(struct drm_device *dev)
+int intel_vgt_balloon(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
         struct i915_ggtt *ggtt = &dev_priv->ggtt;
         unsigned long ggtt_end = ggtt->base.start + ggtt->base.total;
 
@@ -187,6 +189,9 @@ int intel_vgt_balloon(struct drm_device *dev)
         unsigned long unmappable_base, unmappable_size, unmappable_end;
         int ret;
 
+        if (!intel_vgpu_active(dev_priv))
+                return 0;
+
         mappable_base = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.base));
         mappable_size = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.size));
         unmappable_base = I915_READ(vgtif_reg(avail_rs.nonmappable_gmadr.base));
@@ -258,6 +263,6 @@ int intel_vgt_balloon(struct drm_device *dev)
 
 err:
         DRM_ERROR("VGT balloon fail\n");
-        intel_vgt_deballoon();
+        intel_vgt_deballoon(dev_priv);
         return ret;
 }
diff --git a/drivers/gpu/drm/i915/i915_vgpu.h b/drivers/gpu/drm/i915/i915_vgpu.h
index 07e67d520273..3c3b2d24e830 100644
--- a/drivers/gpu/drm/i915/i915_vgpu.h
+++ b/drivers/gpu/drm/i915/i915_vgpu.h
@@ -26,8 +26,8 @@
 
 #include "i915_pvinfo.h"
 
-extern void i915_check_vgpu(struct drm_i915_private *dev_priv);
-extern int intel_vgt_balloon(struct drm_device *dev);
-extern void intel_vgt_deballoon(void);
+void i915_check_vgpu(struct drm_i915_private *dev_priv);
+int intel_vgt_balloon(struct drm_i915_private *dev_priv);
+void intel_vgt_deballoon(struct drm_i915_private *dev_priv);
 
 #endif /* _I915_VGPU_H_ */