Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16cdd433 authored by Daniel Drake's avatar Daniel Drake Committed by Paul Mundt
Browse files

lxfb: Maintain video processor palette through suspend/resume 



The Geode X driver uses both of the LX's palettes, one for gamma
correction and one for colormaps.

The kernel driver currently only backs up the one used for colormaps
during suspend/resume. If you mess with gamma settings and do a
suspend/resume, colors go funny.

Fix this by backing up the video proc palette during suspend/resume,
alongside the display controller one which is already handled.

Signed-off-by: default avatarDaniel Drake <dsd@laptop.org>
Acked-by: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 93c176f3

drivers/video/geode/lxfb.h

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#define DC_HFILT_COUNT	0x100

#define DC_VFILT_COUNT	0x100

#define VP_COEFF_SIZE	0x1000

#define VP_PAL_COUNT	0x100



#define OUTPUT_CRT   0x01

#define OUTPUT_PANEL 0x02
@@ -48,7 +49,8 @@ struct lxfb_par { 
	uint64_t vp[VP_REG_COUNT];

	uint64_t fp[FP_REG_COUNT];



	uint32_t pal[DC_PAL_COUNT];

	uint32_t dc_pal[DC_PAL_COUNT];

	uint32_t vp_pal[VP_PAL_COUNT];

	uint32_t hcoeff[DC_HFILT_COUNT * 2];

	uint32_t vcoeff[DC_VFILT_COUNT];

	uint32_t vp_coeff[VP_COEFF_SIZE / 4];

drivers/video/geode/lxfb_ops.c

+15 −5
Original line number Diff line number Diff line
@@ -610,10 +610,15 @@ static void lx_save_regs(struct lxfb_par *par) 
	memcpy(par->vp, par->vp_regs, sizeof(par->vp));

	memcpy(par->fp, par->vp_regs + VP_FP_START, sizeof(par->fp));



	/* save the palette */

	/* save the display controller palette */

	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);

	for (i = 0; i < ARRAY_SIZE(par->dc_pal); i++)

		par->dc_pal[i] = read_dc(par, DC_PAL_DATA);



	/* save the video processor palette */

	write_vp(par, VP_PAR, 0);

	for (i = 0; i < ARRAY_SIZE(par->vp_pal); i++)

		par->vp_pal[i] = read_vp(par, VP_PDR);



	/* save the horizontal filter coefficients */

	filt = par->dc[DC_IRQ_FILT_CTL] | DC_IRQ_FILT_CTL_H_FILT_SEL;
@@ -706,8 +711,8 @@ static void lx_restore_display_ctlr(struct lxfb_par *par) 


	/* restore the palette */

	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]);

	for (i = 0; i < ARRAY_SIZE(par->dc_pal); i++)

		write_dc(par, DC_PAL_DATA, par->dc_pal[i]);



	/* restore the horizontal filter coefficients */

	filt = par->dc[DC_IRQ_FILT_CTL] | DC_IRQ_FILT_CTL_H_FILT_SEL;
@@ -751,6 +756,11 @@ static void lx_restore_video_proc(struct lxfb_par *par) 
		}

	}



	/* restore video processor palette */

	write_vp(par, VP_PAR, 0);

	for (i = 0; i < ARRAY_SIZE(par->vp_pal); i++)

		write_vp(par, VP_PDR, par->vp_pal[i]);



	/* restore video coeff ram */

	memcpy(par->vp_regs + VP_VCR, par->vp_coeff, sizeof(par->vp_coeff));

}