[Nouveau] [PATCH] drm/nouveau: Add proper vgaarb support.

Marcin Kościelnicki koriakin at 0x04.net
Sun Feb 7 16:20:17 PST 2010


Signed-off-by: Marcin Kościelnicki <koriakin at 0x04.net>
---
 drivers/gpu/drm/nouveau/nouveau_state.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index fcd7610..c538eee 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -310,6 +310,13 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
 static unsigned int
 nouveau_vga_set_decode(void *priv, bool state)
 {
+	struct drm_device *dev = priv;
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
+	if (dev_priv->chipset >= 0x40) {
+		nv_wr32(dev, 0x88054, state);
+	} else {
+		nv_wr32(dev, 0x1854, state);
+	}
 	if (state)
 		return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
 		       VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
-- 
1.6.4.1



More information about the Nouveau mailing list