From dfacb0bd6c3ef80d1a4cd8860a92f061c3a8f6e1 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 7 Dec 2010 13:56:26 +1000 Subject: [PATCH] --- yaml --- r: 228827 b: refs/heads/master c: 5ccb377feaaff3daa1e9a179534bbd7550d78af6 h: refs/heads/master i: 228825: 2dd744b45146f8dace1925af8c7483eff58d2ee3 228823: 2fb44ed406f8bd221e8908148230c8cde2e05f37 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 894ab6668dd1..1882841e4bfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 851ab954daee0d8328e239a468835e36e6215182 +refs/heads/master: 5ccb377feaaff3daa1e9a179534bbd7550d78af6 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c index d5b17b6ccd3a..db4b410f4a8c 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c @@ -1054,6 +1054,7 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) void nouveau_lastclose(struct drm_device *dev) { + vga_switcheroo_process_delayed_switch(); } int nouveau_unload(struct drm_device *dev)