Marcin Kościelnicki
2012-May-21 12:51 UTC
[Nouveau] [PATCH] drm/nouveau/nvd9: Fix GPIO initialisation sequence.
Signed-off-by: Marcin Ko?cielnicki <koriakin at 0x04.net>
---
drivers/gpu/drm/nouveau/nouveau_gpio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.c
b/drivers/gpu/drm/nouveau/nouveau_gpio.c
index f75ad66..a0911af 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gpio.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gpio.c
@@ -369,7 +369,7 @@ nouveau_gpio_reset(struct nouveau_device *ndev)
if (ndev->card_type >= NV_D0) {
nv_mask(ndev, 0x00d610 + (line * 4), 0xff, unk0);
if (unk1--)
- nv_mask(ndev, 0x00d640 + (unk1 * 4), 0xff, line);
+ nv_mask(ndev, 0x00d740 + (unk1 * 4), 0xff, line);
} else
if (ndev->card_type >= NV_50) {
static const u32 regs[] = { 0xe100, 0xe28c };
--
1.7.10.2
Ben Skeggs
2012-May-22 00:43 UTC
[Nouveau] [PATCH] drm/nouveau/nvd9: Fix GPIO initialisation sequence.
On Mon, May 21, 2012 at 02:51:50PM +0200, Marcin Ko?cielnicki wrote:> Signed-off-by: Marcin Ko?cielnicki <koriakin at 0x04.net>Applied, thanks!> --- > drivers/gpu/drm/nouveau/nouveau_gpio.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.c b/drivers/gpu/drm/nouveau/nouveau_gpio.c > index f75ad66..a0911af 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_gpio.c > +++ b/drivers/gpu/drm/nouveau/nouveau_gpio.c > @@ -369,7 +369,7 @@ nouveau_gpio_reset(struct nouveau_device *ndev) > if (ndev->card_type >= NV_D0) { > nv_mask(ndev, 0x00d610 + (line * 4), 0xff, unk0); > if (unk1--) > - nv_mask(ndev, 0x00d640 + (unk1 * 4), 0xff, line); > + nv_mask(ndev, 0x00d740 + (unk1 * 4), 0xff, line); > } else > if (ndev->card_type >= NV_50) { > static const u32 regs[] = { 0xe100, 0xe28c }; > -- > 1.7.10.2 > > _______________________________________________ > Nouveau mailing list > Nouveau at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau