Skip to content

L
linux
Commit 54abb5dd authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nouveau: parse dcb gpio/connector tables after encoders 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent e7cc51c5
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
drivers/gpu/drm/nouveau/nouveau_bios.c
View file @ 54abb5dd
...@@ -5646,9 +5646,6 @@ parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool twoHeads) ...@@ -5646,9 +5646,6 @@ parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool twoHeads)
dcb->i2c_default_indices = dcb->i2c_table[4]; dcb->i2c_default_indices = dcb->i2c_table[4];
} }
parse_dcb_gpio_table(bios);
parse_dcb_connector_table(bios);
if (entries > DCB_MAX_NUM_ENTRIES) if (entries > DCB_MAX_NUM_ENTRIES)
entries = DCB_MAX_NUM_ENTRIES; entries = DCB_MAX_NUM_ENTRIES;
...@@ -5684,7 +5681,12 @@ parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool twoHeads) ...@@ -5684,7 +5681,12 @@ parse_dcb_table(struct drm_device *dev, struct nvbios *bios, bool twoHeads)
if (dcb->version < 0x21) if (dcb->version < 0x21)
merge_like_dcb_entries(dev, dcb); merge_like_dcb_entries(dev, dcb);
return dcb->entries ? 0 : -ENXIO; if (!dcb->entries)
return -ENXIO;
parse_dcb_gpio_table(bios);
parse_dcb_connector_table(bios);
return 0;
} }
static void static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7