Messages in this thread | | | Date | Sat, 9 May 2020 13:14:34 +1000 | From | Stephen Rothwell <> | Subject | Re: [PATCH] drm: vmwgfx: include linux/highmem.h |
| |
Hi Arnd,
On Sat, 9 May 2020 00:01:31 +0200 Arnd Bergmann <arnd@arndb.de> 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@arndb.de> > --- > 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 >
Added to linux-next for Monday (in case Andrew doesn't get around to it).
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |