niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915: Convert intel_vgt_(de)balloon to uncore

Browse source 
More removal of implicit dev_priv from using old mmio accessors.

Furthermore these calls really operate on ggtt so it logically makes sense
if they take it as parameter.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-1-tvrtko.ursulin@linux.intel.com
This commit is contained in:
Tvrtko Ursulin 2019-06-21 08:07:39 +01:00
parent 12fdaf19e0
commit 3cb4ce0024
3 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_gem_gtt.c
View file

@ -2811,7 +2811,7 @@ int i915_gem_init_ggtt(struct drm_i915_private *dev_priv)
ggtt->pin_bias = max_t(u32, I915_GTT_PAGE_SIZE, ggtt->pin_bias = max_t(u32, I915_GTT_PAGE_SIZE,
intel_wopcm_guc_size(&dev_priv->wopcm)); intel_wopcm_guc_size(&dev_priv->wopcm));
ret = intel_vgt_balloon(dev_priv); ret = intel_vgt_balloon(ggtt);
if (ret) if (ret)
return ret; return ret;
@ -2882,7 +2882,7 @@ void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv)
ggtt_release_guc_top(ggtt); ggtt_release_guc_top(ggtt);
if (drm_mm_initialized(&ggtt->vm.mm)) { if (drm_mm_initialized(&ggtt->vm.mm)) {
intel_vgt_deballoon(dev_priv); intel_vgt_deballoon(ggtt);
i915_address_space_fini(&ggtt->vm); i915_address_space_fini(&ggtt->vm);
} }

24
drivers/gpu/drm/i915/i915_vgpu.c
View file

@ -136,17 +136,17 @@ static void vgt_deballoon_space(struct i915_ggtt *ggtt,
* 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(struct drm_i915_private *dev_priv) void intel_vgt_deballoon(struct i915_ggtt *ggtt)
{ {
int i; int i;
if (!intel_vgpu_active(dev_priv)) if (!intel_vgpu_active(ggtt->vm.i915))
return; return;
DRM_DEBUG("VGT deballoon.\n"); DRM_DEBUG("VGT deballoon.\n");
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
vgt_deballoon_space(&dev_priv->ggtt, &bl_info.space[i]); vgt_deballoon_space(ggtt, &bl_info.space[i]);
} }
static int vgt_balloon_space(struct i915_ggtt *ggtt, static int vgt_balloon_space(struct i915_ggtt *ggtt,
@ -214,22 +214,26 @@ static int vgt_balloon_space(struct i915_ggtt *ggtt,
* 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_i915_private *dev_priv) int intel_vgt_balloon(struct i915_ggtt *ggtt)
{ {
struct i915_ggtt *ggtt = &dev_priv->ggtt; struct intel_uncore *uncore = &ggtt->vm.i915->uncore;
unsigned long ggtt_end = ggtt->vm.total; unsigned long ggtt_end = ggtt->vm.total;
unsigned long mappable_base, mappable_size, mappable_end; unsigned long mappable_base, mappable_size, mappable_end;
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)) if (!intel_vgpu_active(ggtt->vm.i915))
return 0; return 0;
mappable_base = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.base)); mappable_base =
mappable_size = I915_READ(vgtif_reg(avail_rs.mappable_gmadr.size)); intel_uncore_read(uncore, vgtif_reg(avail_rs.mappable_gmadr.base));
unmappable_base = I915_READ(vgtif_reg(avail_rs.nonmappable_gmadr.base)); mappable_size =
unmappable_size = I915_READ(vgtif_reg(avail_rs.nonmappable_gmadr.size)); intel_uncore_read(uncore, vgtif_reg(avail_rs.mappable_gmadr.size));
unmappable_base =
intel_uncore_read(uncore, vgtif_reg(avail_rs.nonmappable_gmadr.base));
unmappable_size =
intel_uncore_read(uncore, vgtif_reg(avail_rs.nonmappable_gmadr.size));
mappable_end = mappable_base + mappable_size; mappable_end = mappable_base + mappable_size;
unmappable_end = unmappable_base + unmappable_size; unmappable_end = unmappable_base + unmappable_size;

4
drivers/gpu/drm/i915/i915_vgpu.h
View file

@ -42,7 +42,7 @@ intel_vgpu_has_huge_gtt(struct drm_i915_private *dev_priv)
return dev_priv->vgpu.caps & VGT_CAPS_HUGE_GTT; return dev_priv->vgpu.caps & VGT_CAPS_HUGE_GTT;
} }
int intel_vgt_balloon(struct drm_i915_private *dev_priv); int intel_vgt_balloon(struct i915_ggtt *ggtt);
void intel_vgt_deballoon(struct drm_i915_private *dev_priv); void intel_vgt_deballoon(struct i915_ggtt *ggtt);
#endif /* _I915_VGPU_H_ */ #endif /* _I915_VGPU_H_ */