aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bios.c8
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bios.h1
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index ba7a120a375c..3c9c54e16a5a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -5141,8 +5141,12 @@ read_dcb_i2c_entry(struct drm_device *dev, int dcb_version, uint8_t *i2ctable, i
5141 rdofs = wrofs = 0; 5141 rdofs = wrofs = 0;
5142 } 5142 }
5143 5143
5144 if (dcb_i2c_ver >= 0x40 && port_type != 5 && port_type != 6) 5144 if (dcb_i2c_ver >= 0x40) {
5145 NV_WARN(dev, "DCB I2C table has port type %d\n", port_type); 5145 if (port_type != 5 && port_type != 6)
5146 NV_WARN(dev, "DCB I2C table has port type %d\n", port_type);
5147
5148 i2c->entry = ROM32(i2ctable[headerlen + recordoffset + entry_len * index]);
5149 }
5146 5150
5147 i2c->port_type = port_type; 5151 i2c->port_type = port_type;
5148 i2c->read = i2ctable[headerlen + recordoffset + rdofs + entry_len * index]; 5152 i2c->read = i2ctable[headerlen + recordoffset + rdofs + entry_len * index];
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
index c0d7b0a3ece0..adf4ec2d06c0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -35,6 +35,7 @@
35#define DCB_LOC_ON_CHIP 0 35#define DCB_LOC_ON_CHIP 0
36 36
37struct dcb_i2c_entry { 37struct dcb_i2c_entry {
38 uint32_t entry;
38 uint8_t port_type; 39 uint8_t port_type;
39 uint8_t read, write; 40 uint8_t read, write;
40 struct nouveau_i2c_chan *chan; 41 struct nouveau_i2c_chan *chan;