frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add E-EDID segment selection.

This commit is contained in:
Adam Jackson 2007-12-03 17:38:53 -05:00
parent 0b4aef4d6d
commit 9e8451d869
1 changed files with 71 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
hw/xfree86/ddc/xf86DDC.c
View File

@ -104,19 +104,14 @@ xf86DoEDID_DDC1(
} }
static I2CDevPtr static I2CDevPtr
DDC2Init(int scrnIndex, I2CBusPtr pBus) DDC2MakeDevice(I2CBusPtr pBus, int address, char *name)
{ {
I2CDevPtr dev = NULL; I2CDevPtr dev = NULL;
/*
* Slow down the bus so that older monitors don't
* miss things.
*/
pBus->RiseFallTime = 20;
if (!(dev = xf86I2CFindDev(pBus, 0x00A0))) { if (!(dev = xf86I2CFindDev(pBus, address))) {
dev = xf86CreateI2CDevRec(); dev = xf86CreateI2CDevRec();
dev->DevName = "ddc2"; dev->DevName = name;
dev->SlaveAddr = 0xA0; dev->SlaveAddr = address;
dev->ByteTimeout = 2200; /* VESA DDC spec 3 p. 43 (+10 %) */ dev->ByteTimeout = 2200; /* VESA DDC spec 3 p. 43 (+10 %) */
dev->StartTimeout = 550; dev->StartTimeout = 550;
dev->BitTimeout = 40; dev->BitTimeout = 40;
@ -132,33 +127,70 @@ DDC2Init(int scrnIndex, I2CBusPtr pBus)
return dev; return dev;
} }
static unsigned char * static I2CDevPtr
DDC2Read(I2CDevPtr dev, int start, int len) DDC2Init(int scrnIndex, I2CBusPtr pBus)
{ {
unsigned char W_Buffer[2]; I2CDevPtr dev = NULL;
int w_bytes;
unsigned char *R_Buffer;
int i;
if (start < 0x100) { /*
w_bytes = 1; * Slow down the bus so that older monitors don't
W_Buffer[0] = start; * miss things.
} else { */
w_bytes = 2; pBus->RiseFallTime = 20;
W_Buffer[0] = start & 0xFF;
W_Buffer[1] = (start & 0xFF00) >> 8; DDC2MakeDevice(pBus, 0x0060, "E-EDID segment register");
} dev = DDC2MakeDevice(pBus, 0x00A0, "ddc2");
return dev;
}
/* Mmmm, smell the hacks */
static void
EEDIDStop(I2CDevPtr d)
{
}
/* block is the EDID block number. a segment is two blocks. */
static Bool
DDC2Read(I2CDevPtr dev, int block, unsigned char *R_Buffer)
{
unsigned char W_Buffer[1];
int i, segment;
I2CDevPtr seg;
void (*stop)(I2CDevPtr);
R_Buffer = xcalloc(sizeof(unsigned char), len);
for (i = 0; i < RETRIES; i++) { for (i = 0; i < RETRIES; i++) {
if (xf86I2CWriteRead(dev, W_Buffer, w_bytes, R_Buffer, len)) { /* Stop bits reset the segment pointer to 0, so be careful here. */
if (!DDC_checksum(R_Buffer, len)) segment = block >> 1;
return R_Buffer; if (segment) {
Bool b;
if (!(seg = xf86I2CFindDev(dev->pI2CBus, 0x0060)))
return FALSE;
W_Buffer[0] = segment;
stop = dev->pI2CBus->I2CStop;
dev->pI2CBus->I2CStop = EEDIDStop;
b = xf86I2CWriteRead(seg, W_Buffer, 1, NULL, 0);
dev->pI2CBus->I2CStop = stop;
if (!b) {
dev->pI2CBus->I2CStop(dev);
continue;
} }
} }
xfree(R_Buffer); W_Buffer[0] = (block & 0x01) * EDID1_LEN;
return NULL;
if (xf86I2CWriteRead(dev, W_Buffer, 1, R_Buffer, EDID1_LEN)) {
if (!DDC_checksum(R_Buffer, EDID1_LEN))
return TRUE;
}
}
return FALSE;
} }
/** /**
@ -189,7 +221,9 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, int *nblocks)
Bool noddc = FALSE, noddc2 = FALSE; Bool noddc = FALSE, noddc2 = FALSE;
OptionInfoPtr options; OptionInfoPtr options;
options = xnfalloc(sizeof(DDCOptions)); options = xalloc(sizeof(DDCOptions));
if (!options)
return NULL;
memcpy(options, DDCOptions, sizeof(DDCOptions)); memcpy(options, DDCOptions, sizeof(DDCOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
@ -203,10 +237,13 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, int *nblocks)
if (!(dev = DDC2Init(scrnIndex, pBus))) if (!(dev = DDC2Init(scrnIndex, pBus)))
return NULL; return NULL;
EDID_block = DDC2Read(dev, 0, EDID1_LEN); EDID_block = xcalloc(1, EDID1_LEN);
if (!EDID_block)
return NULL;
if (EDID_block) if (DDC2Read(dev, 0, EDID_block)) {
tmp = xf86InterpretEDID(scrnIndex, EDID_block); tmp = xf86InterpretEDID(scrnIndex, EDID_block);
}
if (nblocks) { if (nblocks) {
if (tmp) if (tmp)