diff options
author | Dave Airlie <airlied@redhat.com> | 2010-03-30 01:34:18 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-04-06 20:30:38 -0400 |
commit | 4abe35204af82a018ca3ce6db4102aa09719698e (patch) | |
tree | fcc91e2e109fe311a673d5b99dc758aba3bb4a79 /drivers/gpu/drm/nouveau/nv50_display.c | |
parent | 5c4426a782bc9509573fc7958a786ebd14fafdf3 (diff) |
drm/kms/fb: use slow work mechanism for normal hotplug also.
a) slow work is always used now for any fbcon hotplug, as its not
a fast task and is more suited to being ran under slow work.
b) attempt to not do any fbdev changes when X is running as we'll
just mess it up. This hooks set_par to hopefully do the changes
once X hands control to fbdev.
This also adds the nouveau/intel hotplug support.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index fac6c88a2b1..d4f06c2a61e 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "nouveau_encoder.h" | 29 | #include "nouveau_encoder.h" |
30 | #include "nouveau_connector.h" | 30 | #include "nouveau_connector.h" |
31 | #include "nouveau_fb.h" | 31 | #include "nouveau_fb.h" |
32 | #include "nouveau_fbcon.h" | ||
32 | #include "drm_crtc_helper.h" | 33 | #include "drm_crtc_helper.h" |
33 | 34 | ||
34 | static void | 35 | static void |
@@ -941,6 +942,8 @@ nv50_display_irq_hotplug(struct drm_device *dev) | |||
941 | nv_wr32(dev, 0xe054, nv_rd32(dev, 0xe054)); | 942 | nv_wr32(dev, 0xe054, nv_rd32(dev, 0xe054)); |
942 | if (dev_priv->chipset >= 0x90) | 943 | if (dev_priv->chipset >= 0x90) |
943 | nv_wr32(dev, 0xe074, nv_rd32(dev, 0xe074)); | 944 | nv_wr32(dev, 0xe074, nv_rd32(dev, 0xe074)); |
945 | |||
946 | nouveau_fbcon_hotplug(dev); | ||
944 | } | 947 | } |
945 | 948 | ||
946 | void | 949 | void |