Attachment 17442 Details for Bug 16553 – Save and restore the framebuffer offset.

[patch] Save and restore the framebuffer offset.

test.patch (text/plain), 1.62 KB, created by Maarten Maathuis on 2008-06-28 04:39:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maarten Maathuis

Created: 2008-06-28 04:39:34 UTC

Size: 1.62 KB

patch

obsolete

>diff --git a/src/nv_crtc.c b/src/nv_crtc.c
>index 672cd9f..292c6bb 100644
>--- a/src/nv_crtc.c
>+++ b/src/nv_crtc.c
>@@ -1658,6 +1658,9 @@ static void nv_crtc_load_state_ext(xf86CrtcPtr crtc, RIVA_HW_STATE *state, Bool
> 		NVWriteVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_86, regp->CRTC[NV_VGA_CRTCX_86]);
> 	}
> 
>+	if (override)
>+		NVCrtcWriteCRTC(crtc, NV_CRTC_START, regp->fb_start);
>+
> 	/* Setting 1 on this value gives you interrupts for every vblank period. */
> 	NVCrtcWriteCRTC(crtc, NV_CRTC_INTR_EN_0, 0);
> 	NVCrtcWriteCRTC(crtc, NV_CRTC_INTR_0, NV_CRTC_INTR_VBLANK);
>@@ -1754,6 +1757,8 @@ static void nv_crtc_save_state_ext(xf86CrtcPtr crtc, RIVA_HW_STATE *state)
> 		regp->CRTC[NV_VGA_CRTCX_85] = NVReadVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_85);
> 		regp->CRTC[NV_VGA_CRTCX_86] = NVReadVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_86);
> 	}
>+
>+	regp->fb_start = NVCrtcReadCRTC(crtc, NV_CRTC_START);
> }
> 
> static void nv_crtc_save_state_ramdac(xf86CrtcPtr crtc, RIVA_HW_STATE *state)
>@@ -1884,9 +1889,6 @@ NVCrtcSetBase (xf86CrtcPtr crtc, int x, int y, Bool bios_restore)
> 	/* 30 bits addresses in 32 bits according to haiku */
> 	NVCrtcWriteCRTC(crtc, NV_CRTC_START, start & 0xfffffffc);
> 
>-	/* set NV4/NV10 byte adress: (bit0 - 1) */
>-	NVWriteVgaAttr(pNv, nv_crtc->head, 0x13, (start & 0x3) << 1);
>-
> 	crtc->x = x;
> 	crtc->y = y;
> }
>diff --git a/src/nv_type.h b/src/nv_type.h
>index d9b11d5..2564b91 100644
>--- a/src/nv_type.h
>+++ b/src/nv_type.h
>@@ -152,6 +152,7 @@ typedef struct _nv_crtc_reg
> 	uint32_t unk850;
> 	uint32_t head;
> 	uint32_t config;
>+	uint32_t fb_start;
> 
> 	/* These are former output regs, but are believed to be crtc related */
> 	uint32_t general;

Actions: View | Splinter Review

Attachments on bug 16553: 17442 | 17444 | 17445

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.