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

[Hans de Goede]

Hi,

On 03/20/2014 01:23 AM, Martin Peres wrote:
> 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.

Thanks, the fix looks good, feel free to squash it into the original
patch introducing the warnings.

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

You're welcome, thanks for testing! So if you want to test things
with Xorg not running as root, you need a recent systemd, ie
208 as found in Fedora-20 will do. And then build the xserver +
drivers you need from git, and use startx from a text vc, that is all.

Note that many display managers won't start Xorg inside a user login
session, and then systemd-logind will refuse to talk to Xorg. So
if you start Xorg under say gdm you will get a single line
about systemd-logind in your Xorg.0.log saying that it failed
to take control of the session, and then from there on you're
running the non server-fd code-paths :)

Regards,

Hans


> 
> 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");
>