Am 31.07.20 um 08:57 schrieb Thomas Zimmermann:
> Hi
>
> Am 31.07.20 um 06:04 schrieb Dave Airlie:
>> From: Dave Airlie <airl...@redhat.com>
>>
>> This lets the generic mm manager be initialised by the driver.
>>
>> Signed-off-by: Dave Airlie <airl...@redhat.com>
>> ---
>> drivers/gpu/drm/ttm/ttm_bo_manager.c | 23 ++++++++++++++++++++---
>> include/drm/ttm/ttm_bo_driver.h | 3 +++
>> 2 files changed, 23 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c
>> b/drivers/gpu/drm/ttm/ttm_bo_manager.c
>> index facd3049c3aa..64234e5caee3 100644
>> --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
>> +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
>> @@ -104,8 +104,8 @@ static void ttm_bo_man_put_node(struct
>> ttm_mem_type_manager *man,
>> }
>> }
>>
>> -static int ttm_bo_man_init(struct ttm_mem_type_manager *man,
>> - unsigned long p_size)
>> +static int ttm_bo_man_init_private(struct ttm_mem_type_manager *man,
>> + unsigned long p_size)
>> {
>> struct ttm_range_manager *rman;
>>
>> @@ -119,6 +119,23 @@ static int ttm_bo_man_init(struct ttm_mem_type_manager
>> *man,
>> return 0;
>> }
>>
>> +int ttm_bo_man_init(struct ttm_bo_device *bdev,
>> + struct ttm_mem_type_manager *man,
>> + unsigned long p_size)
>> +{
>> + int ret;
>> +
>> + man->func = &ttm_bo_manager_func;
>
> Overriding man->func is the only reason for drivers to call
> ttm_bo_man_init_mm_base and ttm_bo_use_mm directly (e.g., as in nouveau)?
>
> If so, Wouldn't it be better to do
>
> if (!man->func)
> man->func = &ttm_bo_manager_func;
>
> in ttm_bo_man_init and forget about the other fucntions?
>
> Best regards
> Thomas
>
>> +
>> + ttm_bo_init_mm_base(bdev, man, p_size);
>> + ret = ttm_bo_man_init_private(man, p_size);
Oh, I just realized that this line's also missing in nouveau.
>> + if (ret)
>> + return ret;
>> + ttm_bo_use_mm(man);
>> + return 0;
>> +}
>> +EXPORT_SYMBOL(ttm_bo_man_init);
>> +
>> static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
>> {
>> struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
>> @@ -147,7 +164,7 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager
>> *man,
>> }
>>
>> const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
>> - .init = ttm_bo_man_init,
>> + .init = ttm_bo_man_init_private,
>> .takedown = ttm_bo_man_takedown,
>> .get_node = ttm_bo_man_get_node,
>> .put_node = ttm_bo_man_put_node,
>> diff --git a/include/drm/ttm/ttm_bo_driver.h
>> b/include/drm/ttm/ttm_bo_driver.h
>> index 68e75c3b8c7a..5c4ccefd5393 100644
>> --- a/include/drm/ttm/ttm_bo_driver.h
>> +++ b/include/drm/ttm/ttm_bo_driver.h
>> @@ -799,6 +799,9 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object
>> *bo);
>> */
>> pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
>>
>> +int ttm_bo_man_init(struct ttm_bo_device *bdev,
>> + struct ttm_mem_type_manager *man,
>> + unsigned long p_size);
>> extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
>>
>> #endif
>>
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
signature.asc
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
