| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1270746946-12467-14-git-send-email-corbet@lwn.net>
Date: Thu, 8 Apr 2010 11:15:43 -0600
From: Jonathan Corbet <corbet@....net>
To: linux-kernel@...r.kernel.org
Cc: Florian Tobias Schandinat <FlorianSchandinat@....de>,
Harald Welte <laforge@...monks.org>, JosephChan@....com.tw,
ScottFang@...tech.com.cn, Deepak Saxena <dsaxena@...top.org>,
linux-fbdev-devel@...ts.sourceforge.net
Subject: [PATCH 13/16] VIAFB: Update suspend/resume to selectively restore registers
From: Deepak Saxena <dsaxena@...top.org>
The existing code in VIAFB, taken from the openchrome driver,
causes the system to lock up upon moving the mouse pointer. This
patch uses the selective register restore from the official
VIA driver to keep this from happening.
This fixes http://dev.laptop.org/ticket/9565
[jc: extensive reworking to merge with 2.6.34 and to deal with some
coding issues. This code still needs improvement, though; that will
come in a later patch.]
Signed-off-by: Deepak Saxena <dsaxena@...top.org>
---
drivers/video/via/viafbdev.c | 79 +++++++++++++++++++++++++++++++++++++++---
drivers/video/via/viafbdev.h | 76 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 148 insertions(+), 7 deletions(-)
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 5a5964f..56d5416 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1850,9 +1850,9 @@ static int viafb_suspend(struct pci_dev *pdev, pm_message_t state)
if (state.event == PM_EVENT_SUSPEND) {
acquire_console_sem();
- memcpy_fromio(viaparinfo->shared->saved_regs,
+ memcpy_fromio(&viaparinfo->shared->saved_video_regs,
viaparinfo->shared->engine_mmio + 0x100,
- 0x100 * sizeof(u32));
+ sizeof(struct via_video_regs));
fb_set_suspend(viafbinfo, 1);
@@ -1869,6 +1869,10 @@ static int viafb_suspend(struct pci_dev *pdev, pm_message_t state)
static int viafb_resume(struct pci_dev *pdev)
{
+ volatile struct via_video_regs *viaVidEng =
+ (volatile struct via_video_regs *)(viaparinfo->shared->engine_mmio + 0x200);
+ struct via_video_regs *localVidEng = &viaparinfo->shared->saved_video_regs;
+
acquire_console_sem();
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
@@ -1876,9 +1880,74 @@ static int viafb_resume(struct pci_dev *pdev)
goto fail;
pci_set_master(pdev);
- memcpy_toio(viaparinfo->shared->engine_mmio + 0x100,
- viaparinfo->shared->saved_regs,
- 0x100 * sizeof(u32));
+ /*
+ * Following set of register restores is black magic takend
+ * from the VIA X driver. Most of it is from the LeaveVT() and
+ * EnterVT() path and some is gleaned by looking at other bits
+ * of code to figure out what registers to touch.
+ */
+ viaVidEng->alphawin_hvstart = localVidEng->alphawin_hvstart;
+ viaVidEng->alphawin_size = localVidEng->alphawin_size;
+ viaVidEng->alphawin_ctl = localVidEng->alphawin_ctl;
+ viaVidEng->alphafb_stride = localVidEng->alphafb_stride;
+ viaVidEng->color_key = localVidEng->color_key;
+ viaVidEng->alphafb_addr = localVidEng->alphafb_addr;
+ viaVidEng->chroma_low = localVidEng->chroma_low;
+ viaVidEng->chroma_up = localVidEng->chroma_up;
+
+ /*VT3314 only has V3*/
+ viaVidEng->video1_ctl = localVidEng->video1_ctl;
+ viaVidEng->video1_fetch = localVidEng->video1_fetch;
+ viaVidEng->video1y_addr1 = localVidEng->video1y_addr1;
+ viaVidEng->video1_stride = localVidEng->video1_stride;
+ viaVidEng->video1_hvstart = localVidEng->video1_hvstart;
+ viaVidEng->video1_size = localVidEng->video1_size;
+ viaVidEng->video1y_addr2 = localVidEng->video1y_addr2;
+ viaVidEng->video1_zoom = localVidEng->video1_zoom;
+ viaVidEng->video1_mictl = localVidEng->video1_mictl;
+ viaVidEng->video1y_addr0 = localVidEng->video1y_addr0;
+ viaVidEng->video1_fifo = localVidEng->video1_fifo;
+ viaVidEng->video1y_addr3 = localVidEng->video1y_addr3;
+ viaVidEng->v1_source_w_h = localVidEng->v1_source_w_h ;
+ viaVidEng->video1_CSC1 = localVidEng->video1_CSC1;
+ viaVidEng->video1_CSC2 = localVidEng->video1_CSC2;
+
+ viaVidEng->snd_color_key = localVidEng->snd_color_key;
+ viaVidEng->v3alpha_prefifo = localVidEng->v3alpha_prefifo;
+ viaVidEng->v3alpha_fifo = localVidEng->v3alpha_fifo;
+ viaVidEng->video3_CSC2 = localVidEng->video3_CSC2;
+ viaVidEng->video3_CSC2 = localVidEng->video3_CSC2;
+ viaVidEng->v3_source_width = localVidEng->v3_source_width;
+ viaVidEng->video3_ctl = localVidEng->video3_ctl;
+ viaVidEng->video3_addr0 = localVidEng->video3_addr0;
+ viaVidEng->video3_addr1 = localVidEng->video3_addr1;
+ viaVidEng->video3_stride = localVidEng->video3_stride;
+ viaVidEng->video3_hvstart = localVidEng->video3_hvstart;
+ viaVidEng->video3_size = localVidEng->video3_size;
+ viaVidEng->v3alpha_fetch = localVidEng->v3alpha_fetch;
+ viaVidEng->video3_zoom = localVidEng->video3_zoom;
+ viaVidEng->video3_mictl = localVidEng->video3_mictl;
+ viaVidEng->video3_CSC1 = localVidEng->video3_CSC1;
+ viaVidEng->video3_CSC2 = localVidEng->video3_CSC2;
+ viaVidEng->compose = localVidEng->compose;
+
+ /*
+ * This _might_ not be needed, likely text mode cursor
+ */
+ viaVidEng->cursor_mode = localVidEng->cursor_mode;
+ viaVidEng->cursor_pos = localVidEng->cursor_pos;
+ viaVidEng->cursor_org = localVidEng->cursor_org;
+ viaVidEng->cursor_bg = localVidEng->cursor_bg;
+ viaVidEng->cursor_fg = localVidEng->cursor_fg;
+
+ /*
+ * Magic register dance to make cursor reappear.
+ *
+ * Currently hardcoded settings need to clean this all
+ * up later...
+ */
+ viaVidEng->hi_control = 0xb6000005;
+ viaVidEng->compose |= 0xc0000000;
fb_set_suspend(viafbinfo, 0);
diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h
index 46d41af..23b4afd 100644
--- a/drivers/video/via/viafbdev.h
+++ b/drivers/video/via/viafbdev.h
@@ -39,6 +39,77 @@
#define VIAFB_NUM_I2C 5
+/*
+ * From VIA X Driver; these are the registers we save on suspend/resume
+ */
+struct via_video_regs {
+ u32 interruptflag; /* 200 */
+ u32 ramtab; /* 204 */
+ u32 alphawin_hvstart; /* 208 */
+ u32 alphawin_size; /* 20c */
+ u32 alphawin_ctl; /* 210 */
+ u32 crt_startaddr; /* 214 */
+ u32 crt_startaddr_2; /* 218 */
+ u32 alphafb_stride ; /* 21c */
+ u32 color_key; /* 220 */
+ u32 alphafb_addr; /* 224 */
+ u32 chroma_low; /* 228 */
+ u32 chroma_up; /* 22c */
+ u32 video1_ctl; /* 230 */
+ u32 video1_fetch; /* 234 */
+ u32 video1y_addr1; /* 238 */
+ u32 video1_stride; /* 23c */
+ u32 video1_hvstart; /* 240 */
+ u32 video1_size; /* 244 */
+ u32 video1y_addr2; /* 248 */
+ u32 video1_zoom; /* 24c */
+ u32 video1_mictl; /* 250 */
+ u32 video1y_addr0; /* 254 */
+ u32 video1_fifo; /* 258 */
+ u32 video1y_addr3; /* 25c */
+ u32 hi_control; /* 260 */
+ u32 snd_color_key; /* 264 */
+ u32 v3alpha_prefifo; /* 268 */
+ u32 v1_source_w_h; /* 26c */
+ u32 hi_transparent_color; /* 270 */
+ u32 v_display_temp; /* 274 :No use */
+ u32 v3alpha_fifo; /* 278 */
+ u32 v3_source_width; /* 27c */
+ u32 dummy1; /* 280 */
+ u32 video1_CSC1; /* 284 */
+ u32 video1_CSC2; /* 288 */
+ u32 video1u_addr0; /* 28c */
+ u32 video1_opqctl; /* 290 */
+ u32 video3_opqctl; /* 294 */
+ u32 compose; /* 298 */
+ u32 dummy2; /* 29c */
+ u32 video3_ctl; /* 2a0 */
+ u32 video3_addr0; /* 2a4 */
+ u32 video3_addr1; /* 2a8 */
+ u32 video3_stride; /* 2ac */
+ u32 video3_hvstart; /* 2b0 */
+ u32 video3_size; /* 2b4 */
+ u32 v3alpha_fetch; /* 2b8 */
+ u32 video3_zoom; /* 2bc */
+ u32 video3_mictl; /* 2c0 */
+ u32 video3_CSC1; /* 2c4 */
+ u32 video3_CSC2; /* 2c8 */
+ u32 v3_display_temp; /* 2cc */
+ u32 cursor_mode;
+ u32 cursor_pos;
+ u32 cursor_org;
+ u32 cursor_bg;
+ u32 cursor_fg;
+ u32 video1u_addr1; /* 2e4 */
+ u32 video1u_addr2; /* 2e8 */
+ u32 video1u_addr3; /* 2ec */
+ u32 video1v_addr0; /* 2f0 */
+ u32 video1v_addr1; /* 2f4 */
+ u32 video1v_addr2; /* 2f8 */
+ u32 video1v_addr3; /* 2fc */
+};
+
+
struct viafb_shared {
struct proc_dir_entry *proc_entry; /*viafb proc entry */
@@ -61,10 +132,11 @@ struct viafb_shared {
u32 *src_mem, u32 src_addr, u32 src_pitch, u32 src_x, u32 src_y,
u32 fg_color, u32 bg_color, u8 fill_rop);
- /* For suspend/resume */
- u32 saved_regs[0x100];
+ /* For suspend/resume */
+ struct via_video_regs saved_video_regs;
};
+
struct viafb_par {
u8 depth;
u32 vram_addr;
--
1.7.0.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists