summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorFrancisco Jerez2013-02-26 02:33:12 +0100
committerBen Skeggs2013-03-04 02:46:12 +0100
commitf6853faa85793bf23b46787e4039824d275453c2 (patch)
tree26562a6d0cc346f8a06f02a141d8c4a7d5e9094a /drivers/gpu/drm
parentdrm/nouveau: Disable AGP on PowerPC again. (diff)
downloadkernel-qcow2-linux-f6853faa85793bf23b46787e4039824d275453c2.tar.gz
kernel-qcow2-linux-f6853faa85793bf23b46787e4039824d275453c2.tar.xz
kernel-qcow2-linux-f6853faa85793bf23b46787e4039824d275453c2.zip
drm/nouveau: Fix typo in init_idx_addr_latched().
Fixes script-based modesetting on some LVDS panels. Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/bios/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
index 2cc1e6a5eb6a..9c41b58d57e2 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
+++ b/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);
}
}