[PATCH xwayland] xwayland: Probe outputs on preinit

[Dima Ryazanov]

This actually made xwayland work for me when running weston using the X11
backend.

If I run it using the drm backend, though, it still fails:

[102316.702] (==) intel(0): Backing store disabled
> [102316.702] (==) intel(0): Silken mouse enabled
> [102316.702] (II) intel(0): Initializing HW Cursor
> [102316.702] (II) intel(0): RandR 1.2 enabled, ignore the following RandR
> disabled message.
> [102316.702] (==) intel(0): DPMS enabled
> [102316.702] (II) intel(0): Set up textured video
> [102316.703] (II) intel(0): direct rendering: DRI2 Enabled
> [102316.703] (==) intel(0): hotplug detection: "enabled"
> [102316.703] (WW) intel(0): drmSetMaster failed: Permission denied
> [102316.703] (EE)
> Fatal server error:
> [102316.703] (EE) AddScreen/ScreenInit failed for driver 0
> [102316.703] (EE)
> [102316.704] (EE)
> Please consult the The X.Org Foundation support
>          at http://wiki.x.org
>  for help.
> [102316.704] (EE) Please also check the log file at
> "/home/dima/install/var/log/Xorg.1.log" for additional information.
> [102316.704] (EE)


(I'm assuming that's the bug you were trying to fix?)


On Sun, Sep 1, 2013 at 2:14 PM, Jonas Ådahl <jadahl at gmail.com> wrote:

> When running xwayland, calls to xf86SetDesiredModes() would fail due to
> the probed modes list not being populated. This was previously done
> indirectly by calling xf86InitialConfiguration() and now needs to be
> done explicitly instead.
>
> Signed-off-by: Jonas Ådahl <jadahl at gmail.com>
> ---
>  hw/xfree86/xwayland/xwayland-output.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/hw/xfree86/xwayland/xwayland-output.c
> b/hw/xfree86/xwayland/xwayland-output.c
> index 28003ba..53829c3 100644
> --- a/hw/xfree86/xwayland/xwayland-output.c
> +++ b/hw/xfree86/xwayland/xwayland-output.c
> @@ -431,6 +431,8 @@ xwayland_screen_preinit_output(struct xwl_screen
> *xwl_screen, ScrnInfoPtr scrnin
>              FatalError("failed to dispatch Wayland events: %s\n",
> strerror(errno));
>      }
>
> +    xf86ProbeOutputModes(scrninfo, 0, 0);
> +
>      xwl_screen->outputs_initialized = TRUE;
>
>      xf86SetScrnInfoModes(scrninfo);
> --
> 1.8.1.2
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20130905/9e3c998a/attachment.html>