diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-05-31 21:32:29 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-05-31 21:32:29 -0400 |
| commit | 36d1701c502d4f46386e1000ad58d9497a11688d (patch) | |
| tree | 474f0d29edc8405a14e23383e2b0afc0f325a1ee /include/drm | |
| parent | afa3b60c905f606e8245115474d77787035e02eb (diff) | |
| parent | 8b281db596744a15b2abbfdbf655796c64e172ca (diff) | |
Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing
* 'nouveau/for-airlied' of ../drm-nouveau-next:
drm/nv50: cast IGP memory location to u64 before shifting
drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack
drm/nouveau: fix dual-link displays when plugged into single-link outputs
drm/nv50: obey dcb->duallink_possible
drm/nv50: fix duallink_possible calculation for DCB 4.0 cards
drm/nouveau: don't execute INIT_GPIO unless we're really running the table
drm/nv40: allow cold-booting of nv4x chipsets
drm/nouveau: fix POST detection for certain chipsets
drm/nouveau: Add getparam for current PTIMER time.
drm/nouveau: allow cursor image and position to survive suspend
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/nouveau_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h index a6a9f4af5ebd..fe917dee723a 100644 --- a/include/drm/nouveau_drm.h +++ b/include/drm/nouveau_drm.h | |||
| @@ -79,6 +79,7 @@ struct drm_nouveau_gpuobj_free { | |||
| 79 | #define NOUVEAU_GETPARAM_CHIPSET_ID 11 | 79 | #define NOUVEAU_GETPARAM_CHIPSET_ID 11 |
| 80 | #define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 | 80 | #define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 |
| 81 | #define NOUVEAU_GETPARAM_GRAPH_UNITS 13 | 81 | #define NOUVEAU_GETPARAM_GRAPH_UNITS 13 |
| 82 | #define NOUVEAU_GETPARAM_PTIMER_TIME 14 | ||
| 82 | struct drm_nouveau_getparam { | 83 | struct drm_nouveau_getparam { |
| 83 | uint64_t param; | 84 | uint64_t param; |
| 84 | uint64_t value; | 85 | uint64_t value; |