From: Andres Salomon Two suspend/resume fixes: - we weren't saving/restoring the palette correctly; I wasn't setting PAL_ADDRESS correctly. - the original GP restore code had an off-by-one bug that I happily reproduced in this code. This fixes that, which fixes the RASTER_MODE register not getting set. And drop an unnecessary comment. Signed-off-by: Andres Salomon Cc: Jordan Crouse Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton --- drivers/video/geode/suspend_gx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/video/geode/suspend_gx.c~gxfb-add-power-management-functionality-fix drivers/video/geode/suspend_gx.c --- a/drivers/video/geode/suspend_gx.c~gxfb-add-power-management-functionality-fix +++ a/drivers/video/geode/suspend_gx.c @@ -39,7 +39,7 @@ static void gx_save_regs(struct gxfb_par memcpy(par->fp, par->vid_regs + VP_FP_START, sizeof(par->fp)); /* save the palette */ - write_gp(par, DC_PAL_ADDRESS, 0); + write_dc(par, DC_PAL_ADDRESS, 0); for (i = 0; i < ARRAY_SIZE(par->pal); i++) par->pal[i] = read_dc(par, DC_PAL_DATA); } @@ -73,10 +73,10 @@ static void gx_restore_gfx_proc(struct g for (i = 0; i < ARRAY_SIZE(par->gp); i++) { switch (i) { - case GP_RASTER_MODE: case GP_VECTOR_MODE: case GP_BLT_MODE: case GP_BLT_STATUS: + case GP_HST_SRC: /* don't restore these registers */ break; default: @@ -130,7 +130,7 @@ static void gx_restore_display_ctlr(stru } /* restore the palette */ - write_gp(par, DC_PAL_ADDRESS, 0); + write_dc(par, DC_PAL_ADDRESS, 0); for (i = 0; i < ARRAY_SIZE(par->pal); i++) write_dc(par, DC_PAL_DATA, par->pal[i]); } @@ -163,7 +163,7 @@ static void gx_restore_video_proc(struct case VP_RSVD_3: case VP_CRC32: case VP_AWT: - case VP_VTM: /* this is r/w, shouldn't we restore? -dil */ + case VP_VTM: /* don't restore these registers */ break; default: _