diff options
author | Ilia Mirkin <imirkin@alum.mit.edu> | 2013-09-05 04:45:01 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-08 00:36:08 -0500 |
commit | 73f4b1f8938174dcf1645563e541022837a6a7f4 (patch) | |
tree | d7394d91b664dfd56cc0486e965ff7084ea6f7ad | |
parent | 4449933a3703704e8dc74ea774372857240c142d (diff) |
drm/nouveau: fix backlight mask on ppc powerbook
This code was originally moved to using nv_mask by d31e078d84. This
should not have any actual effect since the mask isn't applied to the
value.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c index 59d1c040b84f..bb6c3c3f981d 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c +++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c | |||
@@ -493,7 +493,7 @@ static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode) | |||
493 | if (dev->pdev->device == 0x0174 || dev->pdev->device == 0x0179 || | 493 | if (dev->pdev->device == 0x0174 || dev->pdev->device == 0x0179 || |
494 | dev->pdev->device == 0x0189 || dev->pdev->device == 0x0329) { | 494 | dev->pdev->device == 0x0189 || dev->pdev->device == 0x0329) { |
495 | if (mode == DRM_MODE_DPMS_ON) { | 495 | if (mode == DRM_MODE_DPMS_ON) { |
496 | nv_mask(device, NV_PBUS_DEBUG_DUALHEAD_CTL, 0, 1 << 31); | 496 | nv_mask(device, NV_PBUS_DEBUG_DUALHEAD_CTL, 1 << 31, 1 << 31); |
497 | nv_mask(device, NV_PCRTC_GPIO_EXT, 3, 1); | 497 | nv_mask(device, NV_PCRTC_GPIO_EXT, 3, 1); |
498 | } else { | 498 | } else { |
499 | nv_mask(device, NV_PBUS_DEBUG_DUALHEAD_CTL, 1 << 31, 0); | 499 | nv_mask(device, NV_PBUS_DEBUG_DUALHEAD_CTL, 1 << 31, 0); |