diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-06-30 01:25:57 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-12 20:13:12 -0400 |
| commit | 7149eee87a020cb81c52e9653a44c5f9e7c2a0d9 (patch) | |
| tree | 9eba071055ddea1aa36c5a1425c1379061d29145 /drivers/gpu/drm/nouveau/nouveau_reg.h | |
| parent | 309b8c89c8ddf9dd8e5f253c185d6af1d0358a79 (diff) | |
drm/nv50: fix DP->DVI if output has been programmed for native DP previously
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_reg.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_reg.h b/drivers/gpu/drm/nouveau/nouveau_reg.h index 6ca80a3fe70d..b6391a132f0a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_reg.h +++ b/drivers/gpu/drm/nouveau/nouveau_reg.h | |||
| @@ -814,6 +814,7 @@ | |||
| 814 | #define NV50_PDISPLAY_SOR_BACKLIGHT_ENABLE 0x80000000 | 814 | #define NV50_PDISPLAY_SOR_BACKLIGHT_ENABLE 0x80000000 |
| 815 | #define NV50_PDISPLAY_SOR_BACKLIGHT_LEVEL 0x00000fff | 815 | #define NV50_PDISPLAY_SOR_BACKLIGHT_LEVEL 0x00000fff |
| 816 | #define NV50_SOR_DP_CTRL(i,l) (0x0061c10c + (i) * 0x800 + (l) * 0x80) | 816 | #define NV50_SOR_DP_CTRL(i,l) (0x0061c10c + (i) * 0x800 + (l) * 0x80) |
| 817 | #define NV50_SOR_DP_CTRL_ENABLED 0x00000001 | ||
| 817 | #define NV50_SOR_DP_CTRL_ENHANCED_FRAME_ENABLED 0x00004000 | 818 | #define NV50_SOR_DP_CTRL_ENHANCED_FRAME_ENABLED 0x00004000 |
| 818 | #define NV50_SOR_DP_CTRL_LANE_MASK 0x001f0000 | 819 | #define NV50_SOR_DP_CTRL_LANE_MASK 0x001f0000 |
| 819 | #define NV50_SOR_DP_CTRL_LANE_0_ENABLED 0x00010000 | 820 | #define NV50_SOR_DP_CTRL_LANE_0_ENABLED 0x00010000 |