aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-12-07 08:57:57 +1000
committerDave Airlie <airlied@redhat.com>2011-01-05 13:44:07 +1000
commit8d608aa6295242fe4c4b6105b8c59c6a5b232d89 (patch)
tree89205a1d839b0b002ec58d7988c2bebea7d8efc8 /drivers/gpu/drm/nouveau
parentd1fbd923da0f982f12b61a44e74c2e1f74c6ef56 (diff)
downloadkernel_samsung_crespo-8d608aa6295242fe4c4b6105b8c59c6a5b232d89.zip
kernel_samsung_crespo-8d608aa6295242fe4c4b6105b8c59c6a5b232d89.tar.gz
kernel_samsung_crespo-8d608aa6295242fe4c4b6105b8c59c6a5b232d89.tar.bz2
vga_switcheroo: add reprobe hook for fbcon to recheck connected outputs.
This adds a hook after the mux is switched for the driver to reprobe the connected outputs. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_state.c7
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 db4b410..1b87eee 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -605,6 +605,12 @@ static void nouveau_switcheroo_set_state(struct pci_dev *pdev,
}
}
+static void nouveau_switcheroo_reprobe(struct pci_dev *pdev)
+{
+ struct drm_device *dev = pci_get_drvdata(pdev);
+ nouveau_fbcon_output_poll_changed(dev);
+}
+
static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
{
struct drm_device *dev = pci_get_drvdata(pdev);
@@ -625,6 +631,7 @@ nouveau_card_init(struct drm_device *dev)
vga_client_register(dev->pdev, dev, NULL, nouveau_vga_set_decode);
vga_switcheroo_register_client(dev->pdev, nouveau_switcheroo_set_state,
+ nouveau_switcheroo_reprobe,
nouveau_switcheroo_can_switch);
/* Initialise internal driver API hooks */