Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 18:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau: construct a connector table for cards that lack a real one

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2010-02-24 11:53:59 +10:00
parent f66fa771d5
commit dc5bc4ed38
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/gpu/drm/nouveau/nouveau_bios.c
View File

@ -5754,7 +5754,7 @@ static void
fixup_legacy_connector(struct nvbios *bios) fixup_legacy_connector(struct nvbios *bios)
{ {
struct dcb_table *dcb = &bios->dcb; struct dcb_table *dcb = &bios->dcb;
int high = 0, i; int i, i2c, i2c_conn[DCB_MAX_NUM_I2C_ENTRIES] = { };
/* /*
* DCB 3.0 also has the table in most cases, but there are some cards * DCB 3.0 also has the table in most cases, but there are some cards
@ -5765,6 +5765,8 @@ fixup_legacy_connector(struct nvbios *bios)
if (dcb->version >= 0x40) if (dcb->version >= 0x40)
return; return;
dcb->connector.entries = 0;
/* /*
* No known connector info before v3.0, so make it up. the rule here * No known connector info before v3.0, so make it up. the rule here
* is: anything on the same i2c bus is considered to be on the same * is: anything on the same i2c bus is considered to be on the same
@ -5772,30 +5774,31 @@ fixup_legacy_connector(struct nvbios *bios)
* its own unique connector index. * its own unique connector index.
*/ */
for (i = 0; i < dcb->entries; i++) { for (i = 0; i < dcb->entries; i++) {
if (dcb->entry[i].i2c_index == 0xf)
continue;
/* /*
* Ignore the I2C index for on-chip TV-out, as there * Ignore the I2C index for on-chip TV-out, as there
* are cards with bogus values (nv31m in bug 23212), * are cards with bogus values (nv31m in bug 23212),
* and it's otherwise useless. * and it's otherwise useless.
*/ */
if (dcb->entry[i].type == OUTPUT_TV && if (dcb->entry[i].type == OUTPUT_TV &&
dcb->entry[i].location == DCB_LOC_ON_CHIP) { dcb->entry[i].location == DCB_LOC_ON_CHIP)
dcb->entry[i].i2c_index = 0xf; dcb->entry[i].i2c_index = 0xf;
i2c = dcb->entry[i].i2c_index;
if (i2c_conn[i2c]) {
dcb->entry[i].connector = i2c_conn[i2c] - 1;
continue; continue;
} }
dcb->entry[i].connector = dcb->entry[i].i2c_index; dcb->entry[i].connector = dcb->connector.entries++;
if (dcb->entry[i].connector > high) if (i2c != 0xf)
high = dcb->entry[i].connector; i2c_conn[i2c] = dcb->connector.entries;
} }
for (i = 0; i < dcb->entries; i++) { /* Fake the connector table as well as just connector indices */
if (dcb->entry[i].i2c_index != 0xf) for (i = 0; i < dcb->connector.entries; i++) {
continue; dcb->connector.entry[i].index = i;
dcb->connector.entry[i].type = divine_connector_type(bios, i);
dcb->entry[i].connector = ++high; dcb->connector.entry[i].gpio_tag = 0xff;
} }
} }