2021-07-09 18:12:21

by Tong Zhang

[permalink] [raw]
Subject: [PATCH v1] fix vmwgfx compilation error due to a missing include

This patch fixes vmwgfx driver compilation error due to a missing include

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’ [-Werror=implicit-function-declaration]
678 | 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’ [-Werror=implicit-function-declaration]
690 | ttm_range_man_fini(&dev_priv->bdev, TTM_PL_VRAM);
| ^~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors

Signed-off-by: Tong Zhang <[email protected]>
---
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 6f5ea00973e0..6eb93aa2f311 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/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"
--
2.25.1


2021-07-09 19:59:10

by Randy Dunlap

[permalink] [raw]
Subject: Re: [PATCH v1] fix vmwgfx compilation error due to a missing include

On 7/9/21 11:09 AM, Tong Zhang wrote:
> This patch fixes vmwgfx driver compilation error due to a missing include
>
> 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’ [-Werror=implicit-function-declaration]
> 678 | 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’ [-Werror=implicit-function-declaration]
> 690 | ttm_range_man_fini(&dev_priv->bdev, TTM_PL_VRAM);
> | ^~~~~~~~~~~~~~~~~~
> cc1: some warnings being treated as errors
>
> Signed-off-by: Tong Zhang <[email protected]>
> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> index 6f5ea00973e0..6eb93aa2f311 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> +++ b/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"
>

Yes, it's time to get one of these (3 or more) such patches
merged so that linux-next does not continue to have build errors,
like it has for about the last 2 weeks.

thanks.

2021-07-09 20:06:05

by Dave Airlie

[permalink] [raw]
Subject: Re: [PATCH v1] fix vmwgfx compilation error due to a missing include

cc'ing Christian to fix this I assume it was ttm refactor?

>
> This patch fixes vmwgfx driver compilation error due to a missing include
>
> 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’ [-Werror=implicit-function-declaration]
> 678 | 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’ [-Werror=implicit-function-declaration]
> 690 | ttm_range_man_fini(&dev_priv->bdev, TTM_PL_VRAM);
> | ^~~~~~~~~~~~~~~~~~
> cc1: some warnings being treated as errors
>
> Signed-off-by: Tong Zhang <[email protected]>
> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> index 6f5ea00973e0..6eb93aa2f311 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> +++ b/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"
> --
> 2.25.1
>

2021-07-09 20:35:33

by Zack Rusin

[permalink] [raw]
Subject: Re: [PATCH v1] fix vmwgfx compilation error due to a missing include

On 7/9/21 4:04 PM, Dave Airlie wrote:
> cc'ing Christian to fix this I assume it was ttm refactor?

Yes, but it's on me because after fixing it I kept forgetting to queue it up for a merge. It's now in drm-misc/drm-misc-next-fixes.

Thomas, if you could make sure your next drm-misc-next-fixes pull request includes c26d6586e97a ("drm/vmwgfx: Fix implicit declaration error") that'd be great.

z