p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/i915: Fold vGPU active check into inner functions 

v5:
- Let functions take struct drm_i915_private *. (Tvrtko)

- Fold vGPU related active check into the inner functions. (Kevin)

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Suggested-by: Kevin Tian <kevin.tian@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466078825-6662-4-git-send-email-zhi.a.wang@intel.com
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Zhi Wang 2016-06-16 08:06:59 -04:00 committed by Chris Wilson
parent b2a5d1e716
commit b02d22a399
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/i915/i915_gem_gtt.c
View File

@ -2794,11 +2794,9 @@ static int i915_gem_setup_global_gtt(struct drm_device *dev,
i915_address_space_init(&ggtt->base, dev_priv); i915_address_space_init(&ggtt->base, dev_priv);
ggtt->base.total += PAGE_SIZE; ggtt->base.total += PAGE_SIZE;
if (intel_vgpu_active(dev_priv)) { ret = intel_vgt_balloon(dev_priv);
ret = intel_vgt_balloon(dev); if (ret)
if (ret) return ret;
return ret;
}
if (!HAS_LLC(dev)) if (!HAS_LLC(dev))
ggtt->base.mm.color_adjust = i915_gtt_color_adjust; 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); i915_gem_cleanup_stolen(dev);
if (drm_mm_initialized(&ggtt->base.mm)) { if (drm_mm_initialized(&ggtt->base.mm)) {
if (intel_vgpu_active(dev_priv)) intel_vgt_deballoon(dev_priv);
intel_vgt_deballoon();
drm_mm_takedown(&ggtt->base.mm); drm_mm_takedown(&ggtt->base.mm);
list_del(&ggtt->base.global_link); list_del(&ggtt->base.global_link);

13
drivers/gpu/drm/i915/i915_vgpu.c
View File

@ -101,10 +101,13 @@ static struct _balloon_info_ bl_info;
* This function is called to deallocate the ballooned-out graphic memory, when * This function is called to deallocate the ballooned-out graphic memory, when
* driver is unloaded or when ballooning fails. * driver is unloaded or when ballooning fails.
*/ */
void intel_vgt_deballoon(void) void intel_vgt_deballoon(struct drm_i915_private *dev_priv)
{ {
int i; int i;
if (!intel_vgpu_active(dev_priv))
return;
DRM_DEBUG("VGT deballoon.\n"); DRM_DEBUG("VGT deballoon.\n");
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -177,9 +180,8 @@ static int vgt_balloon_space(struct drm_mm *mm,
* Returns: * Returns:
* zero on success, non-zero if configuration invalid or ballooning failed * 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; struct i915_ggtt *ggtt = &dev_priv->ggtt;
unsigned long ggtt_end = ggtt->base.start + ggtt->base.total; 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; unsigned long unmappable_base, unmappable_size, unmappable_end;
int ret; int ret;
if (!intel_vgpu_active(dev_priv))
return 0;
mappable_base = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.base)); mappable_base = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.base));
mappable_size = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.size)); mappable_size = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.size));
unmappable_base = I915_READ(vgtif_reg(avail_rs.nonmappable_gmadr.base)); unmappable_base = I915_READ(vgtif_reg(avail_rs.nonmappable_gmadr.base));
@ -258,6 +263,6 @@ int intel_vgt_balloon(struct drm_device *dev)
err: err:
DRM_ERROR("VGT balloon fail\n"); DRM_ERROR("VGT balloon fail\n");
intel_vgt_deballoon(); intel_vgt_deballoon(dev_priv);
return ret; return ret;
} }

6
drivers/gpu/drm/i915/i915_vgpu.h
View File

@ -26,8 +26,8 @@
#include "i915_pvinfo.h" #include "i915_pvinfo.h"
extern void i915_check_vgpu(struct drm_i915_private *dev_priv); void i915_check_vgpu(struct drm_i915_private *dev_priv);
extern int intel_vgt_balloon(struct drm_device *dev); int intel_vgt_balloon(struct drm_i915_private *dev_priv);
extern void intel_vgt_deballoon(void); void intel_vgt_deballoon(struct drm_i915_private *dev_priv);
#endif /* _I915_VGPU_H_ */ #endif /* _I915_VGPU_H_ */