Skip to contentSkip to conversation

wfb: Fix missing init function decls behind FB_ACCESS_WRAPPER

PATCH In review Rhys Kidd 2 participants 3 messages Jan 21, 2019 – Jan 23, 2019 2 messages not in the archive

lore
Share & tools
lore

Rhys Kidd

author
#0 lore raw

PATCH 1/1 wfb: Fix missing init function decls behind FB_ACCESS_WRAPPER

Fixes warning with xserver 1.20 and gcc 8.2:

nv_driver.c:1443:9: warning: implicit declaration of function ‘wfbScreenInit’; did you mean ‘fbScreenInit’? [-Wimplicit-function-declaration]
ret = wfbScreenInit(pScreen, FBStart, pScrn->virtualX,

         ^~~~~~~~~~~~~
         fbScreenInit

(See xserver 706e6d9cd074da606016ed4ecff51e9c2a822087)

---
 src/nv_include.h | 1 +
 1 file changed, 1 insertion(+)
src/nv_include.h +1 -0
index de55570..6fdeeab 100644
@@ -38,6 +38,7 @@
 #include "dixstruct.h"
 #include "scrnintstr.h"
 
+#define FB_ACCESS_WRAPPER
 #include "fb.h"
 
 #include "xf86cmap.h"
Signature · 6 lines
2.19.1

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

A message that is not in the archive (sent off-list or not yet received): 20190121002008.31559-1-rhyskidd-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#2 lore raw

This causes nouveau_drv.so to not be loadable due to a missing wfbPictureInit. I'm not 100% sure what causes it -- it happens at runtime in the middle of probe, and I don't have wfb enabled. Either way, I'm going to revert this until we get a better idea of what's going on.

Quoted 30 lines · Rhys Kidd

Fixes warning with xserver 1.20 and gcc 8.2:

nv_driver.c:1443:9: warning: implicit declaration of function ‘wfbScreenInit’; did you mean ‘fbScreenInit’? [-Wimplicit-function-declaration]
ret = wfbScreenInit(pScreen, FBStart, pScrn->virtualX,

         ^~~~~~~~~~~~~
         fbScreenInit

(See xserver 706e6d9cd074da606016ed4ecff51e9c2a822087)

---
 src/nv_include.h | 1 +
 1 file changed, 1 insertion(+)
src/nv_include.h +1 -1
index de55570..6fdeeab 100644
@@ -38,6 +38,7 @@
 #include "dixstruct.h"
 #include "scrnintstr.h"
 
+#define FB_ACCESS_WRAPPER
 #include "fb.h"
 
 #include "xf86cmap.h"
--

2.19.1

Quoted 4 lines

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

A message that is not in the archive (sent off-list or not yet received): CAKb7Uvj0kCQaB3aFh1Esf=D+BhWG0Op_-54M4oW6pbi7N-ZDtg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

author
#4 lore raw
Quoted 6 lines · Ilia Mirkin

This causes nouveau_drv.so to not be loadable due to a missing wfbPictureInit. I'm not 100% sure what causes it -- it happens at runtime in the middle of probe, and I don't have wfb enabled. Either way, I'm going to revert this until we get a better idea of what's going on.

OK to revert, this patch must be exposing something else that is going on with wrappedfb support on some setups.

Quoted 29 lines · Rhys Kidd
Quoted 4 lines

Fixes warning with xserver 1.20 and gcc 8.2:

nv_driver.c:1443:9: warning: implicit declaration of function

‘wfbScreenInit’; did you mean ‘fbScreenInit’?
[-Wimplicit-function-declaration]

Quoted 22 lines
   ret = wfbScreenInit(pScreen, FBStart, pScrn->virtualX,
         ^~~~~~~~~~~~~
         fbScreenInit

(See xserver 706e6d9cd074da606016ed4ecff51e9c2a822087)

---
 src/nv_include.h | 1 +
 1 file changed, 1 insertion(+)
src/nv_include.h +1 -0
index de55570..6fdeeab 100644
@@ -38,6 +38,7 @@
 #include "dixstruct.h"
 #include "scrnintstr.h"
 
+#define FB_ACCESS_WRAPPER
 #include "fb.h"
 
Quoted 9 lines
Quoted 8 lines
src/nv_include.h +0 -1
 #include "xf86cmap.h"
--

2.19.1

_______________________________________________
Nouveau mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau