summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-04-23 09:17:01 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2014-04-23 09:25:18 +0100
commit4ed733d16a6ce35b1426bddd993a360f0a7387a8 (patch)
treea0b9bc8ae9ea7fb4d5472c4d433f1f21120991de
parentbb5b21e34f6cbe44a249e566471754b45c500e60 (diff)
sna: Improve DBG messages for rejecting outputs during initial config
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_display.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 84d572e8..e12b4885 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4032,11 +4032,17 @@ static bool sna_probe_initial_configuration(struct sna *sna)
crtc_id = (uintptr_t)output->crtc;
output->crtc = NULL;
- if (crtc_id == 0)
+ if (crtc_id == 0) {
+ DBG(("%s: not using output %s, disconnected\n",
+ __FUNCTION__, output->name));
continue;
+ }
- if (xf86ReturnOptValBool(output->options, OPTION_DISABLE, 0))
+ if (xf86ReturnOptValBool(output->options, OPTION_DISABLE, 0)) {
+ DBG(("%s: not using output %s, manually disabled\n",
+ __FUNCTION__, output->name));
continue;
+ }
for (j = 0; j < config->num_crtc; j++) {
xf86CrtcPtr crtc = config->crtc[j];
@@ -4052,14 +4058,17 @@ static bool sna_probe_initial_configuration(struct sna *sna)
const char *pref;
pref = preferred_mode(output);
- if (pref && strcmp(pref, crtc->desiredMode.name))
+ if (pref && strcmp(pref, crtc->desiredMode.name)) {
+ DBG(("%s: output %s user requests a different preferred mode %s, found %s\n",
+ __FUNCTION__, output->name, pref, crtc->desiredMode.name));
return false;
+ }
xf86DrvMsg(scrn->scrnIndex, X_PROBED,
- "Output %s using initial mode %s on pipe %d\n",
- output->name,
- crtc->desiredMode.name,
- to_sna_crtc(crtc)->pipe);
+ "Output %s using initial mode %s on pipe %d\n",
+ output->name,
+ crtc->desiredMode.name,
+ to_sna_crtc(crtc)->pipe);
output->crtc = crtc;
crtc->enabled = TRUE;