[PATCH 2/2] xfree86: Fix initial output setup printout
Adam Jackson
ajax at nwnk.net
Tue May 20 12:06:44 PDT 2014
On Thu, 2011-06-02 at 14:48 -0400, Adam Jackson wrote:
> Move the printout to a point after we've actually assigned CRTCs, so we
> can report honestly which outputs will be lit. While we're at it, also
> print the origin associated with each.
>
> Signed-off-by: Adam Jackson <ajax at redhat.com>
This series never got any love. It would still be useful to show the
initial CRTC origins in the log; any takers?
- ajax
> ---
> hw/xfree86/modes/xf86Crtc.c | 24 +++++++++++++-----------
> 1 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
> index b4ce86a..6b57a36 100644
> --- a/hw/xfree86/modes/xf86Crtc.c
> +++ b/hw/xfree86/modes/xf86Crtc.c
> @@ -2399,17 +2399,6 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
> xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n");
> }
>
> - for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
> - if (!modes[o])
> - xf86DrvMsg (scrn->scrnIndex, X_ERROR,
> - "Output %s enabled but has no modes\n",
> - config->output[o]->name);
> - else
> - xf86DrvMsg (scrn->scrnIndex, X_INFO,
> - "Output %s using initial mode %s\n",
> - config->output[o]->name, modes[o]->name);
> - }
> -
> /*
> * Set the position of each output
> */
> @@ -2489,6 +2478,19 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
> }
> }
>
> + for (o = 0; o < config->num_output; o++)
> + {
> + xf86OutputPtr output = config->output[o];
> + if (!output->crtc)
> + xf86DrvMsg (scrn->scrnIndex, X_INFO, "Output %s disabled\n",
> + output->name);
> + else
> + xf86DrvMsg (scrn->scrnIndex, X_INFO,
> + "Output %s using initial mode %s +%d+%d\n",
> + output->name, output->crtc->desiredMode.name,
> + output->crtc->desiredX, output->crtc->desiredY);
> + }
> +
> if (scrn->display->virtualX == 0)
> {
> /*
More information about the xorg-devel
mailing list