diff --git a/[refs] b/[refs] index f93496429c2a..971a56f99fe4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c5ed6e2cd8b8f944cc7a27fb8a66b695dccf32f +refs/heads/master: af3289e96383a60f5d3096afeb5579b837aad5e0 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_gpio.c b/trunk/drivers/gpu/drm/nouveau/nouveau_gpio.c index a580cc62337a..82c19e82ff02 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_gpio.c +++ b/trunk/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 };