From 0fcc145db7690d32c0fc1ddf48dcb33f9c840026 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Sat, 21 May 2005 16:04:02 +0000 Subject: [PATCH] removed more old surface commands related programming. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12755 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../accelerants/nvidia/engine/nv_acc_dma.c | 34 +++---------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c b/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c index f8c6a76418..115c1b40d6 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c @@ -454,10 +454,6 @@ status_t nv_acc_init_dma() ACCW(BPIXEL, 0x00000021); ACCW(STRD_FMT, 0x03020202); /* PRAMIN */ - ACCW(PR_CTX1_9, 0x00000302); /* format is X24Y8, LSB mono */ - ACCW(PR_CTX2_9, 0x00000302); /* dma_instance 0 valid, instance 1 invalid */ - ACCW(PR_CTX1_B, 0x00000000); /* format is invalid */ - ACCW(PR_CTX1_C, 0x00000000); /* format is invalid */ if (si->ps.card_arch == NV04A) { ACCW(PR_CTX1_D, 0x00000302); /* format is X24Y8, LSB mono */ @@ -479,20 +475,11 @@ status_t nv_acc_init_dma() ACCW(BPIXEL, 0x00000042); ACCW(STRD_FMT, 0x09080808); /* PRAMIN */ - ACCW(PR_CTX1_9, 0x00000902); /* format is X17RGB15, LSB mono */ - ACCW(PR_CTX2_9, 0x00000902); /* dma_instance 0 valid, instance 1 invalid */ - if (si->ps.card_arch == NV04A) + ACCW(PR_CTX1_D, 0x00000902); /* format is X17RGB15, LSB mono */ + if (si->ps.card_arch != NV04A) { - ACCW(PR_CTX1_B, 0x00000702); /* format is X1RGB15, LSB mono */ - ACCW(PR_CTX1_C, 0x00000702); /* format is X1RGB15, LSB mono */ - } - else - { - ACCW(PR_CTX1_B, 0x00000902); /* format is X17RGB15, LSB mono */ - ACCW(PR_CTX1_C, 0x00000902); /* format is X17RGB15, LSB mono */ ACCW(PR_CTX1_E, 0x00000902); /* format is X17RGB15, LSB mono */ } - ACCW(PR_CTX1_D, 0x00000902); /* format is X17RGB15, LSB mono */ break; case B_RGB16_LITTLE: /* acc engine */ @@ -508,20 +495,11 @@ status_t nv_acc_init_dma() else ACCW(STRD_FMT, 0x000b0b0c); /* PRAMIN */ - ACCW(PR_CTX1_9, 0x00000c02); /* format is X16RGB16, LSB mono */ - ACCW(PR_CTX2_9, 0x00000c02); /* dma_instance 0 valid, instance 1 invalid */ - if (si->ps.card_arch == NV04A) + ACCW(PR_CTX1_D, 0x00000c02); /* format is X16RGB16, LSB mono */ + if (si->ps.card_arch != NV04A) { - ACCW(PR_CTX1_B, 0x00000702); /* format is X1RGB15, LSB mono */ - ACCW(PR_CTX1_C, 0x00000702); /* format is X1RGB15, LSB mono */ - } - else - { - ACCW(PR_CTX1_B, 0x00000c02); /* format is X16RGB16, LSB mono */ - ACCW(PR_CTX1_C, 0x00000c02); /* format is X16RGB16, LSB mono */ ACCW(PR_CTX1_E, 0x00000c02); /* format is X16RGB16, LSB mono */ } - ACCW(PR_CTX1_D, 0x00000c02); /* format is X16RGB16, LSB mono */ break; case B_RGB32_LITTLE: case B_RGBA32_LITTLE: @@ -535,10 +513,6 @@ status_t nv_acc_init_dma() ACCW(BPIXEL, 0x000000e7); ACCW(STRD_FMT, 0x0e0d0d0d); /* PRAMIN */ - ACCW(PR_CTX1_9, 0x00000e02); /* format is X8RGB24, LSB mono */ - ACCW(PR_CTX2_9, 0x00000e02); /* dma_instance 0 valid, instance 1 invalid */ - ACCW(PR_CTX1_B, 0x00000e02); /* format is X8RGB24, LSB mono */ - ACCW(PR_CTX1_C, 0x00000e02); /* format is X8RGB24, LSB mono */ ACCW(PR_CTX1_D, 0x00000e02); /* format is X8RGB24, LSB mono */ if (si->ps.card_arch >= NV10A) ACCW(PR_CTX1_E, 0x00000e02); /* format is X8RGB24, LSB mono */