Add a header file for ttm_range_manager function prototypes to eliminate build errors:
../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: In function ‘vmw_vram_manager_init’: ../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:678:8: error: implicit declaration of function ‘ttm_range_man_init’; did you mean ‘ttm_tt_mgr_init’? [-Werror=implicit-function-declaration] ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM, false, ../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: In function ‘vmw_vram_manager_fini’: ../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:690:2: error: implicit declaration of function ‘ttm_range_man_fini’; did you mean ‘ttm_pool_mgr_fini’? [-Werror=implicit-function-declaration] ttm_range_man_fini(&dev_priv->bdev, TTM_PL_VRAM);
Fixes: 9c3006a4cc1b ("drm/ttm: remove available_caching") Fixes: a343160235f5 ("drm/vmwgfx/ttm: fix the non-THP cleanup path.") Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: "VMware Graphics" linux-graphics-maintainer@vmware.com Cc: Roland Scheidegger sroland@vmware.com Cc: Zack Rusin zackr@vmware.com Cc: dri-devel@lists.freedesktop.org Cc: Dave Airlie airlied@redhat.com Cc: Christian König christian.koenig@amd.com --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + 1 file changed, 1 insertion(+)
--- linux-next-20210630.orig/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ linux-next-20210630/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -37,6 +37,7 @@ #include <drm/drm_sysfs.h> #include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_placement.h> +#include <drm/ttm/ttm_range_manager.h> #include <generated/utsrelease.h>
#include "ttm_object.h"
On Jun 30, 2021, at 16:32, Randy Dunlap rdunlap@infradead.org wrote:
Add a header file for ttm_range_manager function prototypes to eliminate build errors:
../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: In function ‘vmw_vram_manager_init’: ../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:678:8: error: implicit declaration of function ‘ttm_range_man_init’; did you mean ‘ttm_tt_mgr_init’? [-Werror=implicit-function-declaration] ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM, false, ../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: In function ‘vmw_vram_manager_fini’: ../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:690:2: error: implicit declaration of function ‘ttm_range_man_fini’; did you mean ‘ttm_pool_mgr_fini’? [-Werror=implicit-function-declaration] ttm_range_man_fini(&dev_priv->bdev, TTM_PL_VRAM);
Fixes: 9c3006a4cc1b ("drm/ttm: remove available_caching") Fixes: a343160235f5 ("drm/vmwgfx/ttm: fix the non-THP cleanup path.") Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: "VMware Graphics" linux-graphics-maintainer@vmware.com Cc: Roland Scheidegger sroland@vmware.com Cc: Zack Rusin zackr@vmware.com Cc: dri-devel@lists.freedesktop.org Cc: Dave Airlie airlied@redhat.com Cc: Christian König christian.koenig@amd.com
Thank you. That change has been part of drm-misc for a few weeks now: https://cgit.freedesktop.org/drm/drm-misc/commit/?id=352a81b71ea0a3ce8f929aa... I think it should be part of the next merge of drm-misc to linux-next. If not I’ll port it to drm-misc-fixes.
z
On Wed, Jun 30, 2021 at 08:36:29PM +0000, Zack Rusin wrote:
On Jun 30, 2021, at 16:32, Randy Dunlap rdunlap@infradead.org wrote:
Add a header file for ttm_range_manager function prototypes to eliminate build errors:
../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: In function ‘vmw_vram_manager_init’: ../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:678:8: error: implicit declaration of function ‘ttm_range_man_init’; did you mean ‘ttm_tt_mgr_init’? [-Werror=implicit-function-declaration] ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM, false, ../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: In function ‘vmw_vram_manager_fini’: ../drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:690:2: error: implicit declaration of function ‘ttm_range_man_fini’; did you mean ‘ttm_pool_mgr_fini’? [-Werror=implicit-function-declaration] ttm_range_man_fini(&dev_priv->bdev, TTM_PL_VRAM);
Fixes: 9c3006a4cc1b ("drm/ttm: remove available_caching") Fixes: a343160235f5 ("drm/vmwgfx/ttm: fix the non-THP cleanup path.") Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: "VMware Graphics" linux-graphics-maintainer@vmware.com Cc: Roland Scheidegger sroland@vmware.com Cc: Zack Rusin zackr@vmware.com Cc: dri-devel@lists.freedesktop.org Cc: Dave Airlie airlied@redhat.com Cc: Christian König christian.koenig@amd.com
Thank you. That change has been part of drm-misc for a few weeks now: https://cgit.freedesktop.org/drm/drm-misc/commit/?id=352a81b71ea0a3ce8f929aa... I think it should be part of the next merge of drm-misc to linux-next. If not I’ll port it to drm-misc-fixes.
It should probably be in drm-misc-next-fixes. drm-misc-next is for 5.15. drm-misc-fixes was for 5.14 and will only reopen after -rc1.
See https://drm.pages.freedesktop.org/maintainer-tools/committer-drm-misc.html#w...
Cheers, Daniel
dri-devel@lists.freedesktop.org
-
Daniel Vetter -
Randy Dunlap -
Zack Rusin