summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMarcin Koƛcielnicki <koriakin@0x04.net>2012-05-21 14:51:50 +0200
committerBen Skeggs <bskeggs@redhat.com>2012-05-24 16:56:37 +1000
commitaf3289e96383a60f5d3096afeb5579b837aad5e0 (patch)
treeda4be094751a91df13833a50a724eb7774f099ff /drivers/gpu
parent5c5ed6e2cd8b8f944cc7a27fb8a66b695dccf32f (diff)
downloadlinux-stable-af3289e96383a60f5d3096afeb5579b837aad5e0.tar.gz
linux-stable-af3289e96383a60f5d3096afeb5579b837aad5e0.tar.bz2
linux-stable-af3289e96383a60f5d3096afeb5579b837aad5e0.zip
drm/nouveau/nvd9: Fix GPIO initialisation sequence.
Signed-off-by: Marcin Koƛcielnicki <koriakin@0x04.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.c b/drivers/gpu/drm/nouveau/nouveau_gpio.c
index a580cc62337a..82c19e82ff02 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gpio.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gpio.c
@@ -387,7 +387,7 @@ nouveau_gpio_reset(struct drm_device *dev)
if (dev_priv->card_type >= NV_D0) {
nv_mask(dev, 0x00d610 + (line * 4), 0xff, unk0);
if (unk1--)
- nv_mask(dev, 0x00d640 + (unk1 * 4), 0xff, line);
+ nv_mask(dev, 0x00d740 + (unk1 * 4), 0xff, line);
} else
if (dev_priv->card_type >= NV_50) {
static const u32 regs[] = { 0xe100, 0xe28c };