You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
111 lines
3.9 KiB
111 lines
3.9 KiB
From d83809c6fdb908ba708382c9a506f6647d1fa86d Mon Sep 17 00:00:00 2001
|
|
From: Maarten Maathuis <madman2003@gmail.com>
|
|
Date: Sun, 9 May 2010 14:49:52 +0200
|
|
Subject: [PATCH] drm/nouveau: allow cursor image and position to survive suspend
|
|
|
|
- This isn't triggered yet on a normal kernel, because it still does a VT
|
|
switch, but it seemed like a good idea to fix this now.
|
|
|
|
Tested-by: Maxim Levitsky <maximlevitsky@gmail.com>
|
|
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
|
|
---
|
|
drivers/gpu/drm/nouveau/nouveau_crtc.h | 2 ++
|
|
drivers/gpu/drm/nouveau/nouveau_drv.c | 29 +++++++++++++++++++++++++++++
|
|
drivers/gpu/drm/nouveau/nv04_cursor.c | 1 +
|
|
drivers/gpu/drm/nouveau/nv50_cursor.c | 1 +
|
|
4 files changed, 33 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/nouveau/nouveau_crtc.h b/drivers/gpu/drm/nouveau/nouveau_crtc.h
|
|
index 49fa7b2..cb1ce2a 100644
|
|
--- a/drivers/gpu/drm/nouveau/nouveau_crtc.h
|
|
+++ b/drivers/gpu/drm/nouveau/nouveau_crtc.h
|
|
@@ -40,6 +40,8 @@ struct nouveau_crtc {
|
|
int sharpness;
|
|
int last_dpms;
|
|
|
|
+ int cursor_saved_x, cursor_saved_y;
|
|
+
|
|
struct {
|
|
int cpp;
|
|
bool blanked;
|
|
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
|
|
index 1de974a..4bccba3 100644
|
|
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
|
|
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
|
|
@@ -177,6 +177,13 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
|
|
nouveau_bo_unpin(nouveau_fb->nvbo);
|
|
}
|
|
|
|
+ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
|
|
+ struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
|
|
+
|
|
+ nouveau_bo_unmap(nv_crtc->cursor.nvbo);
|
|
+ nouveau_bo_unpin(nv_crtc->cursor.nvbo);
|
|
+ }
|
|
+
|
|
NV_INFO(dev, "Evicting buffers...\n");
|
|
ttm_bo_evict_mm(&dev_priv->ttm.bdev, TTM_PL_VRAM);
|
|
|
|
@@ -318,12 +325,34 @@ nouveau_pci_resume(struct pci_dev *pdev)
|
|
nouveau_bo_pin(nouveau_fb->nvbo, TTM_PL_FLAG_VRAM);
|
|
}
|
|
|
|
+ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
|
|
+ struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
|
|
+ int ret;
|
|
+
|
|
+ ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM);
|
|
+ if (!ret)
|
|
+ ret = nouveau_bo_map(nv_crtc->cursor.nvbo);
|
|
+ if (ret)
|
|
+ NV_ERROR(dev, "Could not pin/map cursor.\n");
|
|
+ }
|
|
+
|
|
if (dev_priv->card_type < NV_50) {
|
|
nv04_display_restore(dev);
|
|
NVLockVgaCrtcs(dev, false);
|
|
} else
|
|
nv50_display_init(dev);
|
|
|
|
+ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
|
|
+ struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
|
|
+
|
|
+ nv_crtc->cursor.set_offset(nv_crtc,
|
|
+ nv_crtc->cursor.nvbo->bo.offset -
|
|
+ dev_priv->vm_vram_base);
|
|
+
|
|
+ nv_crtc->cursor.set_pos(nv_crtc, nv_crtc->cursor_saved_x,
|
|
+ nv_crtc->cursor_saved_y);
|
|
+ }
|
|
+
|
|
/* Force CLUT to get re-loaded during modeset */
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
|
|
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
|
|
diff --git a/drivers/gpu/drm/nouveau/nv04_cursor.c b/drivers/gpu/drm/nouveau/nv04_cursor.c
|
|
index 89a91b9..aaf3de3 100644
|
|
--- a/drivers/gpu/drm/nouveau/nv04_cursor.c
|
|
+++ b/drivers/gpu/drm/nouveau/nv04_cursor.c
|
|
@@ -20,6 +20,7 @@ nv04_cursor_hide(struct nouveau_crtc *nv_crtc, bool update)
|
|
static void
|
|
nv04_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y)
|
|
{
|
|
+ nv_crtc->cursor_saved_x = x; nv_crtc->cursor_saved_y = y;
|
|
NVWriteRAMDAC(nv_crtc->base.dev, nv_crtc->index,
|
|
NV_PRAMDAC_CU_START_POS,
|
|
XLATE(y, 0, NV_PRAMDAC_CU_START_POS_Y) |
|
|
diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c
|
|
index 753e723..03ad7ab 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. */
|
|
--
|
|
1.7.0.1
|
|
|