summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Huang <frankr.huang@amd.com>2010-11-19 10:28:31 +0800
committerMartin-Éric Racine <q-funk@iki.fi>2010-11-19 07:43:49 +0200
commit256356912bbc1d1e65db5c3c03c6ae25883a81fb (patch)
tree7c047f84e71a1a80a80a65440ea282c6f4f635d2
parent50f9152e2087fd50dfc09e35505c2fbcdd3183b0 (diff)
Print the panel mode BIOS uses
Signed-off-by: Frank Huang<frankr.huang@amd.com>
-rw-r--r--src/geode.h2
-rw-r--r--src/lx_driver.c2
-rw-r--r--src/lx_panel.c10
3 files changed, 9 insertions, 5 deletions
diff --git a/src/geode.h b/src/geode.h
index ad94a02..ebf8abb 100644
--- a/src/geode.h
+++ b/src/geode.h
@@ -454,7 +454,7 @@ void LXInitVideo(ScreenPtr pScrn);
void LXSetupOutput(ScrnInfoPtr);
/* lx_panel.c */
-DisplayModePtr LXGetLegacyPanelMode(void);
+DisplayModePtr LXGetLegacyPanelMode(ScrnInfoPtr pScrni);
DisplayModePtr LXGetManualPanelMode(char *modestr);
void LXAdjustFrame(int scrnIndex, int x, int y, int flags);
diff --git a/src/lx_driver.c b/src/lx_driver.c
index 0fcd51e..477939d 100644
--- a/src/lx_driver.c
+++ b/src/lx_driver.c
@@ -452,7 +452,7 @@ LXPreInit(ScrnInfoPtr pScrni, int flags)
pGeode->panelMode = LXGetManualPanelMode(pmode);
if (pGeode->panelMode == NULL)
- pGeode->panelMode = LXGetLegacyPanelMode();
+ pGeode->panelMode = LXGetLegacyPanelMode(pScrni);
if (pGeode->panelMode == NULL)
pGeode->Output &= ~OUTPUT_PANEL;
diff --git a/src/lx_panel.c b/src/lx_panel.c
index 6832fec..573c0fb 100644
--- a/src/lx_panel.c
+++ b/src/lx_panel.c
@@ -77,11 +77,10 @@ DisplayModeRec lx_panel_modes[] = {
/* Get the legacy panel size from VSA, and return the associated mode rec */
DisplayModePtr
-LXGetLegacyPanelMode(void)
+LXGetLegacyPanelMode(ScrnInfoPtr pScrni)
{
unsigned short reg = LX_READ_VG(0x00);
unsigned char ret = (reg >> 8) & 0x07;
-
if ((ret == 1 || ret == 5)) {
reg = LX_READ_VG(0x02);
@@ -94,8 +93,13 @@ LXGetLegacyPanelMode(void)
* The user can use this entry for other wide screen resolutions.
*/
- if (ret < 8)
+ if (ret < 8) {
+ xf86DrvMsg(pScrni->scrnIndex, X_INFO,
+ " VSA Panel Mode is: %dx%d, pixel clock freq(kHz) is %d\n",
+ lx_panel_modes[ret].HDisplay, lx_panel_modes[ret].VDisplay,
+ lx_panel_modes[ret].Clock);
return &lx_panel_modes[ret];
+ }
}