From 2c5f3a2747a8d1c680220df6b66187ba9047689a Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Tue, 26 Feb 2013 02:33:12 +0100 Subject: [PATCH] --- yaml --- r: 360907 b: refs/heads/master c: f6853faa85793bf23b46787e4039824d275453c2 h: refs/heads/master i: 360905: 77722a4cbf5a5a75a138685d387eeaea0fe99e0e 360903: fcf1844cfad60ef19dd02962149a6d70d8f62863 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3b5dda34b6aa..050a1e78ecf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 650e1203c11354ba84d69ba445abc0efcfe3890a +refs/heads/master: f6853faa85793bf23b46787e4039824d275453c2 diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/init.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/init.c index 2cc1e6a5eb6a..9c41b58d57e2 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/init.c +++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/init.c @@ -869,7 +869,7 @@ init_idx_addr_latched(struct nvbios_init *init) init->offset += 2; init_wr32(init, dreg, idata); - init_mask(init, creg, ~mask, data | idata); + init_mask(init, creg, ~mask, data | iaddr); } }