From 6eaed97e335e541ecb3fa9f83e4c6bf17d175e11 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Mon, 28 Apr 2008 02:14:55 -0700 Subject: [PATCH] --- yaml --- r: 94143 b: refs/heads/master c: f0a0c1f20f837221c0d990a54ae5426acf039036 h: refs/heads/master i: 94141: 18bde4e09784edd2de12891a489af8e679142dc7 94139: b882dbd67e3a37ab42c9fc7d7fc0464bba987945 94135: 5ec98945b36aa2fedd7a7772a2decd6132c9e667 94127: e25320e4488c623ba2aa51b9c74e77555a86932d 94111: bac4e81e00507eac85c79b44e008a80cf7c97be3 94079: 1cfee4fc9d8bfee04ba0847bffbc2b89cc161cd2 v: v3 --- [refs] | 2 +- trunk/drivers/video/geode/video_gx.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index adb4a990aa72..d1467db54be9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9338364e6989ca2707638c7c70ae22975b0bb6c +refs/heads/master: f0a0c1f20f837221c0d990a54ae5426acf039036 diff --git a/trunk/drivers/video/geode/video_gx.c b/trunk/drivers/video/geode/video_gx.c index d0885370675d..06245a8400c7 100644 --- a/trunk/drivers/video/geode/video_gx.c +++ b/trunk/drivers/video/geode/video_gx.c @@ -208,7 +208,7 @@ gx_configure_tft(struct fb_info *info) fp = 0x0F100000; - /* Add sync polarity */ + /* Configure sync polarity */ if (!(info->var.sync & FB_SYNC_VERT_HIGH_ACT)) fp |= GX_FP_PT2_VSP; @@ -269,11 +269,15 @@ static void gx_configure_display(struct fb_info *info) /* Enable hsync and vsync. */ dcfg |= GX_DCFG_HSYNC_EN | GX_DCFG_VSYNC_EN; - /* Sync polarities. */ - if (info->var.sync & FB_SYNC_HOR_HIGH_ACT) - dcfg |= GX_DCFG_CRT_HSYNC_POL; - if (info->var.sync & FB_SYNC_VERT_HIGH_ACT) - dcfg |= GX_DCFG_CRT_VSYNC_POL; + /* Only change the sync polarities if we are running + * in CRT mode. The FP polarities will be handled in + * gxfb_configure_tft */ + if (par->enable_crt) { + if (!(info->var.sync & FB_SYNC_HOR_HIGH_ACT)) + dcfg |= GX_DCFG_CRT_HSYNC_POL; + if (!(info->var.sync & FB_SYNC_VERT_HIGH_ACT)) + dcfg |= GX_DCFG_CRT_VSYNC_POL; + } /* Enable the display logic */ /* Set up the DACS to blank normally */