From 6251f2fa774b913f5622ff9d07f56b2a5b9d1888 Mon Sep 17 00:00:00 2001 From: Maarten Maathuis Date: Fri, 18 Jan 2008 12:17:50 +0100 Subject: [PATCH] Some misc fixes. --- src/nv40_video_texture.c | 3 ++- src/nv_crtc.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nv40_video_texture.c b/src/nv40_video_texture.c index 0dcd8ba..65f3c92 100644 --- a/src/nv40_video_texture.c +++ b/src/nv40_video_texture.c @@ -247,7 +247,8 @@ int NV40PutTextureImage(ScrnInfoPtr pScrn, int src_offset, dstBox->y2 -= pPix->screen_y; } - DamageDamageRegion((DrawablePtr)pPix, clipBoxes); + /* I suspect that pDraw itself is not offscreen, hence not suited for damage tracking. */ + DamageDamageRegion(&pPix->drawable, clipBoxes); #endif pbox = REGION_RECTS(clipBoxes); diff --git a/src/nv_crtc.c b/src/nv_crtc.c index bd04835..6c27e99 100644 --- a/src/nv_crtc.c +++ b/src/nv_crtc.c @@ -1727,7 +1727,10 @@ nv_crtc_mode_set_regs(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModePtr adju } /* Some cards have 0x41 instead of 0x1 (for crtc 0), what is the meaning of that? */ - regp->CRTC[NV_VGA_CRTCX_4B] = 0x1; + if (nv_crtc->head == 0) + regp->CRTC[NV_VGA_CRTCX_4B] = 0x1; + else + regp->CRTC[NV_VGA_CRTCX_4B] = 0x0; if (is_fp && !NVMatchModePrivate(mode, NV_MODE_CONSOLE)) regp->CRTC[NV_VGA_CRTCX_4B] |= 0x80; -- 2.32.0.93.g670b81a890