summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Clark <rob@ti.com>2012-09-27 15:51:46 +0200
committerRob Clark <rob@ti.com>2012-09-27 15:51:46 +0200
commit6ea931ea247e1f6ab159e180e7bbf11bf2d3f58f (patch)
treedc444f0b37e68edd1dd9ed0b8a014a14a6e377a5
parent5daa7791874e4b531a3d8a9f349420f4891e6b3f (diff)
fix multi-display
Don't unconditionally delete the fb when setting crtc. With multiple displays this will tear down the crtc's that are already configured. Signed-off-by: Rob Clark <rob@ti.com>
-rw-r--r--src/drmmode_display.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 584fbb9..8a5506f 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -271,9 +271,6 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
TRACE_ENTER();
- /* remove old fb if it exists */
- drmmode_remove_fb(pScrn);
-
/* update the count of number of rotated CRTCs.. if we have one or more
* rotated outputs then we want to use a tiled buffer, but otherwise
* stick with non-tiled
@@ -1145,6 +1142,9 @@ drmmode_reallocate_scanout(ScrnInfoPtr pScrn, Bool redraw)
}
if (changed) {
+ /* remove old fb if it exists */
+ drmmode_remove_fb(pScrn);
+
if (pScreen && pScrn->EnableDisableFBAccess && redraw)
pScrn->EnableDisableFBAccess(ENABLE_DISABLE_FB_ACCESS_ARGS(pScrn, FALSE));