diff options
author | Andres Salomon <dilinger@queued.net> | 2010-09-20 11:31:29 -0700 |
---|---|---|
committer | Martin-Éric Racine <q-funk@iki.fi> | 2010-09-21 14:47:17 +0300 |
commit | 90dda28842ac76a05ae75a4fdd457dd8b8988950 (patch) | |
tree | 6099a456bbf290f870edb1a4cc906b7a9deacccc /src | |
parent | 5dfe7dbf6ed122fbbb758be7a5b7d78a199583c7 (diff) |
fix the DCON verification loop for LX output
This is pretty clearly a bug. This should fix it (after all, that
check is merely to see if the panel is a DCON; we don't care at
all about the panel bit). This also adds an extra parenthesis in
the following if() statement for clarity.
I'm resisting the temptation to change GeodeRec's Output member to
an unsigned long (for now). Bitfields should really be unsigned.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Diffstat (limited to 'src')
-rw-r--r-- | src/lx_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lx_output.c b/src/lx_output.c index 85480a2..413d376 100644 --- a/src/lx_output.c +++ b/src/lx_output.c @@ -156,13 +156,13 @@ lx_output_mode_valid(xf86OutputPtr output, DisplayModePtr pMode) GeodeRec *pGeode = GEODEPTR(pScrni); /* DCON Panel specific resolution - OLPC's one */ - if (pGeode->Output & (OUTPUT_PANEL | OUTPUT_DCON)) { + if (pGeode->Output & OUTPUT_DCON) { if (pGeode->panelMode->HDisplay == 1200 && pGeode->panelMode->VDisplay == 900) return MODE_OK; } - if (pGeode->Output & OUTPUT_PANEL && + if ((pGeode->Output & OUTPUT_PANEL) && gfx_is_panel_mode_supported(pGeode->panelMode->HDisplay, pGeode->panelMode->VDisplay, pMode->HDisplay, |