From 230df378e30299e38f5d420ec11ae8a98d691780 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Sat, 23 Jul 2005 18:47:21 +0000 Subject: [PATCH] added preliminary K8M800 pixelPLL programming. Need feedback to determine if it works. Bumped version to 0.06. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13808 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/via/engine/dac.c | 11 ++++++++--- src/add-ons/accelerants/via/engine/general.c | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/add-ons/accelerants/via/engine/dac.c b/src/add-ons/accelerants/via/engine/dac.c index 2500b7d85b..5c3e63b70a 100644 --- a/src/add-ons/accelerants/via/engine/dac.c +++ b/src/add-ons/accelerants/via/engine/dac.c @@ -183,17 +183,21 @@ status_t eng_dac_set_pix_pll(display_mode target) } /*reprogram (disable,select,wait for stability,enable)*/ -// DXIW(PIXCLKCTRL,(DXIR(PIXCLKCTRL)&0x0F)|0x04); /*disable the PIXPLL*/ -// DXIW(PIXCLKCTRL,(DXIR(PIXCLKCTRL)&0x0C)|0x01); /*select the PIXPLL*/ /* program new frequency */ -//fixme: add K8M800 programming and calcs!! (these differ, plus extended) <<<<< if (si->ps.card_arch != K8M800) { /* fixme: b7 is a lock-indicator or a filter select: to be determined! */ SEQW(PPLL_N_CLE, (n & 0x7f)); SEQW(PPLL_MP_CLE, ((m & 0x3f) | ((p & 0x03) << 6))); } + else + { + /* fixme: preliminary, still needs to be confirmed */ + SEQW(PPLL_N_OTH, (n & 0x7f)); + SEQW(PPLL_M_OTH, (m & 0x3f)); + SEQW(PPLL_P_OTH, (p & 0x03)); + } /* Wait for the PIXPLL frequency to lock until timeout occurs */ //fixme: do VIA cards have a LOCK indication bit?? @@ -222,6 +226,7 @@ status_t eng_dac_set_pix_pll(display_mode target) status_t eng_dac_pix_pll_find (display_mode target,float * calc_pclk,uint8 * m_result,uint8 * n_result,uint8 * p_result, uint8 test) { + //fixme: add K8M800 calcs if needed.. switch (si->ps.card_type) { default: return cle266_km400_dac_pix_pll_find(target, calc_pclk, m_result, n_result, p_result, test); } diff --git a/src/add-ons/accelerants/via/engine/general.c b/src/add-ons/accelerants/via/engine/general.c index 4d046187d0..cf0baf29cc 100644 --- a/src/add-ons/accelerants/via/engine/general.c +++ b/src/add-ons/accelerants/via/engine/general.c @@ -90,7 +90,7 @@ status_t eng_general_powerup() { status_t status; - LOG(1,("POWERUP: Haiku VIA Accelerant 0.05 running.\n")); + LOG(1,("POWERUP: Haiku VIA Accelerant 0.06 running.\n")); /* preset no laptop */ si->ps.laptop = false;