From 4535f2e2e1c22664433ae4b9a048f322df96f48c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 26 Jan 2009 19:06:30 +0000 Subject: [PATCH] minor consistency fixes --- src/nv_crtc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/nv_crtc.c b/src/nv_crtc.c index d410d4b..d364c12 100644 --- a/src/nv_crtc.c +++ b/src/nv_crtc.c @@ -643,6 +643,8 @@ nv_crtc_mode_set_regs(xf86CrtcPtr crtc, DisplayModePtr mode) NV_CRTC_CURSOR_CONFIG_ALPHA_BLEND; } else regp->cursorConfig |= NV_CRTC_CURSOR_CONFIG_32LINES; + if (pNv->Architecture != NV_ARCH_04) + regp->cursorConfig |= 1 << 8; /* Unblock some timings */ regp->CRTC[NV_CIO_CRE_53] = 0; @@ -1369,6 +1371,8 @@ static void nv_crtc_load_state_ext(xf86CrtcPtr crtc, RIVA_HW_STATE *state) crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_21); NVCrtcWriteCRTC(crtc, NV_CRTC_CURSOR_CONFIG, regp->cursorConfig); + if (pNv->Architecture == NV_ARCH_40) + nv_fix_nv40_hw_cursor(pNv, nv_crtc->head); NVCrtcWriteCRTC(crtc, NV_CRTC_0830, regp->unk830); NVCrtcWriteCRTC(crtc, NV_CRTC_0834, regp->unk834); if (pNv->Architecture == NV_ARCH_40) { -- 1.6.0.2