drm: vmwgfx: include linux/highmem.h

Message ID 20200508220150.649044-1-arnd@arndb.de
State New
Headers show
Series
  • drm: vmwgfx: include linux/highmem.h
Related show

Commit Message

Arnd Bergmann May 8, 2020, 10:01 p.m.
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(+)

-- 
2.26.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Comments

Stephen Rothwell May 9, 2020, 3:14 a.m. | #1
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Ira Weiny May 11, 2020, 2:53 a.m. | #2
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@arndb.de>


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@intel.com>


> ---

>  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

> 

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Arnd Bergmann May 11, 2020, 7:52 a.m. | #3
On Mon, May 11, 2020 at 4:53 AM Ira Weiny <ira.weiny@intel.com> wrote:
>

> 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@arndb.de>

>

> 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@intel.com>


I do a lot of randconfig build tests and only one of them had this problem.

See https://pastebin.com/LmX0Jfbg for reference, I did not check further
which of the options caused this.

      Arnd
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Randy Dunlap May 12, 2020, 5:29 p.m. | #4
On 5/8/20 8:14 PM, Stephen Rothwell wrote:
> 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).

> 


Hi,

What happened with this patch?
I am seeing the same build problems in linux-next of 20200512.

Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested



thanks.
-- 
~Randy

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

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