From 5d0bf8c5cd88b71bf93904b5021dc04154273640 Mon Sep 17 00:00:00 2001 From: Stuart Bennett Date: Wed, 5 Mar 2008 02:15:28 +0000 Subject: [PATCH] randr12: do not change CR43 from its initial value --- src/nv_crtc.c | 3 --- src/nvreg.h | 1 - 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/nv_crtc.c b/src/nv_crtc.c index c736f60..4a2b280 100644 --- a/src/nv_crtc.c +++ b/src/nv_crtc.c @@ -1204,7 +1204,6 @@ nv_crtc_mode_set_regs(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adju } /* Some misc regs */ - regp->CRTC[NV_VGA_CRTCX_43] = 0x1; if (pNv->Architecture == NV_ARCH_40) { regp->CRTC[NV_VGA_CRTCX_85] = 0xFF; regp->CRTC[NV_VGA_CRTCX_86] = 0x1; @@ -2091,7 +2090,6 @@ static void nv_crtc_load_state_ext(xf86CrtcPtr crtc, RIVA_HW_STATE *state, Bool NVWriteVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_SCRATCH4, regp->CRTC[NV_VGA_CRTCX_SCRATCH4]); if (pNv->Architecture >= NV_ARCH_10) { NVWriteVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_EXTRA, regp->CRTC[NV_VGA_CRTCX_EXTRA]); - NVWriteVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_43, regp->CRTC[NV_VGA_CRTCX_43]); NVWriteVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_45, regp->CRTC[NV_VGA_CRTCX_45]); NVWriteVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_4B, regp->CRTC[NV_VGA_CRTCX_4B]); NVWriteVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_52, regp->CRTC[NV_VGA_CRTCX_52]); @@ -2191,7 +2189,6 @@ static void nv_crtc_save_state_ext(xf86CrtcPtr crtc, RIVA_HW_STATE *state) regp->CRTC[NV_VGA_CRTCX_SCRATCH4] = NVReadVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_SCRATCH4); if (pNv->Architecture >= NV_ARCH_10) { regp->CRTC[NV_VGA_CRTCX_EXTRA] = NVReadVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_EXTRA); - regp->CRTC[NV_VGA_CRTCX_43] = NVReadVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_43); regp->CRTC[NV_VGA_CRTCX_45] = NVReadVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_45); regp->CRTC[NV_VGA_CRTCX_4B] = NVReadVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_4B); regp->CRTC[NV_VGA_CRTCX_52] = NVReadVgaCrtc(pNv, nv_crtc->head, NV_VGA_CRTCX_52); diff --git a/src/nvreg.h b/src/nvreg.h index ee263fe..b35c347 100644 --- a/src/nvreg.h +++ b/src/nvreg.h @@ -146,7 +146,6 @@ #define NV_VGA_CRTCX_3B 0x3b #define NV_VGA_CRTCX_SCRATCH4 0x3c #define NV_VGA_CRTCX_EXTRA 0x41 -#define NV_VGA_CRTCX_43 0x43 #define NV_VGA_CRTCX_OWNER 0x44 #define NV_VGA_CRTCX_45 0x45 #define NV_VGA_CRTCX_SWAPPING 0x46 -- 1.5.3.2