diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-06-01 11:32:29 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-06-01 11:32:29 +1000 |
| commit | 36d1701c502d4f46386e1000ad58d9497a11688d (patch) | |
| tree | 474f0d29edc8405a14e23383e2b0afc0f325a1ee /drivers/gpu/drm/nouveau/nv50_cursor.c | |
| parent | afa3b60c905f606e8245115474d77787035e02eb (diff) | |
| parent | 8b281db596744a15b2abbfdbf655796c64e172ca (diff) | |
| download | blackbird-obmc-linux-36d1701c502d4f46386e1000ad58d9497a11688d.tar.gz blackbird-obmc-linux-36d1701c502d4f46386e1000ad58d9497a11688d.zip | |
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 'drivers/gpu/drm/nouveau/nv50_cursor.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_cursor.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c index 753e723adb3a..03ad7ab14f09 100644 --- a/drivers/gpu/drm/nouveau/nv50_cursor.c +++ b/drivers/gpu/drm/nouveau/nv50_cursor.c @@ -107,6 +107,7 @@ nv50_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y) { struct drm_device *dev = nv_crtc->base.dev; + nv_crtc->cursor_saved_x = x; nv_crtc->cursor_saved_y = y; nv_wr32(dev, NV50_PDISPLAY_CURSOR_USER_POS(nv_crtc->index), ((y & 0xFFFF) << 16) | (x & 0xFFFF)); /* Needed to make the cursor move. */ |
