Re: [PATCH] drm: vmwgfx: include linux/highmem.h

From: Ira Weiny
Date: Sun May 10 2020 - 23:00:06 EST


On Sat, May 09, 2020 at 12:01:31AM +0200, Arnd Bergmann wrote:
> In order to call kmap_atomic() etc, we need to include linux/highmem.h:
>
> drivers/gpu/drm/vmwgfx/vmwgfx_blit.c: In function 'vmw_bo_cpu_blit_line':
> drivers/gpu/drm/vmwgfx/vmwgfx_blit.c:377:4: error: implicit declaration of function 'kunmap_atomic'; did you mean 'in_atomic'? [-Werror=implicit-function-declaration]
> 377 | kunmap_atomic(d->src_addr);
> | ^~~~~~~~~~~~~
> | in_atomic
> drivers/gpu/drm/vmwgfx/vmwgfx_blit.c:391:5: error: implicit declaration of function 'kmap_atomic_prot' [-Werror=implicit-function-declaration]
> 391 | kmap_atomic_prot(d->dst_pages[dst_page],
> | ^~~~~~~~~~~~~~~~
> drivers/gpu/drm/vmwgfx/vmwgfx_blit.c:390:16: warning: assignment to 'u8 *' {aka 'unsigned char *'} from 'int' makes pointer from integer without a cast [-Wint-conversion]
> 390 | d->dst_addr =
> | ^
> drivers/gpu/drm/vmwgfx/vmwgfx_blit.c:403:16: warning: assignment to 'u8 *' {aka 'unsigned char *'} from 'int' makes pointer from integer without a cast [-Wint-conversion]
> 403 | d->src_addr =
> | ^
>
> Fixes: 46385a895322 ("drm: remove drm specific kmap_atomic code")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

I'm curious about the config which failed... Because this compiled for me.
Regardless it was stupid of me to not include this.

Thanks,

Reviewed-by: Ira Weiny <ira.weiny@xxxxxxxxx>

> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c b/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c
> index 94d456a1d1a9..1629427d5734 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c
> @@ -27,6 +27,7 @@
> **************************************************************************/
>
> #include "vmwgfx_drv.h"
> +#include <linux/highmem.h>
>
> /*
> * Template that implements find_first_diff() for a generic
> --
> 2.26.0
>