From: Francisco Jerez Date: Tue, 3 Aug 2010 13:34:53 +0000 (+0200) Subject: drm/nouveau: Init dcb->or on cards that have no usable DCB table. X-Git-Tag: v2.6.36-rc1~71^2~27^2~5 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=1849719ef86e29def631a473e496507a4e052c06;p=net-next-2.6.git drm/nouveau: Init dcb->or on cards that have no usable DCB table. We need a valid OR value because there're a few nv17 cards with DCB v1.4. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index a8aef936d70..8464d205e41 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -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)