On Mon, Oct 24, 2016 at 11:12 AM, Christian König
<deathsimple at vodafone.de> wrote:
> Am 24.10.2016 um 16:59 schrieb Alex Deucher:
>>
>> On Mon, Oct 24, 2016 at 10:40 AM, Christian König
>> <deathsimple at vodafone.de> wrote:
>>>
>>> From: Christian König <christian.koenig at amd.com>
>>>
>>> This way the driver can decide if it is valuable to evict a BO or not.
>>>
>>> The current implementation is added as default to all existing drivers.
>>>
>>> v2: fix some typos found during internal testing
>>>
>>> Signed-off-by: Christian König <christian.koenig at amd.com>
>>
>> Typo in the subject:
>> s/decission/desicion/
>
>
> Are you sure about that? "desicion" sounds wrong as well, probably
> "decision" is correct one. :)
Yes, I haven't fully woken up yet :)
Alex
>
> Christian.
>
>>
>> Alex
>>
>>
>>> ---
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 +
>>> drivers/gpu/drm/ast/ast_ttm.c | 1 +
>>> drivers/gpu/drm/bochs/bochs_mm.c | 1 +
>>> drivers/gpu/drm/cirrus/cirrus_ttm.c | 1 +
>>> drivers/gpu/drm/mgag200/mgag200_ttm.c | 1 +
>>> drivers/gpu/drm/nouveau/nouveau_bo.c | 1 +
>>> drivers/gpu/drm/qxl/qxl_ttm.c | 1 +
>>> drivers/gpu/drm/radeon/radeon_ttm.c | 1 +
>>> drivers/gpu/drm/ttm/ttm_bo.c | 35
>>> +++++++++++++++++++++------------
>>> drivers/gpu/drm/virtio/virtgpu_ttm.c | 1 +
>>> drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 1 +
>>> include/drm/ttm/ttm_bo_api.h | 13 ++++++++++++
>>> include/drm/ttm/ttm_bo_driver.h | 12 +++++++++++
>>> 13 files changed, 57 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>> index 79f3027..c512540 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>> @@ -1106,6 +1106,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
>>> .ttm_tt_unpopulate = &amdgpu_ttm_tt_unpopulate,
>>> .invalidate_caches = &amdgpu_invalidate_caches,
>>> .init_mem_type = &amdgpu_init_mem_type,
>>> + .eviction_valuable = ttm_bo_eviction_valuable,
>>> .evict_flags = &amdgpu_evict_flags,
>>> .move = &amdgpu_bo_move,
>>> .verify_access = &amdgpu_verify_access,
>>> diff --git a/drivers/gpu/drm/ast/ast_ttm.c
>>> b/drivers/gpu/drm/ast/ast_ttm.c
>>> index b29a412..86d1dd1 100644
>>> --- a/drivers/gpu/drm/ast/ast_ttm.c
>>> +++ b/drivers/gpu/drm/ast/ast_ttm.c
>>> @@ -229,6 +229,7 @@ struct ttm_bo_driver ast_bo_driver = {
>>> .ttm_tt_populate = ast_ttm_tt_populate,
>>> .ttm_tt_unpopulate = ast_ttm_tt_unpopulate,
>>> .init_mem_type = ast_bo_init_mem_type,
>>> + .eviction_valuable = ttm_bo_eviction_valuable,
>>> .evict_flags = ast_bo_evict_flags,
>>> .move = NULL,
>>> .verify_access = ast_bo_verify_access,
>>> diff --git a/drivers/gpu/drm/bochs/bochs_mm.c
>>> b/drivers/gpu/drm/bochs/bochs_mm.c
>>> index b109fdc..88def81 100644
>>> --- a/drivers/gpu/drm/bochs/bochs_mm.c
>>> +++ b/drivers/gpu/drm/bochs/bochs_mm.c
>>> @@ -198,6 +198,7 @@ struct ttm_bo_driver bochs_bo_driver = {
>>> .ttm_tt_populate = ttm_pool_populate,
>>> .ttm_tt_unpopulate = ttm_pool_unpopulate,
>>> .init_mem_type = bochs_bo_init_mem_type,
>>> + .eviction_valuable = ttm_bo_eviction_valuable,
>>> .evict_flags = bochs_bo_evict_flags,
>>> .move = NULL,
>>> .verify_access = bochs_bo_verify_access,
>>> diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c
>>> b/drivers/gpu/drm/cirrus/cirrus_ttm.c
>>> index 1cc9ee6..f5624a2 100644
>>> --- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
>>> +++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
>>> @@ -229,6 +229,7 @@ struct ttm_bo_driver cirrus_bo_driver = {
>>> .ttm_tt_populate = cirrus_ttm_tt_populate,
>>> .ttm_tt_unpopulate = cirrus_ttm_tt_unpopulate,
>>> .init_mem_type = cirrus_bo_init_mem_type,
>>> + .eviction_valuable = ttm_bo_eviction_valuable,
>>> .evict_flags = cirrus_bo_evict_flags,
>>> .move = NULL,
>>> .verify_access = cirrus_bo_verify_access,
>>> diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c
>>> b/drivers/gpu/drm/mgag200/mgag200_ttm.c
>>> index 68268e5..2b56152 100644
>>> --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
>>> +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
>>> @@ -229,6 +229,7 @@ struct ttm_bo_driver mgag200_bo_driver = {
>>> .ttm_tt_populate = mgag200_ttm_tt_populate,
>>> .ttm_tt_unpopulate = mgag200_ttm_tt_unpopulate,
>>> .init_mem_type = mgag200_bo_init_mem_type,
>>> + .eviction_valuable = ttm_bo_eviction_valuable,
>>> .evict_flags = mgag200_bo_evict_flags,
>>> .move = NULL,
>>> .verify_access = mgag200_bo_verify_access,
>>> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c
>>> b/drivers/gpu/drm/nouveau/nouveau_bo.c
>>> index 2c7b0d0..eade9a7 100644
>>> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
>>> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
>>> @@ -1607,6 +1607,7 @@ struct ttm_bo_driver nouveau_bo_driver = {
>>> .ttm_tt_unpopulate = &nouveau_ttm_tt_unpopulate,
>>> .invalidate_caches = nouveau_bo_invalidate_caches,
>>> .init_mem_type = nouveau_bo_init_mem_type,
>>> + .eviction_valuable = ttm_bo_eviction_valuable,
>>> .evict_flags = nouveau_bo_evict_flags,
>>> .move_notify = nouveau_bo_move_ntfy,
>>> .move = nouveau_bo_move,
>>> diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c
>>> b/drivers/gpu/drm/qxl/qxl_ttm.c
>>> index 796c4f3..a8d3df5 100644
>>> --- a/drivers/gpu/drm/qxl/qxl_ttm.c
>>> +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
>>> @@ -386,6 +386,7 @@ static struct ttm_bo_driver qxl_bo_driver = {
>>> .ttm_tt_unpopulate = &qxl_ttm_tt_unpopulate,
>>> .invalidate_caches = &qxl_invalidate_caches,
>>> .init_mem_type = &qxl_init_mem_type,
>>> + .eviction_valuable = ttm_bo_eviction_valuable,
>>> .evict_flags = &qxl_evict_flags,
>>> .move = &qxl_bo_move,
>>> .verify_access = &qxl_verify_access,
>>> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c
>>> b/drivers/gpu/drm/radeon/radeon_ttm.c
>>> index c2e0a1c..1439954 100644
>>> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
>>> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
>>> @@ -862,6 +862,7 @@ static struct ttm_bo_driver radeon_bo_driver = {
>>> .ttm_tt_unpopulate = &radeon_ttm_tt_unpopulate,
>>> .invalidate_caches = &radeon_invalidate_caches,
>>> .init_mem_type = &radeon_init_mem_type,
>>> + .eviction_valuable = ttm_bo_eviction_valuable,
>>> .evict_flags = &radeon_evict_flags,
>>> .move = &radeon_bo_move,
>>> .verify_access = &radeon_verify_access,
>>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>>> index 478d563..f19a69b 100644
>>> --- a/drivers/gpu/drm/ttm/ttm_bo.c
>>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
>>> @@ -720,6 +720,20 @@ out:
>>> return ret;
>>> }
>>>
>>> +bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
>>> + const struct ttm_place *place)
>>> +{
>>> + /* Don't evict this BO if it's outside of the
>>> + * requested placement range
>>> + */
>>> + if (place->fpfn >= (bo->mem.start + bo->mem.size) ||
>>> + (place->lpfn && place->lpfn <= bo->mem.start))
>>> + return false;
>>> +
>>> + return true;
>>> +}
>>> +EXPORT_SYMBOL(ttm_bo_eviction_valuable);
>>> +
>>> static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
>>> uint32_t mem_type,
>>> const struct ttm_place *place,
>>> @@ -734,21 +748,16 @@ static int ttm_mem_evict_first(struct ttm_bo_device
>>> *bdev,
>>> spin_lock(&glob->lru_lock);
>>> list_for_each_entry(bo, &man->lru, lru) {
>>> ret = __ttm_bo_reserve(bo, false, true, NULL);
>>> - if (!ret) {
>>> - if (place && (place->fpfn || place->lpfn)) {
>>> - /* Don't evict this BO if it's outside of
>>> the
>>> - * requested placement range
>>> - */
>>> - if (place->fpfn >= (bo->mem.start +
>>> bo->mem.size) ||
>>> - (place->lpfn && place->lpfn <=
>>> bo->mem.start)) {
>>> - __ttm_bo_unreserve(bo);
>>> - ret = -EBUSY;
>>> - continue;
>>> - }
>>> - }
>>> + if (ret)
>>> + continue;
>>>
>>> - break;
>>> + if (place && !bdev->driver->eviction_valuable(bo, place))
>>> {
>>> + __ttm_bo_unreserve(bo);
>>> + ret = -EBUSY;
>>> + continue;
>>> }
>>> +
>>> + break;
>>> }
>>>
>>> if (ret) {
>>> diff --git a/drivers/gpu/drm/virtio/virtgpu_ttm.c
>>> b/drivers/gpu/drm/virtio/virtgpu_ttm.c
>>> index 80482ac..4a1de9f 100644
>>> --- a/drivers/gpu/drm/virtio/virtgpu_ttm.c
>>> +++ b/drivers/gpu/drm/virtio/virtgpu_ttm.c
>>> @@ -425,6 +425,7 @@ static struct ttm_bo_driver virtio_gpu_bo_driver = {
>>> .ttm_tt_unpopulate = &virtio_gpu_ttm_tt_unpopulate,
>>> .invalidate_caches = &virtio_gpu_invalidate_caches,
>>> .init_mem_type = &virtio_gpu_init_mem_type,
>>> + .eviction_valuable = ttm_bo_eviction_valuable,
>>> .evict_flags = &virtio_gpu_evict_flags,
>>> .move = &virtio_gpu_bo_move,
>>> .verify_access = &virtio_gpu_verify_access,
>>> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
>>> b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
>>> index 78b75ee..c894a48 100644
>>> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
>>> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
>>> @@ -849,6 +849,7 @@ struct ttm_bo_driver vmw_bo_driver = {
>>> .ttm_tt_unpopulate = &vmw_ttm_unpopulate,
>>> .invalidate_caches = vmw_invalidate_caches,
>>> .init_mem_type = vmw_init_mem_type,
>>> + .eviction_valuable = ttm_bo_eviction_valuable,
>>> .evict_flags = vmw_evict_flags,
>>> .move = NULL,
>>> .verify_access = vmw_verify_access,
>>> diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
>>> index 9eb940d..bb6a335 100644
>>> --- a/include/drm/ttm/ttm_bo_api.h
>>> +++ b/include/drm/ttm/ttm_bo_api.h
>>> @@ -47,6 +47,8 @@ struct drm_mm_node;
>>>
>>> struct ttm_placement;
>>>
>>> +struct ttm_place;
>>> +
>>> /**
>>> * struct ttm_bus_placement
>>> *
>>> @@ -396,6 +398,17 @@ extern void ttm_bo_unlock_delayed_workqueue(struct
>>> ttm_bo_device *bdev,
>>> int resched);
>>>
>>> /**
>>> + * ttm_bo_eviction_valuable
>>> + *
>>> + * @bo: The buffer object to evict
>>> + * @place: the placement we need to make room for
>>> + *
>>> + * Check if it is valuable to evict the BO to make room for the given
>>> placement.
>>> + */
>>> +bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
>>> + const struct ttm_place *place);
>>> +
>>> +/**
>>> * ttm_bo_synccpu_write_grab
>>> *
>>> * @bo: The buffer object:
>>> diff --git a/include/drm/ttm/ttm_bo_driver.h
>>> b/include/drm/ttm/ttm_bo_driver.h
>>> index f44567c..688cf11 100644
>>> --- a/include/drm/ttm/ttm_bo_driver.h
>>> +++ b/include/drm/ttm/ttm_bo_driver.h
>>> @@ -376,6 +376,18 @@ struct ttm_bo_driver {
>>> int (*invalidate_caches)(struct ttm_bo_device *bdev, uint32_t
>>> flags);
>>> int (*init_mem_type)(struct ttm_bo_device *bdev, uint32_t type,
>>> struct ttm_mem_type_manager *man);
>>> +
>>> + /**
>>> + * struct ttm_bo_driver member eviction_valuable
>>> + *
>>> + * @bo: the buffer object to be evicted
>>> + * @place: placement we need room for
>>> + *
>>> + * Check with the driver if it is valuable to evict a BO to make
>>> room
>>> + * for a certain placement.
>>> + */
>>> + bool (*eviction_valuable)(struct ttm_buffer_object *bo,
>>> + const struct ttm_place *place);
>>> /**
>>> * struct ttm_bo_driver member evict_flags:
>>> *
>>> --
>>> 2.5.0
>>>
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel at lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>
>
>
