drm/i915/gvt: return the actual aperture size under gvt environment
Subsystems (2)
PATCH v2 1/1 drm/i915/gvt: return the actual aperture size under gvt environment
I915_GEM_GET_APERTURE ioctl is used to probe aperture size from userspace. In gvt environment, each vm only use the ballooned part of aperture, so we should return the actual aperture size exclude the reserved part by balloon.
I915_GEM_CONTEXT_GETPARAM ioctl query the I915_CONTEXT_PARAM_GTT_SIZE, we also need to exclude the reserved part in GTT.
v2: add 'reserved' in struct i915_address_space to record the reserved size in ggtt by balloon.
--- drivers/gpu/drm/i915/i915_gem.c | 6 ++---- drivers/gpu/drm/i915/i915_gem_context.c | 3 ++- drivers/gpu/drm/i915/i915_gem_gtt.h | 3 ++- drivers/gpu/drm/i915/i915_vgpu.c | 5 ++++- 4 files changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +2 -4
@@ -145,9 +145,8 @@ int i915_mutex_lock_interruptible(struct drm_device *dev)struct i915_ggtt *ggtt = &dev_priv->ggtt;struct drm_i915_gem_get_aperture *args = data;struct i915_vma *vma; -size_t pinned; +size_t pinned =0 ; - pinned =0 ;mutex_lock (&dev->struct_mutex);list_for_each_entry (vma, &ggtt->base.active_list, vm_link)if (i915_vma_is_pinned (vma))
@@ -157,9 +156,8 @@ int i915_mutex_lock_interruptible(struct drm_device *dev) pinned += vma->node.size;mutex_unlock (&dev->struct_mutex); - args->aper_size = ggtt->base.total; + args->aper_size = ggtt->base.total - ggtt->base.reserved; args->aper_available_size = args->aper_size - pinned; -return 0 ; }
drivers/gpu/drm/i915/i915_gem_context.c +2 -1
@@ -1053,7 +1053,8 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data,else if (to_i915 (dev)->mm.aliasing_ppgtt) args->value =to_i915 (dev)->mm.aliasing_ppgtt->base.total;else - args->value =to_i915 (dev)->ggtt.base.total; + args->value =to_i915 (dev)->ggtt.base.total - +to_i915 (dev)->ggtt.base.reserved;break ;case I915_CONTEXT_PARAM_NO_ERROR_CAPTURE : args->value =i915_gem_context_no_error_capture (ctx);
drivers/gpu/drm/i915/i915_gem_gtt.h +2 -1
@@ -255,7 +255,8 @@ struct i915_address_space {struct drm_i915_file_private *file;struct list_head global_link;u64 total;/* size addr space maps (ex. 2GB for ggtt) */ - +/* size addr space reserved by GVT balloon, only used for ggtt */ +u64 reserved;bool closed;struct i915_page_dma scratch_page;
drivers/gpu/drm/i915/i915_vgpu.c +4 -1
@@ -183,7 +183,7 @@ int intel_vgt_balloon(struct drm_i915_private *dev_priv)unsigned long mappable_base, mappable_size, mappable_end;unsigned long unmappable_base, unmappable_size, unmappable_end; -int ret; +int ret, i;if (!intel_vgpu_active (dev_priv))return 0 ;
@@ -242,6 +242,9 @@ int intel_vgt_balloon(struct drm_i915_private *dev_priv) goto err; } +for (i =0 ; i <ARRAY_SIZE (bl_info.space); i++) + ggtt->base.reserved += bl_info.space[i].size; +DRM_INFO ("VGT balloon successfully\n" );return 0 ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/gvt: return the actual aperture size under gvt environment (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915/gvt: return the actual aperture size under gvt environment (rev2)
URL : https://patchwork.freedesktop.org/series/22910/
State : success
== Summary ==
Series 22910v2 drm/i915/gvt: return the actual aperture size under gvt environment
https://patchwork.freedesktop.org/api/1.0/series/22910/revisions/2/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
pass -> DMESG-WARN (fi-snb-2600) fdo#100125fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:435s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:427s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:574s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:505s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:538s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:481s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:484s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:413s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:401s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:423s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:493s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:466s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:453s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:576s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:454s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:576s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:460s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:492s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:428s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:529s fi-snb-2600 total:278 pass:248 dwarn:1 dfail:0 fail:0 skip:29 time:408s
22e5f388a82d66e4e078e0d5ffef0fdeb36dcfe7 drm-tip: 2017y-04m-12d-21h-50m-17s UTC integration manifest 84a2714 drm/i915/gvt: return the actual aperture size under gvt environment
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4499/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx