diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-08 09:32:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-08 09:32:47 +0100 |
| commit | acd000667561cb9978ead7f14d4fbb97c1a8e727 (patch) | |
| tree | 21668e5efeb08af34de6c679d4c46cc6fe5d7b64 /xorg-server/hw/xfree86/fbdevhw/fbdevhw.c | |
| parent | 893624a6c15d4ee6cf1d46e4ad29282c72bee962 (diff) | |
| parent | 5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 (diff) | |
| download | vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.gz vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.bz2 vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xfree86/fbdevhw/fbdevhw.c')
| -rw-r--r-- | xorg-server/hw/xfree86/fbdevhw/fbdevhw.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c index 2019741b2..309fa654a 100644 --- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c +++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c @@ -506,20 +506,22 @@ fbdevHWSetVideoModes(ScrnInfoPtr pScrn) pScrn->virtualY = pScrn->display->virtualY; for (modename = pScrn->display->modes; *modename != NULL; modename++) { - for (mode = pScrn->monitor->Modes; mode != NULL; mode = mode->next) - if (0 == strcmp(mode->name,*modename)) - break; + for (mode = pScrn->monitor->Modes; mode != NULL; mode = mode->next) { + if (0 == strcmp(mode->name,*modename)) { + if (fbdevHWSetMode(pScrn, mode, TRUE)) + break; + + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "\tmode \"%s\" test failed\n", *modename); + } + } + if (NULL == mode) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "\tmode \"%s\" not found\n", *modename); continue; } - if (!fbdevHWSetMode(pScrn, mode, TRUE)) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "\tmode \"%s\" test failed\n", *modename); - continue; - } xf86DrvMsg(pScrn->scrnIndex, X_INFO, "\tmode \"%s\" ok\n", *modename); |