SPEA Mirage (was: Re: format for source diffs)

[Stefan Bieschewski (CIP Admin) Stefan.Bieschewski@informatik.uni-erlangen.de]

Hi,

    this patch to aux/vga works fine with my Spea Mirage.  The entry
for the `GIS Globalyst 550' also matches my card, so I had to remove it.
The patch is relative to the cd distribution.

Stefan
============================================
% diff new /sys/src/cmd/aux/vga/vgadb
47,52d46
< 	0xC00E4="V7-MIRAGE P-64 BIOS Version 4"		# Spea Mirage Bios 4.xx
< 	link=vga
< 	hwgc=s3hwgc
< 	ctlr=vision864 link=ibm8514
< 	ramdac=s3sdac
< ctlr
54c48
< #	0xC0044="Phoenix S3 Vision864 (16Bit DAC)"		# GIS Globalyst 550
---
> 	0xC0044="Phoenix S3 Vision864 (16Bit DAC)"		# GIS Globalyst 550
============================================
% diff new /sys/src/cmd/aux/vga/data.c
31d30
< 	&s3sdac,				/* ramdac & clock */
============================================
% diff new /sys/src/cmd/aux/vga/mkfile
29d28
< 	s3sdac.$O\
============================================
% diff new /sys/src/cmd/aux/vga/vga.h
221,223d220
< /* s3sdac.c */
< extern Ctlr s3sdac;
< 
============================================
% diff new /sys/src/cmd/aux/vga/vision864.c
50c50,51
< 	 * magic formula below is taken from XFree86.
---
> 	 * values below are guesses from dumping
> 	 * registers.
56,74c57,62
< 	{
< 		long m, n, clk, mclk;
< 		clk = vga->f;
< 		n = 255;
< 		mclk = 60000000;
< 		if (vga->vmb < 2048*1024)
< 			clk *= 2;
< 		m = (mclk*.72+16867000)*89.736/(clk+39000000)-21;
< 		if (vga->vmb < 2048*1024)
< 			m /= 2;
< 		if (m > 31)
< 			m = 31;
< 		if (m < 0) {
< 			m = 0;
< 			n = 16;
< 		}
< 		vga->crt[0x54] = m<<3;
< 		vga->crt[0x60] = n;
< 	}
---
> 	if(vga->mode->x <= 800)
> 		vga->crt[0x54] = 0x88;
> 	else if(vga->mode->x <= 1024)
> 		vga->crt[0x54] = 0xF8;
> 	else
> 		vga->crt[0x54] = 0x40;
75a64
> 
78c67
< 		vga->crt[0x67] |= 0x11;
---
> 		vga->crt[0x67] |= 0x10;
============================================
% cat /sys/src/cmd/aux/vga/s3sdac.c
#include <u.h>
#include <libc.h>

#include "vga.h"

/*
 * S3 SDAC 86C716 RAMDAC and programmable clock.
 */

enum {
	PClk		= 0x02,
	MClk		= 0x0a,
};

static void
options(Vga *vga, Ctlr *ctlr)
{
	USED(vga);
	verbose("%s->options\n", ctlr->name);

	ctlr->flag |= Hpclk2x8|Foptions;
}

static void
init(Vga *vga, Ctlr *ctlr)
{
	verbose("%s->init\n", ctlr->name);

	/*
	 * If we don't already have a desired pclk,
	 * take it from the mode.
	 * Check it's within range.
	 */
	if(vga->f == 0)
		vga->f = vga->mode->frequency;
	if(!(vga->f <= 67500000 || ((vga->ctlr->flag & Hpclk2x8) && vga->f <=135000000)))
		error("%s: invalid pclk - %ld\n", ctlr->name, vga->f);

	/*
	 * Determine whether to use 2x8-bit mode or not.
	 * If yes and the clock has already been initialised,
	 * initialise it again.
	 */
	if(vga->ctlr && (vga->ctlr->flag & Hpclk2x8) && vga->f >= 67500000)
		resyncinit(vga, ctlr, Upclk2x8, 0);

	/*
	 * Calculate n&d.
	 */
	{
		long f, fmin, m, n1, n2;

		vga->d = 0;
		vga->n = 0;
		fmin = vga->f;
		for (n1=1; n1<32; ++n1)
			for (n2=0; n2<4; ++n2) {
				m = vga->f * (n1+2) * (1<<n2) / Frequency - 2;
				if (m<1 || m>127)
					continue;
				if (Frequency * (m+2)/(n1+2) > 250000000 ||
					Frequency * (m+2)/(n1+2) < 100000000)
					continue;
				f = vga->f - (Frequency * (m+2)/(n1+2)/(1<<n2));
				if (f < 0)
					f = -f;
				if (f > fmin)
					continue;
				fmin = f;
				vga->n = m;
				vga->d = n1 + (n2<<5);
			}
	}
	ctlr->flag |= Finit;
}

static void
loadsdac(Vga *vga, uchar index, uchar n, uchar d)
{
	vgao(MiscW, vga->misc | 0x0c);
	vgaxo(Crtx, 0x42, vga->crt[0x42] & ~0x0f | 0x02);
	vgaxo(Crtx, 0x55, vga->crt[0x55] & ~0x03 | 0x01);
	vgao(PaddrW, index);
	vgao(Pdata, n);
	vgao(Pdata, d);
	vgaxo(Crtx, 0x55, vga->crt[0x55] & ~0x03);
	vgaxo(Crtx, 0x42, vga->crt[0x42] & 0xf0 | 0x06);
}

static void
load(Vga *vga, Ctlr *ctlr)
{
	verbose("%s->load\n", ctlr->name);

	/*
	 * unlock registers
	 */
	vgaxo(Crtx, 0x38, 0x48);
	vgaxo(Crtx, 0x39, 0xa5);

	/*
	 * set mclk to 60 MHz
	 */
	loadsdac(vga, MClk, 0x41, 0x42);

	/*
	 * screen off
	 */
	vgaxo(Seqx, 0x01, vga->sequencer[0x01] | 0x20);

	/*
	 * set command register
	 */
	vgai(PaddrR);
	vgai(Pixmask); vgai(Pixmask); vgai(Pixmask); vgai(Pixmask);
	if(ctlr->flag & Upclk2x8)
		vgao(Pixmask, 0x10);
	else
		vgao(Pixmask, 0x00);
	vgai(PaddrR);
	vgao(Pixmask, 0xff);

	/*
	 * set pclk
	 */
	loadsdac(vga, PClk, vga->n, vga->d);

	/*
	 * screen on
	 */
	vgaxo(Seqx, 0x01, vga->sequencer[0x01]);

	ctlr->flag |= Fload;
}

Ctlr s3sdac = {
	"s3sdac",				/* name */
	0,				/* snarf */
	options,			/* options */
	init,				/* init */
	load,				/* load */
	0,				/* dump */
};
============================================