diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-01 07:25:06 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-01 07:25:06 -0400 |
| commit | e6586240a66e38dff2fbefd89451cfcdd68dceac (patch) | |
| tree | 2561e0d9a91469172bc1fa44c139c075b1886387 /drivers/gpu/drm/nouveau/nv10_gpio.c | |
| parent | 655861e328cea83320190f4a57b3656ee952388c (diff) | |
| parent | b99da31ed8521eb78d5d6930f3128f8ecdb75fae (diff) | |
Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
* 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6:
drm/nv10/gpio: fix thinko in mask for gpio lines 2-9
nvc0/fb: shut up PMFB interrupt after the first occurrence
drm/nouveau/hdmi: use correct hdmi regs for nvaa/nvac
drm/nouveau/bios: fix regression on some nv4x board
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv10_gpio.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv10_gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv10_gpio.c b/drivers/gpu/drm/nouveau/nv10_gpio.c index 550ad3fcf0af..9d79180069df 100644 --- a/drivers/gpu/drm/nouveau/nv10_gpio.c +++ b/drivers/gpu/drm/nouveau/nv10_gpio.c | |||
| @@ -65,7 +65,7 @@ nv10_gpio_drive(struct drm_device *dev, int line, int dir, int out) | |||
| 65 | if (line < 10) { | 65 | if (line < 10) { |
| 66 | line = (line - 2) * 4; | 66 | line = (line - 2) * 4; |
| 67 | reg = NV_PCRTC_GPIO_EXT; | 67 | reg = NV_PCRTC_GPIO_EXT; |
| 68 | mask = 0x00000003 << ((line - 2) * 4); | 68 | mask = 0x00000003; |
| 69 | data = (dir << 1) | out; | 69 | data = (dir << 1) | out; |
| 70 | } else | 70 | } else |
| 71 | if (line < 14) { | 71 | if (line < 14) { |