[PATCH] lxfb/gxfb: register comparison code
From: Andres Salomon
Date: Thu Mar 27 2008 - 14:56:20 EST
Compare video registers before and after suspend to ensure that we've
correctly restored them in the resume path.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
---
drivers/video/geode/lxfb_ops.c | 101 ++++++++++++++++++++++++++++++++++++++
drivers/video/geode/suspend_gx.c | 71 ++++++++++++++++++++++++++
2 files changed, 172 insertions(+), 0 deletions(-)
diff --git a/drivers/video/geode/lxfb_ops.c b/drivers/video/geode/lxfb_ops.c
index cf8007c..069196a 100644
--- a/drivers/video/geode/lxfb_ops.c
+++ b/drivers/video/geode/lxfb_ops.c
@@ -523,6 +523,106 @@ int lx_blank_display(struct fb_info *info, int blank_mode)
#ifdef CONFIG_PM
+static void lx_cmp_regs(struct lxfb_par *par)
+{
+ int i;
+ uint32_t val;
+
+ rdmsrl(MSR_LX_MSR_PADSEL, val);
+ if ((uint32_t) par->msr.padsel != val)
+ printk(KERN_WARNING "%s: MSR_LX_MSR_PADSEL contains 0x%x, but saved value is 0x%x!\n", __func__, val, (uint32_t) par->msr.padsel);
+
+ rdmsrl(MSR_GLCP_DOTPLL, val);
+ if ((uint32_t) par->msr.dotpll != val)
+ printk(KERN_WARNING "%s: MSR_GLCP_DOTPLL contains 0x%x, but saved value is 0x%x!\n", __func__, val, (uint32_t) par->msr.dotpll);
+
+
+ rdmsrl(MSR_LX_GLD_MSR_CONFIG, val);
+ if ((uint32_t) par->msr.dfglcfg != val)
+ printk(KERN_WARNING "%s: MSR_LX_GLD_MSR_CONFIG contains 0x%x, but saved value is 0x%x!\n", __func__, val, (uint32_t) par->msr.dfglcfg);
+
+ rdmsrl(MSR_LX_SPARE_MSR, val);
+ if ((uint32_t) par->msr.dcspare != val)
+ printk(KERN_WARNING "%s: MSR_LX_SPARE_MSR contains 0x%x, but saved value is 0x%x!\n", __func__, val, (uint32_t) par->msr.dcspare);
+
+ for (i = 0; i < ARRAY_SIZE(par->gp); i++) {
+ switch (i) {
+ case GP_VECTOR_MODE:
+ case GP_BLT_MODE:
+ case GP_BLT_STATUS:
+ case GP_HST_SRC:
+ /* ignore WO and RO regs */
+ break;
+ default:
+ val = read_gp(par, i);
+ if (par->gp[i] != val)
+ printk(KERN_WARNING "%s: GP register %x contains 0x%x, but saved value is 0x%x!\n", __func__, i*4, val, par->gp[i]);
+ }
+ }
+
+ for (i = 0; i < ARRAY_SIZE(par->dc); i++) {
+ switch (i) {
+ case DC_RSVD_0:
+ case DC_RSVD_1:
+ case DC_RSVD_2:
+ case DC_RSVD_3:
+ case DC_RSVD_4:
+ case DC_RSVD_5:
+ case DC_LINE_CNT:
+ case DC_PAL_ADDRESS:
+ case DC_PAL_DATA:
+ case DC_DFIFO_DIAG:
+ case DC_CFIFO_DIAG:
+ /* ignore WO and RO regs */
+ break;
+ default:
+ val = read_dc(par, i);
+ if (par->dc[i] != val)
+ printk(KERN_WARNING "%s: DC register %x contains 0x%x, but saved value is 0x%x!\n", __func__, i*4, val, par->dc[i]);
+ }
+ }
+
+ for (i = 0; i < ARRAY_SIZE(par->vp); i++) {
+ switch (i) {
+ case VP_PAR:
+ case VP_PDR:
+ case VP_RSVD_0:
+ case VP_RSVD_1:
+ case VP_CRC32:
+ case VP_AWT:
+ /* ignore WO and RO regs */
+ break;
+ default:
+ val = read_vp(par, i);
+ if (par->vp[i] != val)
+ printk(KERN_WARNING "%s: VP register %x contains 0x%x, but saved value is 0x%x!\n", __func__, i*8, val, (uint32_t) par->vp[i]);
+ }
+ }
+
+ for (i = 0; i < ARRAY_SIZE(par->fp); i++) {
+ switch (i) {
+ case FP_RSVD_0:
+ case FP_RSVD_1:
+ case FP_RSVD_2:
+ case FP_RSVD_3:
+ case FP_RSVD_4:
+ /* ignore WO and RO regs */
+ break;
+ default:
+ val = read_fp(par, i);
+ if (par->fp[i] != val)
+ printk(KERN_WARNING "%s: FP register %x contains 0x%x, but saved value is 0x%x!\n", __func__, i*8, val, (uint32_t) par->fp[i]);
+ }
+ }
+
+ write_dc(par, DC_PAL_ADDRESS, 0);
+ for (i = 0; i < ARRAY_SIZE(par->pal); i++) {
+ val = read_dc(par, DC_PAL_DATA);
+ if (par->pal[i] != val)
+ printk(KERN_WARNING "%s: palette address %x contains 0x%x, but saved value is 0x%x!\n", __func__, i, val, par->pal[i]);
+ }
+}
+
static void lx_save_regs(struct lxfb_par *par)
{
uint32_t filt;
@@ -764,6 +864,7 @@ int lx_powerup(struct fb_info *info)
return 0;
lx_restore_regs(par);
+ lx_cmp_regs(par);
par->powered_down = 0;
return 0;
diff --git a/drivers/video/geode/suspend_gx.c b/drivers/video/geode/suspend_gx.c
index 9aff32e..c9e3159 100644
--- a/drivers/video/geode/suspend_gx.c
+++ b/drivers/video/geode/suspend_gx.c
@@ -17,6 +17,76 @@
#ifdef CONFIG_PM
+static void gx_cmp_regs(struct gxfb_par *par)
+{
+ int i;
+ uint32_t val;
+
+ rdmsrl(MSR_GX_MSR_PADSEL, val);
+ if ((uint32_t) par->msr.padsel != val)
+ printk(KERN_WARNING "%s: MSR_GX_MSR_PADSEL contains 0x%x, but saved value is 0x%x!\n", __func__, val, (uint32_t) par->msr.padsel);
+
+ rdmsrl(MSR_GLCP_DOTPLL, val);
+ if ((uint32_t) par->msr.dotpll != val)
+ printk(KERN_WARNING "%s: MSR_GLCP_DOTPLL contains 0x%x, but saved value is 0x%x!\n", __func__, val, (uint32_t) par->msr.dotpll);
+
+ for (i = 0; i < ARRAY_SIZE(par->gp); i++) {
+ switch (i) {
+ case GP_BLT_MODE:
+ case GP_BLT_STATUS:
+ case GP_HST_SRC:
+ /* ignore WO and RO regs */
+ break;
+ default:
+ val = read_gp(par, i);
+ if (par->gp[i] != val)
+ printk(KERN_WARNING "%s: GP register %x contains 0x%x, but saved value is 0x%x!\n", __func__, i*4, val, par->gp[i]);
+ }
+ }
+
+ for (i = 0; i < ARRAY_SIZE(par->dc); i++) {
+ switch (i) {
+ case DC_RSVD_0:
+ case DC_RSVD_1:
+ case DC_RSVD_2:
+ case DC_RSVD_3:
+ case DC_RSVD_4:
+ case DC_RSVD_5:
+ /* ignore reserved regs */
+ break;
+ default:
+ val = read_dc(par, i);
+ if (par->dc[i] != val)
+ printk(KERN_WARNING "%s: DC register %x contains 0x%x, but saved value is 0x%x!\n", __func__, i*4, val, par->dc[i]);
+ }
+ }
+
+ for (i = 0; i < ARRAY_SIZE(par->vp); i++) {
+ switch (i) {
+ default:
+ val = read_vp(par, i);
+ if (par->vp[i] != val)
+ printk(KERN_WARNING "%s: VP register %x contains 0x%x, but saved value is 0x%x!\n", __func__, i*8, val, (uint32_t) par->vp[i]);
+ }
+ }
+
+ for (i = 0; i < ARRAY_SIZE(par->fp); i++) {
+ switch (i) {
+ default:
+ val = read_fp(par, i);
+ if (par->fp[i] != val)
+ printk(KERN_WARNING "%s: FP register %x contains 0x%x, but saved value is 0x%x!\n", __func__, i*8, val, (uint32_t) par->fp[i]);
+ }
+ }
+
+ write_dc(par, DC_PAL_ADDRESS, 0);
+ for (i = 0; i < ARRAY_SIZE(par->pal); i++) {
+ val = read_dc(par, DC_PAL_DATA);
+ if (par->pal[i] != val)
+ printk(KERN_WARNING "%s: palette address %x contains 0x%x, but saved value is 0x%x!\n", __func__, i, val, par->pal[i]);
+ }
+}
+
static void gx_save_regs(struct gxfb_par *par)
{
int i;
@@ -259,6 +329,7 @@ int gx_powerup(struct fb_info *info)
gx_restore_regs(par);
gx_enable_graphics(par);
+ gx_cmp_regs(par);
par->powered_down = 0;
return 0;
--
1.5.3.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/