The patch titled gxfb: two suspend/resume fixes has been removed from the -mm tree. Its filename was gxfb-add-power-management-functionality-fix.patch This patch was dropped because it was folded into gxfb-add-power-management-functionality.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: gxfb: two suspend/resume fixes From: Andres Salomon <dilinger@xxxxxxxxxx> 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 <dilinger@xxxxxxxxxx> Cc: Jordan Crouse <jordan.crouse@xxxxxxx> Cc: "Antonino A. Daplas" <adaplas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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: _ Patches currently in -mm which might be from dilinger@xxxxxxxxxx are x86-geode-msr-cleanup.patch x86-geode-add-virtual-systems-architecture-detection.patch gxfb-use-pci_device-for-gxfbs-pci-device-table.patch gxfb-replace-fbsize-config-option-with-a-module-parameter.patch gxfb-create-dc-vp-fp-specific-handlers-rather-than-using-readl-writel.patch gxfb-clean-up-register-definitions.patch gxfb-move-msr-bit-fields-into-gxfbh.patch gxfb-stop-sharing-code-with-gx1fb.patch gxfb-add-power-management-functionality.patch gxfb-add-power-management-functionality-fix.patch gxfb-add-power-management-functionality-update.patch pm-gxfb-add-hook-to-pm-console-layer-that-allows-disabling-of-suspend-vt-switch.patch pm-gxfb-add-hook-to-pm-console-layer-that-allows-disabling-of-suspend-vt-switch-fix.patch lxfb-create-gp-dc-vp-fp-specific-handlers-rather-than-using-readl-writel.patch lxfb-clean-up-register-definitions.patch lxfb-clean-up-final-bits-of-df_regs.patch lxfb-rearrange-rename-msr-bitfields.patch lxfb-add-power-management-functionality.patch lxfb-add-power-management-functionality-fix.patch lxfb-add-power-management-functionality-update.patch lxfb-rename-kernel-arg-fbsize-to-vram.patch lxfb-disable-suspend-vt-switch-by-default.patch lxfb-gxfb-when-blanking-with-fb_blank_powerdown-also-turn-off-the-crt.patch gxfb-lxfb-use-vsa-definitions-when-fetching-framebuffer-size.patch gxfb-lxfb-detect-framebuffer-size-using-an-msr-if-vsa2-isnt-available.patch olpc-gxfb-lxfb-add-dcon-panel-modes-to-framebuffer-drivers.patch olpc-gxfb-lxfb-add-dcon-panel-modes-to-framebuffer-drivers-section-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html