Attachment 16412 Details for Bug 11305 – Save/restore cursor state

[patch] Save/restore cursor state

i830-save-restore-cursor-state.patch (text/plain), 2.11 KB, created by Jesse Barnes on 2008-05-07 10:29:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2008-05-07 10:29:11 UTC

Size: 2.11 KB

patch

obsolete

>diff --git a/src/i830.h b/src/i830.h
>index a8a375b..b090ec4 100644
>--- a/src/i830.h
>+++ b/src/i830.h
>@@ -624,6 +624,12 @@ typedef struct _I830Rec {
>    uint32_t saveVCLK_DIVISOR_VGA1;
>    uint32_t saveVCLK_POST_DIV;
>    uint32_t saveVGACNTRL;
>+   uint32_t saveCURSOR_A_CONTROL;
>+   uint32_t saveCURSOR_A_BASE;
>+   uint32_t saveCURSOR_A_POSITION;
>+   uint32_t saveCURSOR_B_CONTROL;
>+   uint32_t saveCURSOR_B_BASE;
>+   uint32_t saveCURSOR_B_POSITION;
>    uint32_t saveADPA;
>    uint32_t saveLVDS;
>    uint32_t saveDVOA;
>diff --git a/src/i830_driver.c b/src/i830_driver.c
>index 2efad47..db13433 100644
>--- a/src/i830_driver.c
>+++ b/src/i830_driver.c
>@@ -2037,6 +2037,13 @@ SaveHWState(ScrnInfoPtr pScrn)
>    pI830->saveVCLK_POST_DIV = INREG(VCLK_POST_DIV);
>    pI830->saveVGACNTRL = INREG(VGACNTRL);
> 
>+   pI830->saveCURSOR_A_CONTROL = INREG(CURSOR_A_CONTROL);
>+   pI830->saveCURSOR_A_POSITION = INREG(CURSOR_A_POSITION);
>+   pI830->saveCURSOR_A_BASE = INREG(CURSOR_A_BASE);
>+   pI830->saveCURSOR_B_CONTROL = INREG(CURSOR_B_CONTROL);
>+   pI830->saveCURSOR_B_POSITION = INREG(CURSOR_B_POSITION);
>+   pI830->saveCURSOR_B_BASE = INREG(CURSOR_B_BASE);
>+
>    for(i = 0; i < 7; i++) {
>       pI830->saveSWF[i] = INREG(SWF0 + (i << 2));
>       pI830->saveSWF[i+7] = INREG(SWF00 + (i << 2));
>@@ -2238,6 +2245,20 @@ RestoreHWState(ScrnInfoPtr pScrn)
> 
>    OUTREG(VGACNTRL, pI830->saveVGACNTRL);
> 
>+   /*
>+    * Restore cursors
>+    * Even though the X cursor is hidden before we restore the hw state,
>+    * we probably only disabled one cursor plane.  If we're going from
>+    * e.g. plane b to plane a here in RestoreHWState, we need to restore
>+    * both cursor plane settings.
>+    */
>+   OUTREG(CURSOR_A_CONTROL, pI830->saveCURSOR_A_CONTROL);
>+   OUTREG(CURSOR_A_POSITION, pI830->saveCURSOR_A_POSITION);
>+   OUTREG(CURSOR_A_BASE, pI830->saveCURSOR_A_BASE);
>+   OUTREG(CURSOR_B_CONTROL, pI830->saveCURSOR_B_CONTROL);
>+   OUTREG(CURSOR_B_POSITION, pI830->saveCURSOR_B_POSITION);
>+   OUTREG(CURSOR_B_BASE, pI830->saveCURSOR_B_BASE);
>+
>    /* Restore outputs */
>    for (i = 0; i < xf86_config->num_output; i++) {
>       xf86OutputPtr   output = xf86_config->output[i];

Actions: View | Splinter Review

Attachments on bug 11305: 10367 | 11258 | 11259 | 14243 | 15315 | 15316 | 15317 | 15318 | 15319 | 15320 | 15321 | 15323 | 16368 | 16371 | 16412

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.