diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-06-21 16:29:03 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-07-14 11:53:25 +1000 |
| commit | 9a2b8131c38e9e9fea6a803efe855a542c0f32d1 (patch) | |
| tree | aa48902b14763e634201f9444e918449692ddd21 /drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | |
| parent | 86b40432bd1986ad0e3b5822c4ef54c0dc1dacbc (diff) | |
| download | linux-stable-9a2b8131c38e9e9fea6a803efe855a542c0f32d1.tar.gz linux-stable-9a2b8131c38e9e9fea6a803efe855a542c0f32d1.tar.bz2 linux-stable-9a2b8131c38e9e9fea6a803efe855a542c0f32d1.zip | |
drm/nouveau/disp/nv50-: fix lookup of udisp table under certain circumstances
Some VBIOS have separate tables for each link of a given output path,
which means we have to specify the specific link we're using instead
of all possible links.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c index 5dd34382f55a..605e4ea669a4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c @@ -76,12 +76,10 @@ exec_lookup(struct nv50_disp *disp, int head, int or, u32 ctrl, mask |= 0x0001 << or; mask |= 0x0100 << head; - list_for_each_entry(outp, &disp->base.outp, head) { if ((outp->info.hasht & 0xff) == type && (outp->info.hashm & mask) == mask) { - *data = nvbios_outp_match(bios, outp->info.hasht, - outp->info.hashm, + *data = nvbios_outp_match(bios, outp->info.hasht, mask, ver, hdr, cnt, len, info); if (!*data) return NULL; |