[PATCH xf86-video-nouveau 2/2] Add support for server managed fds

[Martin Peres]

On 17/03/2014 17:37, Hans de Goede wrote:
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>

Hi Hans,

When compiling these patches, it generated some warnings because 
"NVEntPtr pNVEnt" was not defined in NVEnterVT and NVLeaveVT. I have 
tested the patches on top of xf86-video-nouveau-git and latest-released 
x-server with no apparent regression. I'm trying to set up the rest of 
the xserver-git environment to be able to check how it will work with 
the next x-server, with and without logind. I'll need to get up to speed 
with logind too.

Anyway, thanks for your work, I'm looking forward to using it :)

diff --git a/src/nv_driver.c b/src/nv_driver.c
index 2adf5a3..b8faab1 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -453,7 +453,9 @@ NVEnterVT(VT_FUNC_ARGS_DECL)
  {
         SCRN_INFO_PTR(arg);
         NVPtr pNv = NVPTR(pScrn);
+#ifdef XF86_PDEV_SERVER_FD
         NVEntPtr pNVEnt = NVEntPriv(pScrn);
+#endif
         int ret;

         xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n");
@@ -488,7 +490,9 @@ NVLeaveVT(VT_FUNC_ARGS_DECL)
  {
         SCRN_INFO_PTR(arg);
         NVPtr pNv = NVPTR(pScrn);
+#ifdef XF86_PDEV_SERVER_FD
         NVEntPtr pNVEnt = NVEntPriv(pScrn);
+#endif
         int ret;

         xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVLeaveVT is called.\n");