]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drm/nouveau: Init dcb->or on cards that have no usable DCB table.
authorFrancisco Jerez <currojerez@riseup.net>
Tue, 3 Aug 2010 13:34:53 +0000 (15:34 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 9 Aug 2010 05:16:15 +0000 (15:16 +1000)
We need a valid OR value because there're a few nv17 cards with DCB v1.4.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_bios.c

index a8aef936d70697a4990e529e868e1dc10245b3f4..8464d205e41c68bd30bab62ed0dc5567279d680d 100644 (file)
@@ -6003,7 +6003,7 @@ static void fabricate_vga_output(struct dcb_table *dcb, int i2c, int heads)
        entry->i2c_index = i2c;
        entry->heads = heads;
        entry->location = DCB_LOC_ON_CHIP;
-       /* "or" mostly unused in early gen crt modesetting, 0 is fine */
+       entry->or = 1;
 }
 
 static void fabricate_dvi_i_output(struct dcb_table *dcb, bool twoHeads)