Wa32bit & Enable 48bit PPGTT
Subsystems (3)
cover Wa32bit & Enable 48bit PPGTT
I am resending the 2 remaining patches to enable 48-bit PPGTT, now that the userland usage has been defined and acknowledged.
These patches are exactly the same that were sent with the rest of the 48-bit PPGTT implementation that are already merged.
There are 2 hardware workarounds needed to allow correct operation with 48b addresses (Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset). A flag (EXEC_OBJECT_SUPPORTS_48B_ADDRESS) will indicate if a given object can be allocated outside the first 4 PDPs; if not, the end range is forced to 4GB. Also, more objects now use the DRM_MM_CREATE_TOP flag. To maintain compatibility, in libdrm I added a new bo_use_48b_address_range function that will flag these objects, while the existing drm_intel_bo_emit_reloc clears it.
Userland patch:
http://lists.freedesktop.org/archives/intel-gfx/2015-September/075086.html
acknowledged:
http://lists.freedesktop.org/archives/intel-gfx/2015-September/075836.html
Michel Thierry (2):
drm/i915: Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset drm/i915/gen8: Flip the 48b switch
drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gem.c | 25 +++++++++++++++++++------ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 13 +++++++++++++ drivers/gpu/drm/i915/i915_gem_gtt.c | 7 ++++++- drivers/gpu/drm/i915/i915_params.c | 2 +- include/uapi/drm/i915_drm.h | 3 ++- 6 files changed, 43 insertions(+), 9 deletions(-)
Signature · 6 lines
2.6.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915: Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset
There are some allocations that must be only referenced by 32-bit offsets. To limit the chances of having the first 4GB already full, objects not requiring this workaround use DRM_MM_SEARCH_BELOW/ DRM_MM_CREATE_TOP flags
In specific, any resource used with flat/heapless (0x00000000-0xfffff000) General State Heap (GSH) or Instruction State Heap (ISH) must be in a 32-bit range, because the General State Offset and Instruction State Offset are limited to 32-bits.
Objects must have EXEC_OBJECT_SUPPORTS_48B_ADDRESS flag to indicate if they can be allocated above the 32-bit address range. To limit the chances of having the first 4GB already full, objects will use DRM_MM_SEARCH_BELOW + DRM_MM_CREATE_TOP flags when possible.
The libdrm user of the EXEC_OBJECT_SUPPORTS_48B_ADDRESS flag is here:
http://lists.freedesktop.org/archives/intel-gfx/2015-September/075836.html
v2: Changed flag logic from neeeds_32b, to supports_48b.
v3: Moved 48-bit support flag back to exec_object. (Chris, Daniel)
v4: Split pin flags into PIN_ZONE_4G and PIN_HIGH; update PIN_OFFSET_MASK to use last PIN_ defined instead of hard-coded value; use correct limit check in eb_vma_misplaced. (Chris)
v5: Don't touch PIN_OFFSET_MASK and update workaround comment (Chris)
v6: Apply pin-high for ggtt too (Chris)
v7: Handle simultaneous pin-high and pin-mappable end correctly (Akash)
Fix check for entries currently using +4GB addresses, use min_t and other polish in object_bind_to_vm (Chris)
v8: Commit message updated to point to libdrm patch.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gem.c | 25 +++++++++++++++++++------ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 13 +++++++++++++ include/uapi/drm/i915_drm.h | 3 ++- 4 files changed, 36 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2826,6 +2826,8 @@ void i915_gem_vma_destroy(struct i915_vma *vma);#define PIN_OFFSET_BIAS (1<<3)#define PIN_USER (1<<4)#define PIN_UPDATE (1<<5) +#define PIN_ZONE_4G (1<<6) +#define PIN_HIGH (1<<7)#define PIN_OFFSET_MASK (~4095) int __must_check i915_gem_object_pin(struct drm_i915_gem_object *obj,
drivers/gpu/drm/i915/i915_gem.c +19 -6
@@ -3354,11 +3354,9 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,struct drm_device *dev = obj->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;u32 fence_alignment, unfenced_alignment; +u32 search_flag, alloc_flag; +u64 start, end;u64 size, fence_size; -u64 start = - flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; -u64 end = - flags &PIN_MAPPABLE ? dev_priv->gtt.mappable_end : vm->total;struct i915_vma *vma;int ret;
@@ -3398,6 +3396,13 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, size = flags &PIN_MAPPABLE ? fence_size : obj->base.size; } + start = flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; + end = vm->total; +if (flags &PIN_MAPPABLE ) + end =min_t (u64, end, dev_priv->gtt.mappable_end); +if (flags &PIN_ZONE_4G ) + end =min_t (u64, end, (1ULL <<32 )); +if (alignment ==0 ) alignment = flags &PIN_MAPPABLE ? fence_alignment : unfenced_alignment;
@@ -3433,13 +3438,21 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,if (IS_ERR (vma)) goto err_unpin; +if (flags &PIN_HIGH ) { + search_flag =DRM_MM_SEARCH_BELOW ; + alloc_flag =DRM_MM_CREATE_TOP ; + }else { + search_flag =DRM_MM_SEARCH_DEFAULT ; + alloc_flag =DRM_MM_CREATE_DEFAULT ; + } + search_free: ret =drm_mm_insert_node_in_range_generic (&vm->mm, &vma->node, size, alignment, obj->cache_level, start, end, -DRM_MM_SEARCH_DEFAULT , -DRM_MM_CREATE_DEFAULT ); + search_flag, + alloc_flag);if (ret) { ret = i915_gem_evict_something(dev, vm, size, alignment, obj->cache_level,
drivers/gpu/drm/i915/i915_gem_execbuffer.c +13 -0
@@ -589,11 +589,20 @@ i915_gem_execbuffer_reserve_vma(struct i915_vma *vma,if (entry->flags &EXEC_OBJECT_NEEDS_GTT ) flags |=PIN_GLOBAL ; +/* Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset, +* limit address to the first 4GBs for unflagged objects. +*/ + flags |=PIN_ZONE_4G ; +if (entry->flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS ) + flags &= ~PIN_ZONE_4G ; +if (!drm_mm_node_allocated (&vma->node)) {if (entry->flags & __EXEC_OBJECT_NEEDS_MAP) flags |=PIN_GLOBAL |PIN_MAPPABLE ;if (entry->flags & __EXEC_OBJECT_NEEDS_BIAS) flags |=BATCH_OFFSET_BIAS |PIN_OFFSET_BIAS ; +if ((flags &PIN_MAPPABLE ) ==0 ) + flags |=PIN_HIGH ; } ret =i915_gem_object_pin (obj, vma->vm, entry->alignment, flags);
@@ -671,6 +680,10 @@ eb_vma_misplaced(struct i915_vma *vma)if (entry->flags & __EXEC_OBJECT_NEEDS_MAP && !obj->map_and_fenceable)return !only_mappable_for_reloc (entry->flags); +if ((entry->flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS ) ==0 && + (vma->node.start + vma->node.size -1 ) >>32 ) +return true; +return false; }
include/uapi/drm/i915_drm.h +2 -1
@@ -690,7 +690,8 @@ struct drm_i915_gem_exec_object2 {#define EXEC_OBJECT_NEEDS_FENCE (1<<0)#define EXEC_OBJECT_NEEDS_GTT (1<<1)#define EXEC_OBJECT_WRITE (1<<2) -#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_WRITE<<1) +#define EXEC_OBJECT_SUPPORTS_48B_ADDRESS (1<<3) +#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_SUPPORTS_48B_ADDRESS<<1)__u64 flags;__u64 rsvd1;
Signature · 6 lines
2.6.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset
On Wed, Sep 30, 2015 at 03:36:18PM +0100, Michel Thierry wrote:
I made one more change based on profiling:
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem_execbuffer.c +0
-0@@ -589,11 +589,20 @@ i915_gem_execbuffer_reserve_vma(struct i915_vma *vma,if (entry->flags &EXEC_OBJECT_NEEDS_GTT )
drivers/gpu/drm/i915/i915_gem_execbuffer.c i915_gem_execbuffer_reserve_vma(struct i915_vma *vma, · line 599
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_execbuffer.c +7
-0flags |=PIN_GLOBAL ; +/* Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset, +* limit address to the first 4GBs for unflagged objects. +*/ + flags |=PIN_ZONE_4G ; +if (entry->flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS ) + flags &= ~PIN_ZONE_4G ; +if (!drm_mm_node_allocated (&vma->node)) {
/* Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset, * limit address to the first 4GBs for unflagged objects. */ if ((entry->flags & EXEC_OBJECT_SUPPORTS_48B_ADDRESS) == 0) flags |= PIN_ZONE_4G;
drivers/gpu/drm/i915/i915_gem_execbuffer.c i915_gem_execbuffer_reserve_vma(struct i915_vma *vma, · line 606
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2
-0if (entry->flags & __EXEC_OBJECT_NEEDS_MAP) flags |=PIN_GLOBAL |PIN_MAPPABLE ;if (entry->flags & __EXEC_OBJECT_NEEDS_BIAS) flags |=BATCH_OFFSET_BIAS |PIN_OFFSET_BIAS ; +if ((flags &PIN_MAPPABLE ) ==0 ) + flags |=PIN_HIGH ; }
It saves me a patch if it we do it now.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset
In reply to Michel ThierryHi,
Quoted 5 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem_execbuffer.c +0
-0
drivers/gpu/drm/i915/i915_gem_execbuffer.c i915_gem_execbuffer_reserve_vma(struct i915_vma *vma, · line 597
Quoted 9 lines
drivers/gpu/drm/i915/i915_gem_execbuffer.c +6
-0@@ -589,11 +589,20 @@ i915_gem_execbuffer_reserve_vma(struct i915_vma *vma,if (entry->flags &EXEC_OBJECT_NEEDS_GTT ) flags |=PIN_GLOBAL ; +/* Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset, +* limit address to the first 4GBs for unflagged objects. +*/ + flags |=PIN_ZONE_4G ; +if (entry->flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS ) + flags &= ~PIN_ZONE_4G ;
I spotted this patch purely accidentally since it was probably the reason pad_to_size IGT started failing in the Android tree - given how there is mention of changing the allocation order. Anyway beside the point..
Point is when I spotted it by accident, I also spotted this unusual handling of flags - set then conditionally clear. Why not conditionally set for one fewer line of code?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset
Quoted 24 lines · Tvrtko Ursulin
Hi,
Quoted 5 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem_execbuffer.c +0
-0drivers/gpu/drm/i915/i915_gem_execbuffer.c i915_gem_execbuffer_reserve_vma(struct i915_vma *vma, · line 597
Quoted 9 lines
drivers/gpu/drm/i915/i915_gem_execbuffer.c +6
-0@@ -589,11 +589,20 @@ i915_gem_execbuffer_reserve_vma(struct i915_vma *vma,if (entry->flags &EXEC_OBJECT_NEEDS_GTT ) flags |=PIN_GLOBAL ; +/* Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset, +* limit address to the first 4GBs for unflagged objects. +*/ + flags |=PIN_ZONE_4G ; +if (entry->flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS ) + flags &= ~PIN_ZONE_4G ;I spotted this patch purely accidentally since it was probably the reason
pad_to_sizeIGT started failing in the Android tree - given how there is mention of changing the allocation order. Anyway beside the point..
Quoted 3 lines
Point is when I spotted it by accident, I also spotted this unusual handling of flags - set then conditionally clear. Why not conditionally set for one fewer line of code?
Because for the next few years entry->flags & 48B will be in the minority. The other reason is that is emphasizes that we limit everything by default and only allow the special objects to use highmem.
The idiom of:
x = default/expected;
if (unlikely)
x = something else;
is fairly commonplace in the kernel, at least before gcc had likely(). -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915: Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset
In reply to Michel ThierryThere are some allocations that must be only referenced by 32-bit offsets. To limit the chances of having the first 4GB already full, objects not requiring this workaround use DRM_MM_SEARCH_BELOW/ DRM_MM_CREATE_TOP flags
In specific, any resource used with flat/heapless (0x00000000-0xfffff000) General State Heap (GSH) or Instruction State Heap (ISH) must be in a 32-bit range, because the General State Offset and Instruction State Offset are limited to 32-bits.
Objects must have EXEC_OBJECT_SUPPORTS_48B_ADDRESS flag to indicate if they can be allocated above the 32-bit address range. To limit the chances of having the first 4GB already full, objects will use DRM_MM_SEARCH_BELOW + DRM_MM_CREATE_TOP flags when possible.
The libdrm user of the EXEC_OBJECT_SUPPORTS_48B_ADDRESS flag is here:
http://lists.freedesktop.org/archives/intel-gfx/2015-September/075836.html
v2: Changed flag logic from neeeds_32b, to supports_48b.
v3: Moved 48-bit support flag back to exec_object. (Chris, Daniel)
v4: Split pin flags into PIN_ZONE_4G and PIN_HIGH; update PIN_OFFSET_MASK to use last PIN_ defined instead of hard-coded value; use correct limit check in eb_vma_misplaced. (Chris)
v5: Don't touch PIN_OFFSET_MASK and update workaround comment (Chris)
v6: Apply pin-high for ggtt too (Chris)
v7: Handle simultaneous pin-high and pin-mappable end correctly (Akash)
Fix check for entries currently using +4GB addresses, use min_t and other polish in object_bind_to_vm (Chris)
v8: Commit message updated to point to libdrm patch.
v9: vmas are allocated in the correct ozone, so only check flag when the
vma has not been allocated. (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gem.c | 25 +++++++++++++++++++------ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 11 +++++++++++ include/uapi/drm/i915_drm.h | 3 ++- 4 files changed, 34 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2826,6 +2826,8 @@ void i915_gem_vma_destroy(struct i915_vma *vma);#define PIN_OFFSET_BIAS (1<<3)#define PIN_USER (1<<4)#define PIN_UPDATE (1<<5) +#define PIN_ZONE_4G (1<<6) +#define PIN_HIGH (1<<7)#define PIN_OFFSET_MASK (~4095) int __must_check i915_gem_object_pin(struct drm_i915_gem_object *obj,
drivers/gpu/drm/i915/i915_gem.c +19 -6
@@ -3354,11 +3354,9 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,struct drm_device *dev = obj->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;u32 fence_alignment, unfenced_alignment; +u32 search_flag, alloc_flag; +u64 start, end;u64 size, fence_size; -u64 start = - flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; -u64 end = - flags &PIN_MAPPABLE ? dev_priv->gtt.mappable_end : vm->total;struct i915_vma *vma;int ret;
@@ -3398,6 +3396,13 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, size = flags &PIN_MAPPABLE ? fence_size : obj->base.size; } + start = flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; + end = vm->total; +if (flags &PIN_MAPPABLE ) + end =min_t (u64, end, dev_priv->gtt.mappable_end); +if (flags &PIN_ZONE_4G ) + end =min_t (u64, end, (1ULL <<32 )); +if (alignment ==0 ) alignment = flags &PIN_MAPPABLE ? fence_alignment : unfenced_alignment;
@@ -3433,13 +3438,21 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,if (IS_ERR (vma)) goto err_unpin; +if (flags &PIN_HIGH ) { + search_flag =DRM_MM_SEARCH_BELOW ; + alloc_flag =DRM_MM_CREATE_TOP ; + }else { + search_flag =DRM_MM_SEARCH_DEFAULT ; + alloc_flag =DRM_MM_CREATE_DEFAULT ; + } + search_free: ret =drm_mm_insert_node_in_range_generic (&vm->mm, &vma->node, size, alignment, obj->cache_level, start, end, -DRM_MM_SEARCH_DEFAULT , -DRM_MM_CREATE_DEFAULT ); + search_flag, + alloc_flag);if (ret) { ret = i915_gem_evict_something(dev, vm, size, alignment, obj->cache_level,
drivers/gpu/drm/i915/i915_gem_execbuffer.c +11 -0
@@ -590,10 +590,17 @@ i915_gem_execbuffer_reserve_vma(struct i915_vma *vma, flags |=PIN_GLOBAL ;if (!drm_mm_node_allocated (&vma->node)) { +/* Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset, +* limit address to the first 4GBs for unflagged objects. +*/ +if ((entry->flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS ) ==0 ) + flags |=PIN_ZONE_4G ;if (entry->flags & __EXEC_OBJECT_NEEDS_MAP) flags |=PIN_GLOBAL |PIN_MAPPABLE ;if (entry->flags & __EXEC_OBJECT_NEEDS_BIAS) flags |=BATCH_OFFSET_BIAS |PIN_OFFSET_BIAS ; +if ((flags &PIN_MAPPABLE ) ==0 ) + flags |=PIN_HIGH ; } ret =i915_gem_object_pin (obj, vma->vm, entry->alignment, flags);
@@ -671,6 +678,10 @@ eb_vma_misplaced(struct i915_vma *vma)if (entry->flags & __EXEC_OBJECT_NEEDS_MAP && !obj->map_and_fenceable)return !only_mappable_for_reloc (entry->flags); +if ((entry->flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS ) ==0 && + (vma->node.start + vma->node.size -1 ) >>32 ) +return true; +return false; }
include/uapi/drm/i915_drm.h +2 -1
@@ -690,7 +690,8 @@ struct drm_i915_gem_exec_object2 {#define EXEC_OBJECT_NEEDS_FENCE (1<<0)#define EXEC_OBJECT_NEEDS_GTT (1<<1)#define EXEC_OBJECT_WRITE (1<<2) -#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_WRITE<<1) +#define EXEC_OBJECT_SUPPORTS_48B_ADDRESS (1<<3) +#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_SUPPORTS_48B_ADDRESS<<1)__u64 flags;__u64 rsvd1;
Signature · 6 lines
2.6.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH v2 (not really v2)] drm/i915: Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset
Quoted 32 lines · Michel Thierry
There are some allocations that must be only referenced by 32-bit offsets. To limit the chances of having the first 4GB already full, objects not requiring this workaround use DRM_MM_SEARCH_BELOW/
DRM_MM_CREATE_TOPflagsIn specific, any resource used with flat/heapless (0x00000000-0xfffff000) General State Heap (GSH) or Instruction State Heap (ISH) must be in a 32-bit range, because the General State Offset and Instruction State Offset are limited to 32-bits.
Objects must have
EXEC_OBJECT_SUPPORTS_48B_ADDRESSflag to indicate if they can be allocated above the 32-bit address range. To limit the chances of having the first 4GB already full, objects will useDRM_MM_SEARCH_BELOW+DRM_MM_CREATE_TOPflags when possible.The libdrm user of the
EXEC_OBJECT_SUPPORTS_48B_ADDRESSflag is here:
http://lists.freedesktop.org/archives/intel-gfx/2015-September/075836.htmlv2: Changed flag logic from
neeeds_32b, tosupports_48b.
v3: Moved 48-bit support flag back toexec_object. (Chris, Daniel)
v4: Split pin flags intoPIN_ZONE_4GandPIN_HIGH; updatePIN_OFFSET_MASKto use lastPIN_defined instead of hard-coded value; use correct limit check ineb_vma_misplaced. (Chris)
v5: Don't touchPIN_OFFSET_MASKand update workaround comment (Chris)
v6: Apply pin-high for ggtt too (Chris)
v7: Handle simultaneous pin-high and pin-mappable end correctly (Akash)
Fix check for entries currently using +4GB addresses, usemin_tand other polish inobject_bind_to_vm(Chris)
v8: Commit message updated to point to libdrm patch.
v9: vmas are allocated in the correct ozone, so only check flag when the
vma has not been allocated. (Chris)
Quoted 3 lines
Cc Chris Wilson <[email protected]>Reviewed-by Chris Wilson <[email protected]> (v4)Signed-off-by Michel Thierry <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 130 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gem.c | 25 +++++++++++++++++++------ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 11 +++++++++++ include/uapi/drm/i915_drm.h | 3 ++- 4 files changed, 34 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -2826,6 +2826,8 @@ void i915_gem_vma_destroy(struct i915_vma *vma);#define PIN_OFFSET_BIAS (1<<3)#define PIN_USER (1<<4)#define PIN_UPDATE (1<<5) +#define PIN_ZONE_4G (1<<6) +#define PIN_HIGH (1<<7)#define PIN_OFFSET_MASK (~4095) int __must_check i915_gem_object_pin(struct drm_i915_gem_object *obj,drivers/gpu/drm/i915/i915_gem.c +19
-6@@ -3354,11 +3354,9 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,struct drm_device *dev = obj->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;u32 fence_alignment, unfenced_alignment; +u32 search_flag, alloc_flag; +u64 start, end;u64 size, fence_size; -u64 start = - flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; -u64 end = - flags &PIN_MAPPABLE ? dev_priv->gtt.mappable_end : vm->total;struct i915_vma *vma;int ret;@@ -3398,6 +3396,13 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, size = flags &PIN_MAPPABLE ? fence_size : obj->base.size; } + start = flags &PIN_OFFSET_BIAS ? flags &PIN_OFFSET_MASK :0 ; + end = vm->total; +if (flags &PIN_MAPPABLE ) + end =min_t (u64, end, dev_priv->gtt.mappable_end); +if (flags &PIN_ZONE_4G ) + end =min_t (u64, end, (1ULL <<32 )); +if (alignment ==0 ) alignment = flags &PIN_MAPPABLE ? fence_alignment : unfenced_alignment;@@ -3433,13 +3438,21 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,if (IS_ERR (vma)) goto err_unpin; +if (flags &PIN_HIGH ) { + search_flag =DRM_MM_SEARCH_BELOW ; + alloc_flag =DRM_MM_CREATE_TOP ; + }else { + search_flag =DRM_MM_SEARCH_DEFAULT ; + alloc_flag =DRM_MM_CREATE_DEFAULT ; + } + search_free: ret =drm_mm_insert_node_in_range_generic (&vm->mm, &vma->node, size, alignment, obj->cache_level, start, end, -DRM_MM_SEARCH_DEFAULT , -DRM_MM_CREATE_DEFAULT ); + search_flag, + alloc_flag);if (ret) { ret = i915_gem_evict_something(dev, vm, size, alignment, obj->cache_level,drivers/gpu/drm/i915/i915_gem_execbuffer.c +11
-0@@ -590,10 +590,17 @@ i915_gem_execbuffer_reserve_vma(struct i915_vma *vma, flags |=PIN_GLOBAL ;if (!drm_mm_node_allocated (&vma->node)) { +/* Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset, +* limit address to the first 4GBs for unflagged objects. +*/ +if ((entry->flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS ) ==0 ) + flags |=PIN_ZONE_4G ;if (entry->flags & __EXEC_OBJECT_NEEDS_MAP) flags |=PIN_GLOBAL |PIN_MAPPABLE ;if (entry->flags & __EXEC_OBJECT_NEEDS_BIAS) flags |=BATCH_OFFSET_BIAS |PIN_OFFSET_BIAS ; +if ((flags &PIN_MAPPABLE ) ==0 ) + flags |=PIN_HIGH ; } ret =i915_gem_object_pin (obj, vma->vm, entry->alignment, flags);@@ -671,6 +678,10 @@ eb_vma_misplaced(struct i915_vma *vma)if (entry->flags & __EXEC_OBJECT_NEEDS_MAP && !obj->map_and_fenceable)return !only_mappable_for_reloc (entry->flags); +if ((entry->flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS ) ==0 && + (vma->node.start + vma->node.size -1 ) >>32 ) +return true; +return false; }include/uapi/drm/i915_drm.h +2
-1@@ -690,7 +690,8 @@ struct drm_i915_gem_exec_object2 {#define EXEC_OBJECT_NEEDS_FENCE (1<<0)#define EXEC_OBJECT_NEEDS_GTT (1<<1)#define EXEC_OBJECT_WRITE (1<<2) -#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_WRITE<<1) +#define EXEC_OBJECT_SUPPORTS_48B_ADDRESS (1<<3) +#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_SUPPORTS_48B_ADDRESS<<1)__u64 flags;__u64 rsvd1;Signature · 6 lines
2.6.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/gen8: Flip the 48b switch
In reply to Michel ThierryUse 48b addresses if hw supports it (i915.enable_ppgtt=3). Update the sanitize_enable_ppgtt for 48 bit PPGTT mode.
Note, aliasing PPGTT remains 32b only.
v2: s/full_64b/full_48b/. (Akash)
v3: Add sanitize_enable_ppgtt changes until here. (Akash)
v4: Update param description (Chris)
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 ++++++- drivers/gpu/drm/i915/i915_params.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +6 -1
@@ -104,9 +104,11 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) {bool has_aliasing_ppgtt;bool has_full_ppgtt; +bool has_full_48bit_ppgtt; has_aliasing_ppgtt =INTEL_INFO (dev)->gen >=6 ; has_full_ppgtt =INTEL_INFO (dev)->gen >=7 ; + has_full_48bit_ppgtt =IS_BROADWELL (dev) ||INTEL_INFO (dev)->gen >=9 ;if (intel_vgpu_active (dev)) has_full_ppgtt = false;/* emulation is too hard */
@@ -125,6 +127,9 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)if (enable_ppgtt ==2 && has_full_ppgtt)return 2 ; +if (enable_ppgtt ==3 && has_full_48bit_ppgtt) +return 3 ; +#ifdef CONFIG_INTEL_IOMMU /* Disable ppgtt on SNB if VT-d is on. */ if (INTEL_INFO (dev)->gen ==6 && intel_iommu_gfx_mapped) {
@@ -141,7 +146,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) }if (INTEL_INFO (dev)->gen >=8 && i915.enable_execlists) -return 2 ; +return has_full_48bit_ppgtt ?3 :2 ;else return has_aliasing_ppgtt ?1 :0 ; }
drivers/gpu/drm/i915/i915_params.c +1 -1
@@ -111,7 +111,7 @@ MODULE_PARM_DESC(enable_hangcheck,module_param_named_unsafe (enable_ppgtt, i915.enable_ppgtt, int,0400 );MODULE_PARM_DESC (enable_ppgtt,"Override PPGTT usage. " -"(-1=auto [default], 0=disabled, 1=aliasing, 2=full)" ); +"(-1=auto [default], 0=disabled, 1=aliasing, 2=full, 3=full with extended address space)" );module_param_named_unsafe (enable_execlists, i915.enable_execlists, int,0400 ); MODULE_PARM_DESC(enable_execlists,
Signature · 6 lines
2.6.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH 2/2] drm/i915/gen8: Flip the 48b switch
Quoted 5 lines · Michel Thierry
Use 48b addresses if hw supports it (i915.enable_ppgtt=3). Update the
sanitize_enable_ppgttfor 48 bit PPGTT mode.Note, aliasing PPGTT remains 32b only.
Quoted 7 lines
v2: s/full_64b/full_48b/. (Akash)
v3: Addsanitize_enable_ppgttchanges until here. (Akash)
v4: Update param description (Chris)Cc Akash Goel <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>
Queued for -next, thanks for the patch. Can you please ping someone from mesa to push the libdrm/mesa patches too?
Cheers, Daniel
Quoted 60 lines
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 ++++++- drivers/gpu/drm/i915/i915_params.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +6
-1@@ -104,9 +104,11 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) {bool has_aliasing_ppgtt;bool has_full_ppgtt; +bool has_full_48bit_ppgtt; has_aliasing_ppgtt =INTEL_INFO (dev)->gen >=6 ; has_full_ppgtt =INTEL_INFO (dev)->gen >=7 ; + has_full_48bit_ppgtt =IS_BROADWELL (dev) ||INTEL_INFO (dev)->gen >=9 ;if (intel_vgpu_active (dev)) has_full_ppgtt = false;/* emulation is too hard */ @@ -125,6 +127,9 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)if (enable_ppgtt ==2 && has_full_ppgtt)return 2 ; +if (enable_ppgtt ==3 && has_full_48bit_ppgtt) +return 3 ; +#ifdef CONFIG_INTEL_IOMMU /* Disable ppgtt on SNB if VT-d is on. */ if (INTEL_INFO (dev)->gen ==6 && intel_iommu_gfx_mapped) {@@ -141,7 +146,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) }if (INTEL_INFO (dev)->gen >=8 && i915.enable_execlists) -return 2 ; +return has_full_48bit_ppgtt ?3 :2 ;else return has_aliasing_ppgtt ?1 :0 ; }drivers/gpu/drm/i915/i915_params.c +1
-1@@ -111,7 +111,7 @@ MODULE_PARM_DESC(enable_hangcheck,module_param_named_unsafe (enable_ppgtt, i915.enable_ppgtt, int,0400 );MODULE_PARM_DESC (enable_ppgtt,"Override PPGTT usage. " -"(-1=auto [default], 0=disabled, 1=aliasing, 2=full)" ); +"(-1=auto [default], 0=disabled, 1=aliasing, 2=full, 3=full with extended address space)" );module_param_named_unsafe (enable_execlists, i915.enable_execlists, int,0400 ); MODULE_PARM_DESC(enable_execlists,Signature · 6 lines
2.6.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/gen8: Flip the 48b switch
Quoted 10 lines · Daniel Vetter
Quoted 9 lines · Michel Thierry
Use 48b addresses if hw supports it (i915.enable_ppgtt=3). Update the
sanitize_enable_ppgttfor 48 bit PPGTT mode.Note, aliasing PPGTT remains 32b only.
v2: s/full_64b/full_48b/. (Akash)
v3: Addsanitize_enable_ppgttchanges until here. (Akash)
v4: Update param description (Chris)
Quoted 7 lines
Quoted 3 lines
Cc Akash Goel <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>Queued for -next, thanks for the patch. Can you please ping someone from mesa to push the libdrm/mesa patches too?
Sure, I'll start the libdmr-mesa process.
Thanks,
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/gen8: Flip the 48b switch
In reply to Daniel VetterQuoted 10 lines · Daniel Vetter
Quoted 9 lines · Michel Thierry
Use 48b addresses if hw supports it (i915.enable_ppgtt=3). Update the
sanitize_enable_ppgttfor 48 bit PPGTT mode.Note, aliasing PPGTT remains 32b only.
v2: s/full_64b/full_48b/. (Akash)
v3: Addsanitize_enable_ppgttchanges until here. (Akash)
v4: Update param description (Chris)
Quoted 9 lines
Quoted 3 lines
Cc Akash Goel <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>Queued for -next, thanks for the patch. Can you please ping someone from mesa to push the libdrm/mesa patches too?
Cheers, Daniel
Sorry I didn't report this earlier, but I just realized I can't find this patch in the tree.
There's still the discussion of where to apply the 32-bit workaround and the different behavior seen in mesa (not if it isn't needed)... but the code was written to not require that flag in order to start using the 4-level page translation.
Thanks,
-Michel
Quoted 56 lines
Quoted 56 lines
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 ++++++- drivers/gpu/drm/i915/i915_params.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +6
-1@@ -104,9 +104,11 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) {bool has_aliasing_ppgtt;bool has_full_ppgtt; +bool has_full_48bit_ppgtt; has_aliasing_ppgtt =INTEL_INFO (dev)->gen >=6 ; has_full_ppgtt =INTEL_INFO (dev)->gen >=7 ; + has_full_48bit_ppgtt =IS_BROADWELL (dev) ||INTEL_INFO (dev)->gen >=9 ;if (intel_vgpu_active (dev)) has_full_ppgtt = false;/* emulation is too hard */ @@ -125,6 +127,9 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)if (enable_ppgtt ==2 && has_full_ppgtt)return 2 ; +if (enable_ppgtt ==3 && has_full_48bit_ppgtt) +return 3 ; +#ifdef CONFIG_INTEL_IOMMU /* Disable ppgtt on SNB if VT-d is on. */ if (INTEL_INFO (dev)->gen ==6 && intel_iommu_gfx_mapped) {@@ -141,7 +146,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) }if (INTEL_INFO (dev)->gen >=8 && i915.enable_execlists) -return 2 ; +return has_full_48bit_ppgtt ?3 :2 ;else return has_aliasing_ppgtt ?1 :0 ; }drivers/gpu/drm/i915/i915_params.c +1
-2@@ -111,7 +111,7 @@ MODULE_PARM_DESC(enable_hangcheck,module_param_named_unsafe (enable_ppgtt, i915.enable_ppgtt, int,0400 );MODULE_PARM_DESC (enable_ppgtt,"Override PPGTT usage. " -"(-1=auto [default], 0=disabled, 1=aliasing, 2=full)" ); +"(-1=auto [default], 0=disabled, 1=aliasing, 2=full, 3=full with extended address space)" );module_param_named_unsafe (enable_execlists, i915.enable_execlists, int,0400 ); MODULE_PARM_DESC(enable_execlists, --2.6.0
Quoted 5 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH 2/2] drm/i915/gen8: Flip the 48b switch
Quoted 15 lines · Michel Thierry
Quoted 14 lines · Daniel Vetter
Quoted 12 lines · Michel Thierry
Use 48b addresses if hw supports it (i915.enable_ppgtt=3). Update the
sanitize_enable_ppgttfor 48 bit PPGTT mode.Note, aliasing PPGTT remains 32b only.
v2: s/full_64b/full_48b/. (Akash)
v3: Addsanitize_enable_ppgttchanges until here. (Akash)
v4: Update param description (Chris)Cc Akash Goel <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>
Quoted 8 lines
Quoted 5 lines
Queued for -next, thanks for the patch. Can you please ping someone from mesa to push the libdrm/mesa patches too?
Cheers, Daniel
Sorry I didn't report this earlier, but I just realized I can't find this patch in the tree.
Indeed I seem to have never pushed it. Sorry.
Quoted 4 lines
There's still the discussion of where to apply the 32-bit workaround and the different behavior seen in mesa (not if it isn't needed)... but the code was written to not require that flag in order to start using the 4-level page translation.
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/gen8: Flip the 48b switch
Quoted 25 lines · Daniel Vetter
Quoted 15 lines · Michel Thierry
Quoted 14 lines · Daniel Vetter
Quoted 12 lines · Michel Thierry
Use 48b addresses if hw supports it (i915.enable_ppgtt=3). Update the
sanitize_enable_ppgttfor 48 bit PPGTT mode.Note, aliasing PPGTT remains 32b only.
v2: s/full_64b/full_48b/. (Akash)
v3: Addsanitize_enable_ppgttchanges until here. (Akash)
v4: Update param description (Chris)Cc Akash Goel <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>Quoted 8 lines
Quoted 5 lines
Queued for -next, thanks for the patch. Can you please ping someone from mesa to push the libdrm/mesa patches too?
Cheers, Daniel
Sorry I didn't report this earlier, but I just realized I can't find this patch in the tree.
Quoted 8 lines
Indeed I seem to have never pushed it. Sorry.
Quoted 4 lines
There's still the discussion of where to apply the 32-bit workaround and the different behavior seen in mesa (not if it isn't needed)... but the code was written to not require that flag in order to start using the 4-level page translation.
Queued for -next, thanks for the patch.
We never got an answer whether there was any impact on existing userspace which is constained to 4GiB (where the last level of pagetables are superfluous).
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx