2008-02-23 06:09:25

by Andres Salomon

Subject: [PATCH 3/4] gxfb: Don't enable the CRT DACs when we are in flatpanel mode

This one's also from Jordan.

>From dea8d19f689706985b30be745ef1151082866374 Mon Sep 17 00:00:00 2001
From: Jordan Crouse <[email protected]>
Date: Fri, 22 Feb 2008 19:55:09 -0500
Subject: [PATCH] gxfb: Don't enable the CRT DACs when we are in flatpanel mode

When the FP strap is enabled, don't turn on the CRT DACs - that will save
about 35 mA of power.

Updated/cleaned up by Andres Salomon.

Signed-off-by: Andres Salomon <[email protected]>
Acked-by: Jordan Crouse <[email protected]>
---
drivers/video/geode/video_gx.c | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index a53936f..b436155 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -238,18 +238,6 @@ static void gx_configure_display(struct fb_info *info)
struct geodefb_par *par = info->par;
u32 dcfg, misc;

- /* Set up the MISC register */
-
- misc = readl(par->vid_regs + GX_MISC);
-
- /* Power up the DAC */
- misc &= ~(GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
-
- /* Disable gamma correction */
- misc |= GX_MISC_GAM_EN;
-
- writel(misc, par->vid_regs + GX_MISC);
-
/* Write the display configuration */
dcfg = readl(par->vid_regs + GX_DCFG);

@@ -268,14 +256,28 @@ static void gx_configure_display(struct fb_info *info)
/* Enable hsync and vsync. */
dcfg |= GX_DCFG_HSYNC_EN | GX_DCFG_VSYNC_EN;

- /* Only change the sync polarities if we are running
- * in CRT mode. The FP polarities will be handled in
- * gxfb_configure_tft */
+ misc = readl(par->vid_regs + GX_MISC);
+
+ /* Disable gamma correction */
+ misc |= GX_MISC_GAM_EN;
+
if (par->enable_crt) {
+
+ /* Power up the CRT DACs */
+ misc &= ~(GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
+ writel(misc, par->vid_regs + GX_MISC);
+
+ /* Only change the sync polarities if we are running
+ * in CRT mode. The FP polarities will be handled in
+ * gxfb_configure_tft */
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;
+ } else {
+ /* Power down the CRT DACs if in FP mode */
+ misc |= (GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
+ writel(misc, par->vid_regs + GX_MISC);
}

/* Enable the display logic */
--
1.5.3.7

2008-02-28 00:25:42

by Andrew Morton

Subject: Re: [PATCH 3/4] gxfb: Don't enable the CRT DACs when we are in flatpanel mode

On Sat, 23 Feb 2008 01:10:54 -0500
Andres Salomon <[email protected]> wrote:

> This one's also from Jordan.
>
> >From dea8d19f689706985b30be745ef1151082866374 Mon Sep 17 00:00:00 2001
> From: Jordan Crouse <[email protected]>
> Date: Fri, 22 Feb 2008 19:55:09 -0500
> Subject: [PATCH] gxfb: Don't enable the CRT DACs when we are in flatpanel mode

Please do this just by putting Jordan's From: line right at the start of the
changelog.

> When the FP strap is enabled, don't turn on the CRT DACs - that will save
> about 35 mA of power.
>
> Updated/cleaned up by Andres Salomon.
>
> Signed-off-by: Andres Salomon <[email protected]>
> Acked-by: Jordan Crouse <[email protected]>

This should have been Signed-off-by: Jordan. I made that change.