i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finalized HW cursor sync: now tested and found OK on all my pre-NV40 cards.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10650 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2005-01-10 11:24:33 +00:00
parent 4047880883
commit 0b7b8998b2
2 changed files with 6 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/nvidia/engine/nv_crtc.c
+3 -31
View File
@@ -702,6 +702,8 @@ status_t nv_crtc_cursor_init()
NV_REG32(NV32_CURCONF) = 0x02000100; NV_REG32(NV32_CURCONF) = 0x02000100;
/* activate hardware-sync between cursor updates and vertical retrace */ /* activate hardware-sync between cursor updates and vertical retrace */
/* note:
* on pre-NV10 cards hardware sync is hardwired ON */
if (si->ps.card_arch >= NV10A) if (si->ps.card_arch >= NV10A)
DACW(NV10_CURSYNC, (DACR(NV10_CURSYNC) | 0x02000000)); DACW(NV10_CURSYNC, (DACR(NV10_CURSYNC) | 0x02000000));
@@ -794,37 +796,7 @@ status_t nv_crtc_cursor_define(uint8* andMask,uint8* xorMask)
/* position the cursor */ /* position the cursor */
status_t nv_crtc_cursor_position(uint16 x, uint16 y) status_t nv_crtc_cursor_position(uint16 x, uint16 y)
{ {
// uint16 yhigh; /* the cursor position is updated during retrace by card hardware */
/* make sure we are beyond the first line of the cursorbitmap being drawn during
* updating the position to prevent distortions: no double buffering feature */
/* Note:
* we need to return as quick as possible or some apps will exhibit lagging.. */
/* read the old cursor Y position */
// yhigh = ((DACR(CURPOS) & 0x0fff0000) >> 16);
/* make sure we will wait until we are below both the old and new Y position:
* visible cursorbitmap drawing needs to be done at least... */
// if (y > yhigh) yhigh = y;
// if (yhigh < (si->dm.timing.v_display - 16))
// {
/* we have vertical lines below old and new cursorposition to spare. So we
* update the cursor postion 'mid-screen', but below that area. */
// while (((uint16)(NV_REG32(NV32_RASTER) & 0x000007ff)) < (yhigh + 16))
// {
// snooze(10);
// }
// }
// else
// {
/* no room to spare, just wait for retrace (is relatively slow) */
// while ((NV_REG32(NV32_RASTER) & 0x000007ff) < si->dm.timing.v_display)
// {
/* don't snooze much longer or retrace might get missed! */
// snooze(10);
// }
// }
/* update cursorposition */ /* update cursorposition */
DACW(CURPOS, ((x & 0x0fff) | ((y & 0x0fff) << 16))); DACW(CURPOS, ((x & 0x0fff) | ((y & 0x0fff) << 16)));
src/add-ons/accelerants/nvidia/engine/nv_crtc2.c
+3 -33
View File
@@ -1,13 +1,13 @@
/* second CTRC functionality for GeForce cards */ /* second CTRC functionality for GeForce cards */
/* Author: /* Author:
Rudolf Cornelissen 11/2002-9/2004 Rudolf Cornelissen 11/2002-1/2005
*/ */
#define MODULE_BIT 0x00020000 #define MODULE_BIT 0x00020000
#include "nv_std.h" #include "nv_std.h"
/*Adjust passed parameters to a valid mode line*/ /* Adjust passed parameters to a valid mode line */
status_t nv_crtc2_validate_timing( status_t nv_crtc2_validate_timing(
uint16 *hd_e,uint16 *hs_s,uint16 *hs_e,uint16 *ht, uint16 *hd_e,uint16 *hs_s,uint16 *hs_e,uint16 *ht,
uint16 *vd_e,uint16 *vs_s,uint16 *vs_e,uint16 *vt uint16 *vd_e,uint16 *vs_s,uint16 *vs_e,uint16 *vt
@@ -755,37 +755,7 @@ status_t nv_crtc2_cursor_define(uint8* andMask,uint8* xorMask)
/* position the cursor */ /* position the cursor */
status_t nv_crtc2_cursor_position(uint16 x, uint16 y) status_t nv_crtc2_cursor_position(uint16 x, uint16 y)
{ {
// uint16 yhigh; /* the cursor position is updated during retrace by card hardware */
/* make sure we are beyond the first line of the cursorbitmap being drawn during
* updating the position to prevent distortions: no double buffering feature */
/* Note:
* we need to return as quick as possible or some apps will exhibit lagging.. */
/* read the old cursor Y position */
// yhigh = ((DAC2R(CURPOS) & 0x0fff0000) >> 16);
/* make sure we will wait until we are below both the old and new Y position:
* visible cursorbitmap drawing needs to be done at least... */
// if (y > yhigh) yhigh = y;
// if (yhigh < (si->dm.timing.v_display - 16))
// {
/* we have vertical lines below old and new cursorposition to spare. So we
* update the cursor postion 'mid-screen', but below that area. */
// while (((uint16)(NV_REG32(NV32_RASTER2) & 0x000007ff)) < (yhigh + 16))
// {
// snooze(10);
// }
// }
// else
// {
/* no room to spare, just wait for retrace (is relatively slow) */
// while ((NV_REG32(NV32_RASTER2) & 0x000007ff) < si->dm.timing.v_display)
// {
/* don't snooze much longer or retrace might get missed! */
// snooze(10);
// }
// }
/* update cursorposition */ /* update cursorposition */
DAC2W(CURPOS, ((x & 0x0fff) | ((y & 0x0fff) << 16))); DAC2W(CURPOS, ((x & 0x0fff) | ((y & 0x0fff) << 16)));