diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-30 05:34:18 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-07 10:30:38 +1000 |
| commit | 4abe35204af82a018ca3ce6db4102aa09719698e (patch) | |
| tree | fcc91e2e109fe311a673d5b99dc758aba3bb4a79 /drivers/gpu/drm/nouveau/nv50_display.c | |
| parent | 5c4426a782bc9509573fc7958a786ebd14fafdf3 (diff) | |
| download | blackbird-op-linux-4abe35204af82a018ca3ce6db4102aa09719698e.tar.gz blackbird-op-linux-4abe35204af82a018ca3ce6db4102aa09719698e.zip | |
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 fac6c88a2b1f..d4f06c2a61e6 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -29,6 +29,7 @@ #include "nouveau_encoder.h" #include "nouveau_connector.h" #include "nouveau_fb.h" +#include "nouveau_fbcon.h" #include "drm_crtc_helper.h" static void @@ -941,6 +942,8 @@ nv50_display_irq_hotplug(struct drm_device *dev) nv_wr32(dev, 0xe054, nv_rd32(dev, 0xe054)); if (dev_priv->chipset >= 0x90) nv_wr32(dev, 0xe074, nv_rd32(dev, 0xe074)); + + nouveau_fbcon_hotplug(dev); } void |
