summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+cubox@arm.linux.org.uk>2013-10-29 12:15:06 +0000
committerRussell King <rmk@arm.linux.org.uk>2013-10-29 19:21:08 +0000
commit77e0267aac890015d72a2c846b2db46a057dbbcb (patch)
tree8acc6918860641ab136b42b2284f9dd25b3ec8ae
parentff0b5635f6d056603aa0212738edef75b901fc97 (diff)
downloadxf86-video-armada-77e0267aac890015d72a2c846b2db46a057dbbcb.tar.gz
xf86-video-armada-77e0267aac890015d72a2c846b2db46a057dbbcb.tar.xz
Fix initial mode setting
Avoid setting virtualX/virtualY to the maximum screen size; this avoids allocating the maximum size of frame buffer upon initial configuration, possibly leading to OOM. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
-rw-r--r--src/armada_drm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/armada_drm.c b/src/armada_drm.c
index c488ff3..ab2755c 100644
--- a/src/armada_drm.c
+++ b/src/armada_drm.c
@@ -1337,12 +1337,10 @@ static Bool armada_drm_pre_init(ScrnInfoPtr pScrn)
return FALSE;
}
- pScrn->virtualX = drm->mode_res->max_width;
- pScrn->virtualY = drm->mode_res->max_height;
-
xf86CrtcSetSizeRange(pScrn, drm->mode_res->min_width,
drm->mode_res->min_height,
- pScrn->virtualX, pScrn->virtualY);
+ drm->mode_res->max_width,
+ drm->mode_res->max_height);
drm->has_hw_cursor = TRUE;
for (i = 0; i < drm->mode_res->count_crtcs; i++)