From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/hw/xfree86/vbe/vbeModes.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xorg-server/hw/xfree86/vbe/vbeModes.c') diff --git a/xorg-server/hw/xfree86/vbe/vbeModes.c b/xorg-server/hw/xfree86/vbe/vbeModes.c index 415167d0e..50ac50d2c 100644 --- a/xorg-server/hw/xfree86/vbe/vbeModes.c +++ b/xorg-server/hw/xfree86/vbe/vbeModes.c @@ -356,8 +356,10 @@ VBESetModeNames(DisplayModePtr pMode) pMode->name = strdup("BADMODE"); } else { - XNFasprintf(&pMode->name, "%dx%d", + char *tmp; + XNFasprintf(&tmp, "%dx%d", pMode->HDisplay, pMode->VDisplay); + pMode->name = tmp; } } pMode = pMode->next; @@ -433,7 +435,7 @@ VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe) */ int VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, - char **modeNames, ClockRangePtr clockRanges, + const char **modeNames, ClockRangePtr clockRanges, int *linePitches, int minPitch, int maxPitch, int pitchInc, int minHeight, int maxHeight, int virtualX, int virtualY, int apertureSize, LookupModeFlags strategy) -- cgit v1.2.3