diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-11 08:39:42 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-11 11:02:05 +0100 |
| commit | 085141348cfe8386059062a58172855f72d5e5b6 (patch) | |
| tree | da330d23e20d6295ebe32dcad8e30b07e15f5f10 | |
| parent | 53c1faa5093f8a0c969e3ebe9f27ee1ce5137e14 (diff) | |
sna: Squelch log messages for fb/pixmap tiling in the default case
The output is confusing, so hide it unless it is modified by the user.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_driver.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index ce2490bf..00759367 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -611,6 +611,14 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) if (xf86ReturnOptValBool(sna->Options, OPTION_TILING_FB, FALSE)) sna->tiling &= ~SNA_TILING_FB; + if (sna->tiling != SNA_TILING_ALL) { + xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s, pixmaps %s\n", + sna->tiling & SNA_TILING_FB ? "tiled" : "linear", + sna->tiling & SNA_TILING_2D ? "tiled" : "linear"); + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "Tiling disabled, expect poor performance and increased power consumption.\n"); + } + if (xf86ReturnOptValBool(sna->Options, OPTION_DELETE_DP12, FALSE)) sna->flags |= SNA_REMOVE_OUTPUTS; @@ -633,19 +641,10 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) sna->flags |= SNA_TRIPLE_BUFFER; DBG(("%s: triple buffer? %s\n", __FUNCTION__, sna->flags & SNA_TRIPLE_BUFFER ? "enabled" : "disabled")); - if (xf86ReturnOptValBool(sna->Options, OPTION_CRTC_PIXMAPS, FALSE)) + if (xf86ReturnOptValBool(sna->Options, OPTION_CRTC_PIXMAPS, FALSE)) { + xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Forcing per-crtc-pixmaps.\n"); sna->flags |= SNA_FORCE_SHADOW; - - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s\n", - sna->tiling & SNA_TILING_FB ? "tiled" : "linear"); - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Pixmaps %s\n", - sna->tiling & SNA_TILING_2D ? "tiled" : "linear"); - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Forcing per-crtc-pixmaps? %s\n", - sna->flags & SNA_FORCE_SHADOW ? "yes" : "no"); - - if (sna->tiling != SNA_TILING_ALL) - xf86DrvMsg(scrn->scrnIndex, X_WARNING, - "Tiling disabled, expect poor performance and increased power consumption.\n"); + } if (!sna_mode_pre_init(scrn, sna)) { xf86DrvMsg(scrn->scrnIndex, X_ERROR, |