drm/i915/gvt: return the correct usable aperture size under gvt environment
Subsystems (2)
PATCH v5 1/1 drm/i915/gvt: return the correct usable 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 correct available aperture size exclude the reserved part by balloon.
v2: add 'reserved' in struct i915_address_space to record the reserved size in ggtt (Chris)
v3: remain aper_size as total, adjust aper_available_size exclude reserved and pinned. UMD driver need to adjust the max allocation size according to the available aperture size but not total size. KMD return the correct usable aperture size any time (Chris, Joonas)
v4: decrease reserved in deballoon (Joonas)
v5: add onion teardown in balloon, add vgt_deballoon_space (Joonas)
--- drivers/gpu/drm/i915/i915_gem.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + drivers/gpu/drm/i915/i915_vgpu.c | 44 ++++++++++++++++++++++++++----------- 3 files changed, 34 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +2 -2
@@ -156,8 +156,8 @@ int i915_mutex_lock_interruptible(struct drm_device *dev)mutex_unlock (&dev->struct_mutex); args->aper_size = ggtt->base.total; - args->aper_available_size = args->aper_size - pinned; - + args->aper_available_size = args->aper_size - + ggtt->base.reserved - pinned;return 0 ; }
drivers/gpu/drm/i915/i915_gem_gtt.h +1 -0
@@ -255,6 +255,7 @@ 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) */ +u64 reserved;/* size addr space reserved */ bool closed;
drivers/gpu/drm/i915/i915_vgpu.c +31 -13
99 lines not on this page · raw message
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 correct usable aperture size under gvt environment (rev4)
== Series Details ==
== Series Details ==
Series: drm/i915/gvt: return the correct usable aperture size under gvt environment (rev4)
URL : https://patchwork.freedesktop.org/series/24206/
State : success
== Summary ==
Series 24206v4 drm/i915/gvt: return the correct usable aperture size under gvt environment
https://patchwork.freedesktop.org/api/1.0/series/24206/revisions/4/mbox/
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (fi-skl-6770hq) fdo#99739
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a-frame-sequence:
pass -> FAIL (fi-skl-6770hq) fdo#99788fdo#99739 https://bugs.freedesktop.org/show_bug.cgi?id=99739
fdo#99788 https://bugs.freedesktop.org/show_bug.cgi?id=99788
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:445s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:431s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:584s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:519s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:498s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:498s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:422s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:410s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:422s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:498s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:467s fi-kbl-7500u total:278 pass:255 dwarn:5 dfail:0 fail:0 skip:18 time:461s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:459s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:571s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:468s fi-skl-6770hq total:278 pass:266 dwarn:0 dfail:0 fail:2 skip:10 time:496s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:441s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:533s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time:408s
d6a919d390561ba24c01e3f4119426503c2670ce drm-tip: 2017y-05m-19d-14h-47m-13s UTC integration manifest 1a94ff9 drm/i915/gvt: return the correct usable aperture size under gvt environment
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4756/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Weinan Li
I915_GEM_GET_APERTUREioctl 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 correct available aperture size exclude the reserved part by balloon.
pls fix up patch title as this is for "drm/i915: ..." change although has gvt impact, and I think should be applied through i915 tree. Thanks.
Quoted 167 lines
v2: add 'reserved' in struct
i915_address_spaceto record the reserved size in ggtt (Chris)v3: remain
aper_sizeas total, adjustaper_available_sizeexclude reserved and pinned. UMD driver need to adjust the max allocation size according to the available aperture size but not total size. KMD return the correct usable aperture size any time (Chris, Joonas)v4: decrease reserved in deballoon (Joonas)
v5: add onion teardown in balloon, add
vgt_deballoon_space(Joonas)Suggested-by Chris Wilson <[email protected]>Suggested-by Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Weinan Li <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + drivers/gpu/drm/i915/i915_vgpu.c | 44 ++++++++++++++++++++++++++----------- 3 files changed, 34 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/i915_gem.c +2
-2@@ -156,8 +156,8 @@ int i915_mutex_lock_interruptible(struct drm_device *dev)mutex_unlock (&dev->struct_mutex); args->aper_size = ggtt->base.total; - args->aper_available_size = args->aper_size - pinned; - + args->aper_available_size = args->aper_size - + ggtt->base.reserved - pinned;return 0 ; }drivers/gpu/drm/i915/i915_gem_gtt.h +1
-0@@ -255,6 +255,7 @@ 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) */ +u64 reserved;/* size addr space reserved */ bool closed;drivers/gpu/drm/i915/i915_vgpu.c +31
-13@@ -92,6 +92,17 @@ struct _balloon_info_ {static struct _balloon_info_ bl_info; +static void vgt_deballoon_space (struct i915_ggtt *ggtt, +struct drm_mm_node *node) +{ +DRM_INFO ("deballoon space: range [ 0x%llx - 0x%llx ] %llu KiB.\n" , + node->start, node->start + node->size, node->size /1024 ); + + ggtt->base.reserved -= node->size; +drm_mm_remove_node (node); +memset (node,0 ,sizeof (*node)); +} +/** * intel_vgt_deballoon - deballoon reserved graphics address trunks * @dev_priv: i915 device private data @@ -108,18 +119,15 @@ void intel_vgt_deballoon(struct drm_i915_private *dev_priv)DRM_DEBUG ("VGT deballoon.\n" ); -for (i =0 ; i <4 ; i++) { -if (bl_info.space[i].allocated) -drm_mm_remove_node (&bl_info.space[i]); - } - -memset (&bl_info,0 ,sizeof (bl_info)); +for (i =0 ; i <4 ; i++) +vgt_deballoon_space (&dev_priv->ggtt, &bl_info.space[i]); }static int vgt_balloon_space (struct i915_ggtt *ggtt,struct drm_mm_node *node,unsigned long start,unsigned long end) { +int ret;unsigned long size = end - start;if (start >= end)@@ -127,9 +135,14 @@ static int vgt_balloon_space(struct i915_ggtt *ggtt,DRM_INFO ("balloon space: range [ 0x%lx - 0x%lx ] %lu KiB.\n" , start, end, size /1024 ); -return i915_gem_gtt_reserve (&ggtt->base, node, + ret =i915_gem_gtt_reserve (&ggtt->base, node, size, start,I915_COLOR_UNEVICTABLE ,0 ); +if (!ret) + ggtt->base.reserved += size; +else +memset (node,0 ,sizeof (*node)); +return ret; }/** @@ -215,14 +228,14 @@ int intel_vgt_balloon(struct drm_i915_private *dev_priv) ggtt->mappable_end, unmappable_base);if (ret) - goto err; + goto err_out; }if (unmappable_end < ggtt_end) { ret =vgt_balloon_space (ggtt, &bl_info.space[3 ], unmappable_end, ggtt_end);if (ret) - goto err; + goto err_deballoon_upon_mappable; }/* Mappable graphic memory ballooning */ @@ -231,7 +244,7 @@ int intel_vgt_balloon(struct drm_i915_private *dev_priv) 0, mappable_base);if (ret) - goto err; + goto err_deballoon_upon_unmappable; }if (mappable_end < ggtt->mappable_end) {@@ -239,14 +252,19 @@ int intel_vgt_balloon(struct drm_i915_private *dev_priv) mappable_end, ggtt->mappable_end);if (ret) - goto err; + goto err_deballoon_below_mappable; }DRM_INFO ("VGT balloon successfully\n" );return 0 ; -err: +err_deballoon_below_mappable: +vgt_deballoon_space (ggtt, &bl_info.space[0 ]); +err_deballoon_upon_unmappable: +vgt_deballoon_space (ggtt, &bl_info.space[3 ]); +err_deballoon_upon_mappable: +vgt_deballoon_space (ggtt, &bl_info.space[2 ]); +err_out:DRM_ERROR ("VGT balloon fail\n" ); -intel_vgt_deballoon (dev_priv);return ret; }Signature · 6 lines
1.9.1 _______________________________________________ intel-gvt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
Signature · 3 lines
Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx